VDX-308: || or ?? as option separator

Sphereon-Opensource · Nov 15, 2023 · 81a005a · 81a005a
1 parent 52e40fc
commit 81a005a
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 49 deletions.
diff --git a/packages/agent/conf/demos/dbc/oid4vci_metadata/dbc.json b/packages/agent/conf/demos/dbc/oid4vci_metadata/dbc.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_DBC | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_DBC ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_DBC | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_DBC | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_DBC ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_DBC ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Dutch Blockchain Coalition",

diff --git a/packages/agent/conf/demos/dbc/oid4vci_options/dbc.json b/packages/agent/conf/demos/dbc/oid4vci_options/dbc.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "dbc2023",
-  "correlationId": "${AGENT_ENDPOINT_DBC | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_DBC ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/energy-shr/oid4vci_metadata/energyshr.json b/packages/agent/conf/demos/energy-shr/oid4vci_metadata/energyshr.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_ESHR ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_ESHR ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_ESHR ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "EnergySHR",

diff --git a/packages/agent/conf/demos/energy-shr/oid4vci_options/energyshr.json b/packages/agent/conf/demos/energy-shr/oid4vci_options/energyshr.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "energySHR",
-  "correlationId": "${AGENT_ENDPOINT_ESHR | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_ESHR ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/fmdm/oid4vci_metadata/fmdm.json b/packages/agent/conf/demos/fmdm/oid4vci_metadata/fmdm.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_FMDM ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_FMDM ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_FMDM ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Future Mobility Alliance",

diff --git a/packages/agent/conf/demos/fmdm/oid4vci_options/fmdm.json b/packages/agent/conf/demos/fmdm/oid4vci_options/fmdm.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "fmdm2023",
-  "correlationId": "${AGENT_ENDPOINT_FMDM | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_FMDM ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/knb/auckland/oid4vci_metadata/knb_van_auckland.json b/packages/agent/conf/demos/knb/auckland/oid4vci_metadata/knb_van_auckland.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_NOTARY ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_NOTARY ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_NOTARY ?? AGENT_ENDPOINT ?? http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Van Auckland notaries",

diff --git a/packages/agent/conf/demos/knb/auckland/oid4vci_options/knb_van_auckland.json b/packages/agent/conf/demos/knb/auckland/oid4vci_options/knb_van_auckland.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-auckland",
-  "correlationId": "${AGENT_ENDPOINT_NOTARY | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_NOTARY ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/knb/bank/oid4vci_metadata/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vci_metadata/knb_bank.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_BANK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_BANK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_BANK ?? AGENT_ENDPOINT ?? http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Babylon Bank",

diff --git a/packages/agent/conf/demos/knb/bank/oid4vci_options/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vci_options/knb_bank.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-bank",
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_BANK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/knb/bank/oid4vp_options/knb_bank.json b/packages/agent/conf/demos/knb/bank/oid4vp_options/knb_bank.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-bank",
-  "correlationId": "${AGENT_ENDPOINT_BANK | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_BANK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/knb/kvk/oid4vci_metadata/knb_kvk.json b/packages/agent/conf/demos/knb/kvk/oid4vci_metadata/knb_kvk.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_KVK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_KVK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_KVK ?? AGENT_ENDPOINT ?? http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Kamer van koophandel",

diff --git a/packages/agent/conf/demos/knb/kvk/oid4vci_options/knb_kvk.json b/packages/agent/conf/demos/knb/kvk/oid4vci_options/knb_kvk.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "knb-kvk",
-  "correlationId": "${AGENT_ENDPOINT_KVK | AGENT_ENDPOINT | http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_KVK ?? AGENT_ENDPOINT ?? http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/pf3/oid4vci_metadata/pf3.json b/packages/agent/conf/demos/pf3/oid4vci_metadata/pf3.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_PF3 | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_PF3 ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_PF3 | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_PF3 | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_PF3 ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_PF3 ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Sphereon",

