Merge branch 'main' into login-passkey

CONTRIBUTING.md

@@ -51,7 +51,7 @@ docker compose --file ./acceptance/docker-compose.yaml pull
 docker compose --file ./acceptance/docker-compose.yaml run setup
 
 # Configure your shell to use the environment variables written to ./apps/login/.env.acceptance
-source ./apps/login/.env.acceptance
+export $(cat ./apps/login/.env.acceptance | xargs)
 ```
 
 ### Developing Against Your ZITADEL Cloud Instance

acceptance/docker-compose.yaml

@@ -45,7 +45,7 @@ services:
     environment:
       KEY: /key/zitadel-admin-sa.json
       SERVICE: http://zitadel:8080
-      WRITE_ENVIRONMENT_FILE: /apps/login/.env.local
+      WRITE_ENVIRONMENT_FILE: /apps/login/.env.acceptance
     volumes:
       - "./machinekey:/key"
       - "../apps/login:/apps/login"

apps/login/app/(login)/passkey/add/page.tsx

@@ -44,7 +44,7 @@ export default async function Page({
       <Alert type={AlertType.INFO}>
         <span>
           A passkey is an authentication method on a device like your
-          fingerprint, Apple FaceID or similar.{" "}
+          fingerprint, Apple FaceID or similar.
           <a
             className="text-primary-light-500 dark:text-primary-dark-500 hover:text-primary-light-300 hover:dark:text-primary-dark-300"
             target="_blank"

apps/login/lib/zitadel.ts

@@ -173,20 +173,20 @@ export async function addHumanUser(
   { email, firstName, lastName, password }: AddHumanUserData
 ): Promise<string> {
   const mgmt = user.getUser(server);
+
+  const payload = {
+    email: { email },
+    username: email,
+    profile: { firstName, lastName },
+  };
   return mgmt
     .addHumanUser(
       password
         ? {
-            email: { email },
-            username: email,
-            profile: { firstName, lastName },
+            ...payload,
             password: { password },
           }
-        : {
-            email: { email },
-            username: email,
-            profile: { firstName, lastName },
-          },
+        : payload,
       {}
     )
     .then((resp: AddHumanUserResponse) => {

apps/login/ui/RegisterPasskey.tsx

@@ -152,12 +152,11 @@ export default function RegisterPasskey({ sessionId, isPrompt }: Props) {
           .catch((error) => {
             console.error(error);
             setLoading(false);
-            //   setError(error);
+            setError(error);
 
             return null;
           });
       }
-      //   return router.push(`/accounts`);
     });
   }
 

pnpm-lock.yaml

@@ -138,7 +138,7 @@ importers:
       eslint-config-turbo: latest
       eslint-plugin-react: 7.28.0
     dependencies:
-      eslint-config-next: 13.4.7_dewl7jrzrufmm6i6j6pp2pqhja
+      eslint-config-next: 13.4.8_dewl7jrzrufmm6i6j6pp2pqhja
       eslint-config-prettier: 8.5.0_eslint@8.28.0
       eslint-config-turbo: 1.10.7_eslint@8.28.0
       eslint-plugin-react: 7.28.0_eslint@8.28.0
@@ -1392,8 +1392,8 @@ packages:
     resolution: {integrity: sha512-ZlbiFulnwiFsW9UV1ku1OvX/oyIPLtMk9p/nnvDSwI0s7vSoZdRtxXNsaO+ZXrLv/pMbXVGq4lL8TbY9iuGmVw==}
     dev: false
 
-  /@next/eslint-plugin-next/13.4.7:
-    resolution: {integrity: sha512-ANEPltxzXbyyG7CvqxdY4PmeM5+RyWdAJGufTHnU+LA/i3J6IDV2r8Z4onKwskwKEhwqzz5lMaSYGGXLyHX+mg==}
+  /@next/eslint-plugin-next/13.4.8:
+    resolution: {integrity: sha512-cmfVHpxWjjcETFt2WHnoFU6EmY69QcPJRlRNAooQlNe53Ke90vg1Ci/dkPffryJZaxxiRziP9bQrV8lDVCn3Fw==}
     dependencies:
       glob: 7.1.7
     dev: false
@@ -3694,8 +3694,8 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /eslint-config-next/13.4.7_dewl7jrzrufmm6i6j6pp2pqhja:
-    resolution: {integrity: sha512-+IRAyD0+J1MZaTi9RQMPUfr6Q+GCZ1wOkK6XM52Vokh7VI4R6YFGOFzdkEFHl4ZyIX4FKa5vcwUP2WscSFNjNQ==}
+  /eslint-config-next/13.4.8_dewl7jrzrufmm6i6j6pp2pqhja:
+    resolution: {integrity: sha512-2hE0b6lHuhtHBX8VgEXi8v4G8PVrPUBMOSLCTq8qtcQ2qQOX7+uBOLK2kU4FD2qDZzyXNlhmuH+WLT5ptY4XLA==}
     peerDependencies:
       eslint: ^7.23.0 || ^8.0.0
       typescript: '>=3.3.1'
@@ -3703,7 +3703,7 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@next/eslint-plugin-next': 13.4.7
+      '@next/eslint-plugin-next': 13.4.8
       '@rushstack/eslint-patch': 1.2.0
       '@typescript-eslint/parser': 5.44.0_dewl7jrzrufmm6i6j6pp2pqhja
       eslint: 8.28.0
@@ -5216,7 +5216,7 @@ packages:
       pretty-format: 29.5.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
-      ts-node: 10.9.1_d2gyhxeuxd6tnmgqdyixls47tq
+      ts-node: 10.9.1_wup25etrarvlqkprac7h35hj7u
     transitivePeerDependencies:
       - supports-color
     dev: true