From 0e9642ffdb3445aaaf0b84cafba93ba1a9026cc1 Mon Sep 17 00:00:00 2001
From: Severin Stampler <severin@walt.id>
Date: Tue, 10 Jan 2023 14:07:58 +0100
Subject: [PATCH 1/2] support multi tenancy in verifier portal

---
 config.js                    |  3 ++-
 pages/index.vue              | 14 +++++++++-----
 pages/success.vue            |  8 +++-----
 pages/xdevice/_schemaUri.vue |  5 +++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/config.js b/config.js
index c178492..4607ec3 100644
--- a/config.js
+++ b/config.js
@@ -14,6 +14,7 @@ const config = {
         settings: false,
         connections: false
     },
-    home: "/Credentials"
+    home: "/Credentials",
+    tenantId: "default"
 }
 export{config}
diff --git a/pages/index.vue b/pages/index.vue
index 091cf6b..9618d6b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -17,15 +17,15 @@
                         <p class="lead text-muted">
                             Connect your wallet and share<br>your credentials to access services. </p>
                         <p>
-                            <a :href="'/verifier-api/present/?walletId=' + wallets[0].id + '&schemaUri=' + vidSchemaUri + '&ui=http://foo'"
+                            <a :href="getPresentationUrl(wallets[0].id, vidSchemaUri)"
                                 class="btn btn-primary my-2 fw-bold _btn">Connect Wallet using <b>Verifiable ID</b></a>
                                 <a :href="'/xdevice/' + encodeURIComponent(vidSchemaUri)"
                                     class="btn btn-primary my-2 fw-bold _btn"><i class="bi bi-upc-scan" /></a>
 
-                            <a :href="'/verifier-api/present/?walletId=' + wallets[0].id + '&schemaUri=' + vidSchemaUri1 + '&ui=http://foo'"
+                            <a :href="getPresentationUrl(wallets[0].id, vidSchemaUri1)"
                                 class="btn btn-primary my-2 fw-bold _btn">Connect Wallet using <b>Open Badge Credential</b></a>
 
-                            <a :href="'/verifier-api/present/?walletId=' + wallets[0].id + '&schemaUri=' + bidSchemaUri"
+                            <a :href="getPresentationUrl(wallets[0].id, bidSchemaUri)"
                                 class="btn btn-success my-2 fw-bold _btn">Connect Wallet using <b>Bank ID</b></a>
                         </p>
                         <p class="text-muted fw-bold">© 2022 walt.id</p>
@@ -37,21 +37,25 @@
 </template>
 
 <script>
+import { config } from "../config";
 export default {
     data() {
         return {
-            vidSchemaUri1: "https://ngiatlantic.info/schema/V-2022-1/OpenBadgeCredential.json",
+            vidSchemaUri1: "https://purl.imsglobal.org/spec/ob/v3p0/schema/json/ob_v3p0_achievementcredential_schema.json",
             vidSchemaUri: 'https://api.preprod.ebsi.eu/trusted-schemas-registry/v1/schemas/0xb77f8516a965631b4f197ad54c65a9e2f9936ebfb76bae4906d33744dbcc60ba',
             bidSchemaUri: 'https://raw.githubusercontent.com/walt-id/waltid-ssikit-vclib/master/src/test/resources/schemas/EuropeanBankIdentity.json'
         }
     },
     async asyncData({ $axios }) {
-        const wallets = await $axios.$get('/verifier-api/wallets/list')
+        const wallets = await $axios.$get(`/verifier-api/${config.tenantId}/wallets/list`)
         return { wallets }
     },
     methods: {
         encodeURIComponent(str) {
             return encodeURIComponent(str)
+        },
+        getPresentationUrl(walletId, schemaUri) {
+            return `/verifier-api/${config.tenantId}/present/?walletId=${walletId}&schemaUri=${schemaUri}`
         }
     }
 }
diff --git a/pages/success.vue b/pages/success.vue
index ef74aab..362b24b 100644
--- a/pages/success.vue
+++ b/pages/success.vue
@@ -297,6 +297,7 @@
 </template>
 
 <script>
+import { config } from "../config";
 if (window.opener != null) {
   window.opener.location = window.location;
   window.close();
@@ -315,14 +316,11 @@ export default {
     let protectedData = {};
     if (route.query.access_token != null) {
       await $axios
-        .get(
-          "/verifier-api/auth?access_token=" +
-          route.query.access_token
-        )
+        .get(`/verifier-api/${config.tenantId}/auth?access_token=${route.query.access_token}`)
         .then(response => {
           result = response.data;
           console.log(response.data);
-          return $axios.get("/verifier-api/protected", {
+          return $axios.get(`/verifier-api/${config.tenantId}/protected`, {
             headers: {
               Authorization: "Bearer " + result.auth_token
             }
diff --git a/pages/xdevice/_schemaUri.vue b/pages/xdevice/_schemaUri.vue
index 7d382e6..8562187 100644
--- a/pages/xdevice/_schemaUri.vue
+++ b/pages/xdevice/_schemaUri.vue
@@ -21,13 +21,14 @@
 
 <script>
 import QRious from "qrious"
+import { config } from "../../config";
 
 export default {
     async asyncData({$axios, route}) {
-        const requestInfo = await $axios.$get('/verifier-api/presentXDevice?schemaUri=' + route.params.schemaUri)
+        const requestInfo = await $axios.$get(`/verifier-api/${config.tenantId}/presentXDevice?schemaUri=${route.params.schemaUri}`)
 
         let reqTimer = setInterval(async () => {
-            let response = await fetch("/verifier-api/verify/isVerified?state=" + requestInfo.requestId);
+            let response = await fetch(`/verifier-api/${config.tenantId}/verify/isVerified?state=${requestInfo.requestId}`);
 
             if (response.status === 200) {
                 window.clearTimeout(reqTimer);

From 02c7b6b97ba5df621193aa5088ab0182cdbc0d78 Mon Sep 17 00:00:00 2001
From: Severin Stampler <severin@walt.id>
Date: Tue, 10 Jan 2023 14:18:11 +0100
Subject: [PATCH 2/2] update dev config

---
 nuxt.config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index efb8bb1..b633b82 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -53,10 +53,10 @@ export default {
     },
 
     proxy: {
-        '/verifier-api/': 'https://wallet.walt-test.cloud',
-        '/api/': 'https://wallet.walt-test.cloud'
-        //'/verifier-api/': 'http://localhost:8080/',
-        //'/api/': 'http://localhost:8080/'
+        //'/verifier-api/': 'https://wallet.walt-test.cloud',
+        //'/api/': 'https://wallet.walt-test.cloud'
+        '/verifier-api/': 'http://localhost:8080/',
+        '/api/': 'http://localhost:8080/'
     },