Merge branch 'main' into fix/verifier-metadata

walt-id · Jan 24, 2025 · ad68702 · ad68702
2 parents c1c1190 + bdf79ee
commit ad68702
Show file tree

Hide file tree

Showing 63 changed files with 1,590 additions and 21,726 deletions.
diff --git a/.run/Web wallet backend.run.xml b/.run/Web wallet backend.run.xml
@@ -1,14 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Web wallet backend" type="JetRunConfigurationType">
-        <option name="ALTERNATIVE_JRE_PATH" value="21"/>
-        <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true"/>
-        <option name="MAIN_CLASS_NAME" value="id.walt.webwallet.MainKt"/>
-        <module name="id.walt.waltid-identity.waltid-services.waltid-wallet-api.main"/>
-        <option name="PROGRAM_PARAMETERS" value="--logLevel=trace"/>
-        <shortenClasspath name="NONE"/>
-        <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/waltid-services/waltid-wallet-api"/>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
-</component>
+  <configuration default="false" name="Web wallet backend" type="JetRunConfigurationType">
+    <option name="ALTERNATIVE_JRE_PATH" value="21" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+    <option name="MAIN_CLASS_NAME" value="id.walt.webwallet.MainKt" />
+    <module name="waltid-identity.waltid-services.waltid-wallet-api.main" />
+    <option name="PROGRAM_PARAMETERS" value="--logLevel=trace" />
+    <shortenClasspath name="NONE" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/waltid-services/waltid-wallet-api" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/docker-compose/wallet-api/config/_features.conf b/docker-compose/wallet-api/config/_features.conf
@@ -1,5 +1,11 @@
 enabledFeatures = [
-    # trusted-ca
+    # external-signature-endpoints,
+    # trusted-ca,
     # entra,
+    # ktor-authnz,
+    # dev-mode
     # ...
 ]
+disabledFeatures = [
+    # auth   # legacy auth
+]
diff --git a/docker-compose/wallet-api/config/ktor-authnz.conf b/docker-compose/wallet-api/config/ktor-authnz.conf
@@ -0,0 +1,35 @@
+# Will secure login cookies with `Secure` context, enable HTTS and HTTP->HTTPS redirect
+requireHttps = false
+
+# Key (all waltid-crypto supported) to sign login token - has to be key allowing signing (private key)
+signingKey = {"type": "jwk", "jwk": {"kty": "OKP", "d": "z8Lk85rAtfv2RJN_cD_-9nqHHwKTlTQ5_I53LcsHjC4", "use": "sig", "crv": "Ed25519", "x": "Ew76rQJ9gPHCOBOwJlf__Il5IjgSAc3bQ_a8psd-F3E", "alg": "EdDSA"}}
+
+# Key (all waltid-crypto supported) to verify incoming login tokens - public key is ok.
+verificationKey = {"type": "jwk", "jwk": {"kty": "OKP", "d": "z8Lk85rAtfv2RJN_cD_-9nqHHwKTlTQ5_I53LcsHjC4", "use": "sig", "crv": "Ed25519", "x": "Ew76rQJ9gPHCOBOwJlf__Il5IjgSAc3bQ_a8psd-F3E", "alg": "EdDSA"}}
+
+# Provide pepper to use for additional password salting (unique string for your deployment,
+# has to be shared between instances).
+pepper = "waltid"
+
+# Hash algorithm to use for passwords for signing.
+# You can choose from algorithms like: ARGON2, PBKDF2, PBKDF2_COMPRESSED, BCRYPT, SCRYPT, BALLON_HASHING, MESSAGE_DIGEST, NONE
+hashAlgorithm = ARGON2
+
+# Configure the Auth Flow (refer to: waltid-ktor-authnz)
+authFlow = {
+    method: web3
+    expiration: "7d" # optional: Set expiration time for login tokens, e.g. a week
+    ok: true # Auth flow ends successfuly with this step
+}
+
+cookieDomain = null
+
+# If you previously used other (older) password hash algorithms, you
+# can use this function to migrate old hashes to new hash algorithms. This
+# works at login-time: When a user logs in with a password that uses a hash algorithm
+# on this list, the password will be re-hashed in the specified replacement algorithm.
+# If null is used as hash algorithm selector, all algorithms expect for the target
+# algorithm will be converted automatically.
+hashMigrations = {
+    MESSAGE_DIGEST: ARGON2 # E.g.: Convert all the MD5 hashes to Argon2 hashes
+}
diff --git a/docker-compose/wallet-api/walt.yaml b/docker-compose/wallet-api/walt.yaml
diff --git a/...pplications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/default-reduced-nav.vue b/...pplications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/default-reduced-nav.vue
@@ -234,7 +234,7 @@
                   <!-- src="https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"/> -->
                   <span
                     class="ml-3 hidden text-sm font-medium text-gray-700 lg:block"
-                    >{{ user.email }}</span
+                    >{{ user.friendlyName }}</span
                   >
                   <ChevronDownIcon
                     aria-hidden="true"

diff --git a/waltid-applications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/default.vue b/waltid-applications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/default.vue
@@ -269,7 +269,7 @@
                   <!-- src="https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"/> -->
                   <span
                     class="ml-3 hidden text-sm font-medium text-gray-700 lg:block"
