From 0362f2604fff4df9e50e50f1e4976e103609dc0d Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Mon, 12 Jul 2021 23:51:39 +1000
Subject: [PATCH 01/15] ci: fixed deployment workflows

---
 .github/workflows/nightly.yml | 14 +++++++++-----
 .github/workflows/release.yml | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index badf1d3..8b13b88 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -7,9 +7,11 @@ jobs:
   image:
     name: Publish Image
     runs-on: Ubuntu-20.04
+    env:
+      APPLICATION: ratify
     strategy:
       matrix:
-        app: [be, fe]
+        service: [be, fe]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -27,15 +29,17 @@ jobs:
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
-          context: folio-${{ matrix.app }}
+          context: ${{ env.APPLICATION }}-${{ matrix.service }}
           platforms: linux/amd64
-          tags: daystram/folio:${{ matrix.app }}-${{ env.RELEASE_VERSION }}
+          tags: daystram/${{ env.APPLICATION }}:${{ matrix.service }}-${{ env.RELEASE_VERSION }}
           push: true
   chart:
     name: Publish Helm Chart
     runs-on: Ubuntu-20.04
     container: daystram/k8s-tools:latest
     needs: [image]
+    env:
+      APPLICATION: ratify
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -60,8 +64,8 @@ jobs:
           git clone ssh://git@github.com/daystram/helm-charts.git
           cp -r .daystram helm-charts/docs/
           cd helm-charts/docs/
-          curl -sfL https://charts.daystram.com/build.sh | sh -s - folio ${{ env.RELEASE_VERSION }}
+          curl -sfL https://charts.daystram.com/build.sh | sh -s - ${{ env.APPLICATION }} ${{ env.RELEASE_VERSION }}
           rm -rf .daystram/
           git add .
-          git commit -m "feat: added chart for folio@${{ env.RELEASE_VERSION }}"
+          git commit -m "feat: added chart for ${{ env.APPLICATION }}@${{ env.RELEASE_VERSION }}"
           git push
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c32f8cb..17f45f8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,6 +9,8 @@ jobs:
   image:
     name: Publish Image
     runs-on: Ubuntu-20.04
+    env:
+      APPLICATION: ratify
     strategy:
       matrix:
         app: [be, fe]
@@ -29,17 +31,19 @@ jobs:
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
-          context: folio-${{ matrix.app }}
+          context: ${{ env.APPLICATION }}-${{ matrix.app }}
           platforms: linux/amd64
           tags: |
-            daystram/folio:${{ matrix.app }}
-            daystram/folio:${{ matrix.app }}-${{ env.RELEASE_VERSION }}
+            daystram/${{ env.APPLICATION }}:${{ matrix.app }}
+            daystram/${{ env.APPLICATION }}:${{ matrix.app }}-${{ env.RELEASE_VERSION }}
           push: true
   chart:
     name: Publish Helm Chart
     runs-on: Ubuntu-20.04
     container: daystram/k8s-tools:latest
     needs: [image]
+    env:
+      APPLICATION: ratify
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -64,8 +68,8 @@ jobs:
           git clone ssh://git@github.com/daystram/helm-charts.git
           cp -r .daystram helm-charts/docs/
           cd helm-charts/docs/
-          curl -sfL https://charts.daystram.com/build.sh | sh -s - folio ${{ env.RELEASE_VERSION }}
+          curl -sfL https://charts.daystram.com/build.sh | sh -s - ${{ env.APPLICATION }} ${{ env.RELEASE_VERSION }}
           rm -rf .daystram/
           git add .
-          git commit -m "feat: added chart for folio@${{ env.RELEASE_VERSION }}"
+          git commit -m "feat: added chart for ${{ env.APPLICATION }}@${{ env.RELEASE_VERSION }}"
           git push

From 64acb45686e83dd677b11b555f5d914bfcbcd359 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 02:14:16 +1000
Subject: [PATCH 02/15] ci: fixed env file on docker build

---
 .github/workflows/nightly.yml | 2 ++
 .github/workflows/release.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 8b13b88..98a8a9e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,6 +26,8 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
+      - name: Provide Env File
+        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.app }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 17f45f8..d556206 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,6 +28,8 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Get Release Version
         run: echo "RELEASE_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
+      - name: Provide Env File
+        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.app }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:

From 398b4a5164db850c0a7e6c5864de5384e9a77b4e Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 02:28:39 +1000
Subject: [PATCH 03/15] ci: fixed matrix variable

---
 .github/workflows/nightly.yml | 2 +-
 .github/workflows/release.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 98a8a9e..5d21e0f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.app }}/.env.production
+        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d556206..8408123 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,15 +29,15 @@ jobs:
       - name: Get Release Version
         run: echo "RELEASE_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.app }}/.env.production