diff --git a/packages/agent/conf/demos/pf3/oid4vci_options/pf3.json b/packages/agent/conf/demos/pf3/oid4vci_options/pf3.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "pf3",
-  "correlationId": "${AGENT_ENDPOINT_PF3 | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_PF3 ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/sphereonGuest/oid4vci_metadata/sphereonGuest.json b/packages/agent/conf/demos/sphereonGuest/oid4vci_metadata/sphereonGuest.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_SPHEREONGUEST | AGENT_ENDPOINT | 'http://localhost:5000' }",
+  "correlationId": "${AGENT_ENDPOINT_SPHEREONGUEST ?? AGENT_ENDPOINT ?? 'http://localhost:5000' }",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_SPHEREONGUEST | AGENT_ENDPOINT | 'http://localhost:5000' }",
-    "credential_endpoint": "${AGENT_ENDPOINT_SPHEREONGUEST | AGENT_ENDPOINT | 'http://localhost:5000' }/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_SPHEREONGUEST ?? AGENT_ENDPOINT ?? 'http://localhost:5000' }",
+    "credential_endpoint": "${AGENT_ENDPOINT_SPHEREONGUEST ?? AGENT_ENDPOINT ?? 'http://localhost:5000' }/credentials",
     "display": [
       {
         "name": "Sphereon International",

diff --git a/packages/agent/conf/demos/sphereonGuest/oid4vci_options/sphereonGuest.json b/packages/agent/conf/demos/sphereonGuest/oid4vci_options/sphereonGuest.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "sphereonGuest",
-  "correlationId": "${AGENT_ENDPOINT_SPHEREONGUEST | AGENT_ENDPOINT | 'http://localhost:5000' }",
+  "correlationId": "${AGENT_ENDPOINT_SPHEREONGUEST ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/triall/oid4vci_metadata/triall.json b/packages/agent/conf/demos/triall/oid4vci_metadata/triall.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_TRIALL | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_TRIALL ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_TRIALL | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_TRIALL | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_TRIALL ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_TRIALL ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Triall",

diff --git a/packages/agent/conf/demos/triall/oid4vci_options/triall.json b/packages/agent/conf/demos/triall/oid4vci_options/triall.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "triall2023",
-  "correlationId": "${AGENT_ENDPOINT_TRIALL | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_TRIALL ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/conf/demos/unified-post/banqup/oid4vci_metadata/banqup.json b/packages/agent/conf/demos/unified-post/banqup/oid4vci_metadata/banqup.json
@@ -1,9 +1,9 @@
 {
-  "correlationId": "${AGENT_ENDPOINT_BANQUP | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_BANQUP ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "overwriteExisting": true,
   "metadata": {
-    "credential_issuer": "${AGENT_ENDPOINT_BANQUP | AGENT_ENDPOINT | 'http://localhost:5000'}",
-    "credential_endpoint": "${AGENT_ENDPOINT_BANQUP | AGENT_ENDPOINT | 'http://localhost:5000'}/credentials",
+    "credential_issuer": "${AGENT_ENDPOINT_BANQUP ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
+    "credential_endpoint": "${AGENT_ENDPOINT_BANQUP ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}/credentials",
     "display": [
       {
         "name": "Banqup",

diff --git a/packages/agent/conf/demos/unified-post/banqup/oid4vci_options/banqup.json b/packages/agent/conf/demos/unified-post/banqup/oid4vci_options/banqup.json
@@ -1,6 +1,6 @@
 {
   "definitionId": "banqup",
-  "correlationId": "${AGENT_ENDPOINT_BANQUP | AGENT_ENDPOINT | 'http://localhost:5000'}",
+  "correlationId": "${AGENT_ENDPOINT_BANQUP ?? AGENT_ENDPOINT ?? 'http://localhost:5000'}",
   "issuerOpts": {
     "didOpts": {
       "checkLinkedDomains": "if_present"

diff --git a/packages/agent/src/utils/generic.ts b/packages/agent/src/utils/generic.ts
@@ -40,23 +40,22 @@ export function loadJsonFiles<T>({path}: { path: string }): {
 }
 
 function substituteEnvVars(content: string): string {
-    const envVarRegex = /\$\{([^}]+)}/g
+    const envVarRegex = /\$\{([^}]+)}/g;
     return content.replace(envVarRegex, (_, vars) => {
-        const options = vars.split('|').map((opt: string) => opt.trim())
+        const options = vars.split(/(?:\|\|)|(?:\?\?)/).map((opt: string) => opt.trim()).filter(Boolean);
         for (const option of options) {
             if (option.startsWith("'") && option.endsWith("'")) {
-                return option.slice(1, -1)
+                return option.slice(1, -1);
             }
-            const envValue = process.env[option]
+            const envValue = process.env[option];
             if (envValue !== undefined && envValue !== null && envValue.trim() !== '') {
-                return envValue
+                return envValue;
             }
         }
-        return ''
-    })
+        return '';
+    });
 }
 
-
 /**
  * The function builds a file path without missing or excess slashes
  * @param segments