From 5a3c4d84b846cbdca3f3fc6976e3587f4f306f02 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Thu, 2 Jan 2025 09:07:19 +0100
Subject: [PATCH] fix invite tests, convenience command

---
 apps/login/cypress/integration/invite.cy.ts           | 11 ++++++++++-
 .../zitadel.settings.v2.SettingsService.json          |  8 +-------
 apps/login/package.json                               |  1 +
 apps/login/src/components/verify-redirect-button.tsx  |  4 ++--
 apps/login/src/lib/server/verify.ts                   |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/login/cypress/integration/invite.cy.ts b/apps/login/cypress/integration/invite.cy.ts
index 5b343dccab..3014f5a2e5 100644
--- a/apps/login/cypress/integration/invite.cy.ts
+++ b/apps/login/cypress/integration/invite.cy.ts
@@ -38,7 +38,7 @@ describe("verify invite", () => {
             },
             email: {
               email: "john@zitadel.com",
-              isVerified: true, // email needs to be verified
+              isVerified: false,
             },
           },
         },
@@ -79,6 +79,15 @@ describe("verify invite", () => {
         },
       },
     });
+
+    stub("zitadel.settings.v2.SettingsService", "GetLoginSettings", {
+      data: {
+        settings: {
+          passkeysType: 1,
+          allowUsernamePassword: true,
+        },
+      },
+    });
   });
 
   it.only("shows authenticators after successful invite verification", () => {
diff --git a/apps/login/mock/initial-stubs/zitadel.settings.v2.SettingsService.json b/apps/login/mock/initial-stubs/zitadel.settings.v2.SettingsService.json
index f62b5da077..07e9980f9b 100644
--- a/apps/login/mock/initial-stubs/zitadel.settings.v2.SettingsService.json
+++ b/apps/login/mock/initial-stubs/zitadel.settings.v2.SettingsService.json
@@ -3,13 +3,7 @@
     "service": "zitadel.settings.v2.SettingsService",
     "method": "GetBrandingSettings",
     "out": {
-      "data": {
-        "settings": {
-          "darkTheme": {
-            "backgroundColor": "#ff0000"
-          }
-        }
-      }
+      "data": {}
     }
   },
   {
diff --git a/apps/login/package.json b/apps/login/package.json
index f8f3b89a3f..2311366c11 100644
--- a/apps/login/package.json
+++ b/apps/login/package.json
@@ -12,6 +12,7 @@
     "test:integration:watch": "concurrently --names 'mock,test' --kill-others 'pnpm:mock' 'env-cmd -f ./.env.integration start-server-and-test dev http://localhost:3000 \"pnpm nodemon -e js,jsx,ts,tsx,css,scss --ignore \\\"__test__/**\\\" --exec \\\"pnpm test:integration:run\\\"\"'",
     "test:integration:run": "cypress run --config-file ./cypress/cypress.config.ts --quiet",
     "test:integration:open": "cypress open --config-file ./cypress/cypress.config.ts",
+    "test:integration:runall": "concurrently --names 'mock,test' --kill-others 'pnpm:mock' 'env-cmd -f ./.env.integration start-server-and-test dev http://localhost:3000 \"pnpm nodemon -e js,jsx,ts,tsx,css,scss --ignore \\\"__test__/**\\\" --exec \\\"pnpm test:integration:open\\\"\"'",
     "mock": "pnpm mock:build && pnpm mock:run",
     "mock:run": "pnpm mock:stop && docker run --rm --name zitadel-mock-grpc-server --publish 22220:22220 --publish 22222:22222 zitadel-mock-grpc-server",
     "mock:build": "DOCKER_BUILDKIT=1 docker build --tag zitadel-mock-grpc-server ./mock",
diff --git a/apps/login/src/components/verify-redirect-button.tsx b/apps/login/src/components/verify-redirect-button.tsx
index 09a00efe37..552e787ebc 100644
--- a/apps/login/src/components/verify-redirect-button.tsx
+++ b/apps/login/src/components/verify-redirect-button.tsx
@@ -51,8 +51,8 @@ export function VerifyRedirectButton({
     }
 
     await sendVerificationRedirectWithoutCheck(command)
-      .catch((error) => {
-        setError("Could not verify user");
+      .catch(() => {
+        setError("Could not verify");
         return;
       })
       .finally(() => {
diff --git a/apps/login/src/lib/server/verify.ts b/apps/login/src/lib/server/verify.ts
index bfb1ec51c0..1028fb1c2b 100644
--- a/apps/login/src/lib/server/verify.ts
+++ b/apps/login/src/lib/server/verify.ts
@@ -40,7 +40,7 @@ export async function sendVerification(command: VerifyUserByEmailCommand) {
       });
 
   if (!verifyResponse) {
-    return { error: "Could not verify user" };
+    return { error: "Could not verify" };
   }
 
   let session: Session | undefined;