+        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
-          context: ${{ env.APPLICATION }}-${{ matrix.app }}
+          context: ${{ env.APPLICATION }}-${{ matrix.service }}
           platforms: linux/amd64
           tags: |
-            daystram/${{ env.APPLICATION }}:${{ matrix.app }}
-            daystram/${{ env.APPLICATION }}:${{ matrix.app }}-${{ env.RELEASE_VERSION }}
+            daystram/${{ env.APPLICATION }}:${{ matrix.service }}
+            daystram/${{ env.APPLICATION }}:${{ matrix.service }}-${{ env.RELEASE_VERSION }}
           push: true
   chart:
     name: Publish Helm Chart

From 44a78d6362e26ff365833e4e0d513fced09bb472 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:04:01 +1000
Subject: [PATCH 04/15] ci: fixed env file template

---
 .github/workflows/nightly.yml | 2 +-
 .github/workflows/release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5d21e0f..4448d3f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8408123..1ffb9ec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Get Release Version
         run: echo "RELEASE_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo $FE_ENV_FILE > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:

From 952ceec7c13a33f5d3e1f7b100367351565a6e21 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:10:01 +1000
Subject: [PATCH 05/15] ci: debug env file

---
 .github/workflows/nightly.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 4448d3f..c274ba3 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,7 +27,10 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: |
+          echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+          ls ${{ env.APPLICATION }}-${{ matrix.service }}
+          cat ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:

From 21f79589c0847496089caf55b70639edab39a3b4 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:18:42 +1000
Subject: [PATCH 06/15] ci: debug env file 2

---
 .github/workflows/nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c274ba3..ade035b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -28,8 +28,8 @@ jobs:
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
         run: |
-          echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
-          ls ${{ env.APPLICATION }}-${{ matrix.service }}
+          echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+          ls -al ${{ env.APPLICATION }}-${{ matrix.service }}
           cat ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2

From b4af557f777bf2e887ebdc57addf0f2b79188969 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:19:40 +1000
Subject: [PATCH 07/15] ci: fixed fe env file resolving

---
 .github/workflows/nightly.yml | 5 +----
 .github/workflows/release.yml | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ade035b..dc17dbc 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,10 +27,7 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: |
-          echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
-          ls -al ${{ env.APPLICATION }}-${{ matrix.service }}
-          cat ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ffb9ec..322e906 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Get Release Version
         run: echo "RELEASE_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo ${{ env.FE_ENV_FILE }} > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:

From 9fa0b9faf30125610b76b18baa815826bd532663 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:31:35 +1000
Subject: [PATCH 08/15] ci: debug env file 3

---
 .github/workflows/nightly.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index dc17dbc..e3543cc 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,6 +9,7 @@ jobs:
     runs-on: Ubuntu-20.04
     env:
       APPLICATION: ratify
+      FE_ENV_FILE: ${{ secrets.FE_ENV_FILE }}
     strategy:
       matrix:
         service: [be, fe]
@@ -27,7 +28,9 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+        run: |
+          echo "${{ env.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+          ls -al ${{ env.APPLICATION }}-${{ matrix.service }}
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:

From ece7c6d8d6260873f714e258f15aa346376baefc Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:33:51 +1000
Subject: [PATCH 09/15] ci: debug env file 4

---
 .github/workflows/nightly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e3543cc..fdd59fa 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -29,7 +29,7 @@ jobs:
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
         run: |
-          echo "${{ env.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
+          echo "$FE_ENV_FILE" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
           ls -al ${{ env.APPLICATION }}-${{ matrix.service }}
       - name: Build and Push Image
         uses: docker/build-push-action@v2

From 18325964539fd4061d65441f74108fdc1a92e10f Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:52:23 +1000
Subject: [PATCH 10/15] ci: fixed environment definitions

---
 .github/workflows/nightly.yml | 7 +++----
 .github/workflows/release.yml | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index fdd59fa..c00954d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -6,10 +6,10 @@ on:
 jobs:
   image:
     name: Publish Image
+    environment: Development
     runs-on: Ubuntu-20.04
     env:
       APPLICATION: ratify
-      FE_ENV_FILE: ${{ secrets.FE_ENV_FILE }}
     strategy:
       matrix:
         service: [be, fe]
@@ -28,9 +28,7 @@ jobs:
       - name: Set Development Version
         run: echo "RELEASE_VERSION=dev" >> $GITHUB_ENV
       - name: Provide Env File
-        run: |
-          echo "$FE_ENV_FILE" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
-          ls -al ${{ env.APPLICATION }}-${{ matrix.service }}
+        run: echo "${{ secrets.FE_ENV_FILE }}" > ${{ env.APPLICATION }}-${{ matrix.service }}/.env.production
       - name: Build and Push Image
         uses: docker/build-push-action@v2
         with:
@@ -40,6 +38,7 @@ jobs:
           push: true
   chart:
     name: Publish Helm Chart
+    environment: Development
     runs-on: Ubuntu-20.04
     container: daystram/k8s-tools:latest
     needs: [image]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 322e906..5d76523 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,6 +8,7 @@ on:
 jobs:
   image:
     name: Publish Image
+    environment: Production
     runs-on: Ubuntu-20.04
     env:
       APPLICATION: ratify
@@ -41,6 +42,7 @@ jobs:
           push: true
   chart:
     name: Publish Helm Chart
+    environment: Production
     runs-on: Ubuntu-20.04
     container: daystram/k8s-tools:latest
     needs: [image]

From 359fdc7719f118eeebbe1a4392dbd8f49ed6a0cf Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 03:54:43 +1000
Subject: [PATCH 11/15] ci: cleaned up env file injection

---
 .github/workflows/push.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a190587..5f4f3a4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -35,8 +35,6 @@ jobs:
           node-version: 12.x
       - name: Install Dependencies
         run: yarn install
-      - name: Provide Env File
-        run: echo $FE_ENV_FILE > .env.production
       - name: Build
         run: yarn build
       - name: Archive Artifacts

From 2e17b185e63ee737b81db41d5810391e89fce45a Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 04:12:16 +1000
Subject: [PATCH 12/15] refactor: fixed url validator wrapper

---
 ratify-fe/src/utils/url.ts                                 | 7 ++++++-
 ratify-fe/src/views/manage/application/ApplicationList.vue | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ratify-fe/src/utils/url.ts b/ratify-fe/src/utils/url.ts