-                    >{{ user.email }}</span
+                    >{{ user.friendlyName }}</span
                   >
                   <ChevronDownIcon
                     aria-hidden="true"

diff --git a/...cations/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/desktop-without-sidebar.vue b/...cations/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/desktop-without-sidebar.vue
@@ -36,8 +36,7 @@
                                     d="M20.6256 10.2949C20.6256 11.3235 20.1909 12.3099 19.4172 13.0373C18.6435 13.7646 17.5942 14.1732 16.5 14.1732C15.4058 14.1732 14.3565 13.7646 13.5828 13.0373C12.8091 12.3099 12.3744 11.3235 12.3744 10.2949C12.3744 9.26639 12.8091 8.27995 13.5828 7.55265C14.3565 6.82534 15.4058 6.41675 16.5 6.41675C17.5942 6.41675 18.6435 6.82534 19.4172 7.55265C20.1909 8.27995 20.6256 9.26639 20.6256 10.2949ZM8.25 24.8956C8.28535 22.8607 9.17009 20.9204 10.7134 19.4931C12.2568 18.0658 14.335 17.2659 16.5 17.2659C18.665 17.2659 20.7432 18.0658 22.2866 19.4931C23.8299 20.9204 24.7146 22.8607 24.75 24.8956C22.1618 26.0112 19.3473 26.587 16.5 26.5834C13.556 26.5834 10.7616 25.9794 8.25 24.8956Z"
                                     stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
                             </svg>
-                            <span class="ml-1 hidden text-sm font-medium text-gray-700 lg:block">{{ user.email
-                                }}</span>
+                            <span class="ml-1 hidden text-sm font-medium text-gray-700 lg:block">{{ user.friendlyName }}</span>
                             <ChevronDownIcon aria-hidden="true"
                                 class="ml-1 hidden h-5 w-5 flex-shrink-0 text-gray-400 lg:block" />
                         </MenuButton>
@@ -88,4 +87,4 @@ const { user } = storeToRefs(userStore);
 
 const currentWallet = useCurrentWallet()
 const profileUrl = `/wallet/${currentWallet.value}/profile`
-</script>
+</script>
diff --git a/waltid-applications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/desktop.vue b/waltid-applications/waltid-web-wallet/apps/waltid-demo-wallet/src/layouts/desktop.vue
@@ -56,7 +56,7 @@
               </svg>
               <span
                 class="ml-1 hidden text-sm font-medium text-gray-700 lg:block"
-                >{{ user.email }}</span
+                >{{ user.friendlyName }}</span
               >
               <ChevronDownIcon
                 aria-hidden="true"

diff --git a/...lications/waltid-web-wallet/apps/waltid-demo-wallet/src/pages/wallet/[wallet]/profile.vue b/...lications/waltid-web-wallet/apps/waltid-demo-wallet/src/pages/wallet/[wallet]/profile.vue
@@ -19,7 +19,7 @@
         />
       </svg>
     </div>
-    <p class="text-center font-bold">{{ user.email }}</p>
+    <p class="text-center font-bold">{{ user.friendlyName }}</p>
     <div class="bg-white rounded-lg shadow-md p-4 mt-4">
       <div class="font-bold text-lg">DID</div>
       <p class="mt-2">

diff --git a/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/Caddyfile b/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/Caddyfile
@@ -1,5 +1,5 @@
 wallet.local {
-    reverse_proxy localhost:7104 # frontend
+    reverse_proxy localhost:7101 # frontend
     reverse_proxy /wallet-api/* localhost:7001 # backend
 }
 
diff --git a/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/package.json b/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/package.json
@@ -17,7 +17,8 @@
     "pinia": "^2.2.4",
     "qr-scanner": "^1.4.2",
     "qrcode.vue": "^3.5.0",
-    "unocss": "^0.63.4"
+    "unocss": "^0.63.4",
+    "@metamask/sdk": "^0.31.4"
   },
   "devDependencies": {
     "@nuxt/content": "^2.13.4",

diff --git a/...applications/waltid-web-wallet/apps/waltid-dev-wallet/src/layouts/default-reduced-nav.vue b/...applications/waltid-web-wallet/apps/waltid-dev-wallet/src/layouts/default-reduced-nav.vue
@@ -234,7 +234,7 @@
                   <!-- src="https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"/> -->
                   <span
                     class="ml-3 hidden text-sm font-medium text-gray-700 lg:block"
-                    >{{ user.email }}</span
+                    >{{ user.friendlyName }}</span
                   >
                   <ChevronDownIcon
                     aria-hidden="true"

diff --git a/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/src/layouts/default.vue b/waltid-applications/waltid-web-wallet/apps/waltid-dev-wallet/src/layouts/default.vue
@@ -269,7 +269,7 @@
                   <!-- src="https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80"/> -->
                   <span
                     class="ml-3 hidden text-sm font-medium text-gray-700 lg:block"
-                    >{{ user.email }}</span
+                    >{{ user.friendlyName }}</span
                   >
                   <ChevronDownIcon
                     aria-hidden="true"