index 7ea8cc2..afb6584 100644
--- a/ratify-fe/src/utils/url.ts
+++ b/ratify-fe/src/utils/url.ts
@@ -1,4 +1,4 @@
-export function validateURL(
+function validate(
   urlString: string,
   allowInsecure?: boolean,
   allowLocalhost?: boolean
@@ -11,3 +11,8 @@ export function validateURL(
     url.origin !== null
   );
 }
+
+export const validateURL = (
+  allowInsecure?: boolean,
+  allowLocalhost?: boolean
+) => (urlString: string) => validate(urlString, allowInsecure, allowLocalhost);
diff --git a/ratify-fe/src/views/manage/application/ApplicationList.vue b/ratify-fe/src/views/manage/application/ApplicationList.vue
index 70c38d7..58c38d1 100644
--- a/ratify-fe/src/views/manage/application/ApplicationList.vue
+++ b/ratify-fe/src/views/manage/application/ApplicationList.vue
@@ -342,9 +342,9 @@ export default Vue.extend({
     create: {
       name: { required, maxLength: maxLength(20) },
       description: { required, maxLength: maxLength(50) },
-      loginURL: { required, url: validateURL },
-      callbackURL: { required, url: validateURL },
-      logoutURL: { required, url: validateURL }
+      loginURL: { required, url: validateURL(true, true) },
+      callbackURL: { required, url: validateURL(true, true) },
+      logoutURL: { required, url: validateURL(true, true) }
     }
   },
 

From 17777db1ac9ec6b86f19bcbc956a2cf935563ec7 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 04:27:14 +1000
Subject: [PATCH 13/15] refactor: improved url validator

---
 ratify-fe/src/utils/url.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ratify-fe/src/utils/url.ts b/ratify-fe/src/utils/url.ts
index afb6584..4996b04 100644
--- a/ratify-fe/src/utils/url.ts
+++ b/ratify-fe/src/utils/url.ts
@@ -3,13 +3,18 @@ function validate(
   allowInsecure?: boolean,
   allowLocalhost?: boolean
 ): boolean {
-  const url = new URL(urlString);
-  return (
-    ((url.protocol === "http:" && allowInsecure) ||
-      url.protocol === "https:") &&
-    (url.hostname !== "localhost" || !!allowLocalhost) &&
-    url.origin !== null
-  );
+  try {
+    const url = new URL(urlString);
+    console.log(url);
+    return (
+      ((url.protocol === "http:" && allowInsecure) ||
+        url.protocol === "https:") &&
+      (url.hostname !== "localhost" || !!allowLocalhost) &&
+      url.origin !== null
+    );
+  } catch (e) {
+    return false;
+  }
 }
 
 export const validateURL = (

From b9d1598618ff43d597e754ffd7d93dc7fde04dc3 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 10:27:29 +1000
Subject: [PATCH 14/15] refactor: improved url validation

---
 ratify-fe/src/utils/url.ts                     | 18 +++++++-----------
 .../manage/application/ApplicationDetail.vue   | 11 ++++++-----
 .../manage/application/ApplicationList.vue     |  6 +++---
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ratify-fe/src/utils/url.ts b/ratify-fe/src/utils/url.ts
index 4996b04..a4bf7ba 100644
--- a/ratify-fe/src/utils/url.ts
+++ b/ratify-fe/src/utils/url.ts
@@ -1,15 +1,13 @@
-function validate(
-  urlString: string,
-  allowInsecure?: boolean,
-  allowLocalhost?: boolean
-): boolean {
+function validate(urlString: string, allowInsecure?: boolean): boolean {
   try {
     const url = new URL(urlString);
-    console.log(url);
+    const regex = new RegExp(
+      "^((www.)?[-a-zA-Z0-9@:%._+~#=]{2,256}.[a-z]{2,})|(localhost)$"
+    );
     return (
       ((url.protocol === "http:" && allowInsecure) ||
         url.protocol === "https:") &&
-      (url.hostname !== "localhost" || !!allowLocalhost) &&
+      regex.test(url.hostname) &&
       url.origin !== null
     );
   } catch (e) {
@@ -17,7 +15,5 @@ function validate(
   }
 }
 
-export const validateURL = (
-  allowInsecure?: boolean,
-  allowLocalhost?: boolean
-) => (urlString: string) => validate(urlString, allowInsecure, allowLocalhost);
+export const validateURL = (allowInsecure?: boolean) => (urlString: string) =>
+  validate(urlString, allowInsecure);
diff --git a/ratify-fe/src/views/manage/application/ApplicationDetail.vue b/ratify-fe/src/views/manage/application/ApplicationDetail.vue
index 6cbc920..2825f27 100644
--- a/ratify-fe/src/views/manage/application/ApplicationDetail.vue
+++ b/ratify-fe/src/views/manage/application/ApplicationDetail.vue
@@ -590,9 +590,10 @@
 
 <script lang="ts">
 import Vue from "vue";
-import { STATUS } from "@/constants/status";
 import api from "@/apis/api";
-import { maxLength, required, url } from "vuelidate/lib/validators";
+import { STATUS } from "@/constants/status";
+import { validateURL } from "@/utils/url";
+import { maxLength, required } from "vuelidate/lib/validators";
 
 export default Vue.extend({
   data: () => ({
@@ -638,9 +639,9 @@ export default Vue.extend({
     detail: {
       name: { required, maxLength: maxLength(20) },
       description: { required, maxLength: maxLength(50) },
-      loginURL: { required, url },
-      callbackURL: { required, url },
-      logoutURL: { required, url }
+      loginURL: { required, url: validateURL(true) },
+      callbackURL: { required, url: validateURL(true) },
+      logoutURL: { required, url: validateURL(true) }
     }
   },
 
diff --git a/ratify-fe/src/views/manage/application/ApplicationList.vue b/ratify-fe/src/views/manage/application/ApplicationList.vue
index 58c38d1..ea9afc0 100644
--- a/ratify-fe/src/views/manage/application/ApplicationList.vue
+++ b/ratify-fe/src/views/manage/application/ApplicationList.vue
@@ -342,9 +342,9 @@ export default Vue.extend({
     create: {
       name: { required, maxLength: maxLength(20) },
       description: { required, maxLength: maxLength(50) },
-      loginURL: { required, url: validateURL(true, true) },
-      callbackURL: { required, url: validateURL(true, true) },
-      logoutURL: { required, url: validateURL(true, true) }
+      loginURL: { required, url: validateURL(true) },
+      callbackURL: { required, url: validateURL(true) },
+      logoutURL: { required, url: validateURL(true) }
     }
   },
 

From 30070ad3e4f456fe813866a235e8720f96888d19 Mon Sep 17 00:00:00 2001
From: Danny August Ramaputra <daystram@gmail.com>
Date: Tue, 13 Jul 2021 18:01:36 +1000
Subject: [PATCH 15/15] refactor: updated url validator

---
 ratify-fe/src/utils/url.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ratify-fe/src/utils/url.ts b/ratify-fe/src/utils/url.ts
index a4bf7ba..3b24bc2 100644
--- a/ratify-fe/src/utils/url.ts
+++ b/ratify-fe/src/utils/url.ts
@@ -1,9 +1,7 @@
 function validate(urlString: string, allowInsecure?: boolean): boolean {
   try {
     const url = new URL(urlString);
-    const regex = new RegExp(
-      "^((www.)?[-a-zA-Z0-9@:%._+~#=]{2,256}.[a-z]{2,})|(localhost)$"
-    );
+    const regex = /^([-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,})$|^(localhost)$/;
     return (
       ((url.protocol === "http:" && allowInsecure) ||
         url.protocol === "https:") &&