From 5d6b6b538838ef435a32fb7e4c57934145f66594 Mon Sep 17 00:00:00 2001
From: Stefan Benz <46600784+stebenz@users.noreply.github.com>
Date: Thu, 28 Nov 2024 14:38:13 +0100
Subject: [PATCH] chore: cleanup and some fixes

---
 acceptance/sink/go.mod                        |  3 +++
 acceptance/tests/register.spec.ts             | 10 +++++--
 acceptance/tests/register.ts                  |  4 +++
 acceptance/tests/user.ts                      | 26 ++++++++++++-------
 acceptance/tests/username-passkey.spec.ts     |  1 +
 .../tests/username-password-changed.spec.ts   |  1 +
 .../tests/username-password-otp_email.spec.ts |  1 +
 .../tests/username-password-otp_sms.spec.ts   |  1 +
 .../tests/username-password-set.spec.ts       |  1 +
 .../tests/username-password-totp.spec.ts      |  1 +
 acceptance/tests/username-password.spec.ts    |  1 +
 11 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 acceptance/sink/go.mod

diff --git a/acceptance/sink/go.mod b/acceptance/sink/go.mod
new file mode 100644
index 00000000000..a33d6ae8bd0
--- /dev/null
+++ b/acceptance/sink/go.mod
@@ -0,0 +1,3 @@
+module github.com/zitadel/typescript/acceptance/sink
+
+go 1.22.6
diff --git a/acceptance/tests/register.spec.ts b/acceptance/tests/register.spec.ts
index 98e5669e9e6..a3ffc7a67ec 100644
--- a/acceptance/tests/register.spec.ts
+++ b/acceptance/tests/register.spec.ts
@@ -15,9 +15,12 @@ test("register with password", async ({ page }) => {
   const firstname = faker.person.firstName();
   const lastname = faker.person.lastName();
 
-  await removeUserByUsername(username);
   await registerWithPassword(page, firstname, lastname, username, password, password);
   await loginScreenExpect(page, firstname + " " + lastname);
+
+  // wait for projection of user
+  await page.waitForTimeout(2000);
+  await removeUserByUsername(username);
 });
 
 test("register with passkey", async ({ page }) => {
@@ -25,9 +28,12 @@ test("register with passkey", async ({ page }) => {
   const firstname = faker.person.firstName();
   const lastname = faker.person.lastName();
 
-  await removeUserByUsername(username);
   await registerWithPasskey(page, firstname, lastname, username);
   await loginScreenExpect(page, firstname + " " + lastname);
+
+  // wait for projection of user
+  await page.waitForTimeout(2000);
+  await removeUserByUsername(username);
 });
 
 test("register with username and password - only password enabled", async ({ page }) => {
diff --git a/acceptance/tests/register.ts b/acceptance/tests/register.ts
index f943e5bacc6..e250d60b12c 100644
--- a/acceptance/tests/register.ts
+++ b/acceptance/tests/register.ts
@@ -21,5 +21,9 @@ export async function registerWithPasskey(page: Page, firstname: string, lastnam
   await page.goto("/register");
   await registerUserScreenPasskey(page, firstname, lastname, email);
   await page.getByTestId("submit-button").click();
+
+  // wait for projection of user
+  await page.waitForTimeout(2000);
+  
   return await passkeyRegister(page);
 }
diff --git a/acceptance/tests/user.ts b/acceptance/tests/user.ts
index d8a967aed66..3daefdff082 100644
--- a/acceptance/tests/user.ts
+++ b/acceptance/tests/user.ts
@@ -23,16 +23,10 @@ class User {
     const response = await addUser(this.props);
 
     this.setUserId(response.userId);
-    // wait for projection of user
-    await page.waitForTimeout(2000);
   }
 
-  async remove() {
-    const resp: any = await getUserByUsername(this.getUsername());
-    if (!resp || !resp.result || !resp.result[0]) {
-      return;
-    }
-    await removeUser(resp.result[0].userId);
+  async cleanup() {
+    await removeUser(this.getUserId());
   }
 
   public setUserId(userId: string) {
@@ -68,7 +62,13 @@ class User {
   }
 }
 
-export class PasswordUser extends User {}
+export class PasswordUser extends User {
+  async ensure(page: Page) {
+    await super.ensure(page);
+    // wait for projection of user
+    await page.waitForTimeout(2000);
+  }
+}
 
 export enum OtpType {
   sms = "sms",
@@ -157,6 +157,14 @@ export class PasskeyUser extends User {
     await page.waitForTimeout(2000);
   }
 
+  async cleanup() {
+    const resp: any = await getUserByUsername(this.getUsername());
+    if (!resp || !resp.result || !resp.result[0]) {
+      return;
+    }
+    await removeUser(resp.result[0].userId);
+  }
+
   public getAuthenticatorId(): string {
     return this.authenticatorId;
   }
diff --git a/acceptance/tests/username-passkey.spec.ts b/acceptance/tests/username-passkey.spec.ts
index 7fbf290d99a..e73de3547fd 100644
--- a/acceptance/tests/username-passkey.spec.ts
+++ b/acceptance/tests/username-passkey.spec.ts
@@ -19,6 +19,7 @@ const test = base.extend<{ user: PasskeyUser }>({
     });
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password-changed.spec.ts b/acceptance/tests/username-password-changed.spec.ts
index cf3af995f78..c185e51ec91 100644
--- a/acceptance/tests/username-password-changed.spec.ts
+++ b/acceptance/tests/username-password-changed.spec.ts
@@ -22,6 +22,7 @@ const test = base.extend<{ user: PasswordUser }>({
     });
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password-otp_email.spec.ts b/acceptance/tests/username-password-otp_email.spec.ts
index b684fa80c60..daa2e0a4298 100644
--- a/acceptance/tests/username-password-otp_email.spec.ts
+++ b/acceptance/tests/username-password-otp_email.spec.ts
@@ -24,6 +24,7 @@ const test = base.extend<{ user: PasswordUserWithOTP; sink: any }>({
 
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password-otp_sms.spec.ts b/acceptance/tests/username-password-otp_sms.spec.ts
index 86220fd2d64..8fb91a66c79 100644
--- a/acceptance/tests/username-password-otp_sms.spec.ts
+++ b/acceptance/tests/username-password-otp_sms.spec.ts
@@ -24,6 +24,7 @@ const test = base.extend<{ user: PasswordUserWithOTP; sink: any }>({
 
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password-set.spec.ts b/acceptance/tests/username-password-set.spec.ts
index c2a60bd4106..30d442df50b 100644
--- a/acceptance/tests/username-password-set.spec.ts
+++ b/acceptance/tests/username-password-set.spec.ts
@@ -23,6 +23,7 @@ const test = base.extend<{ user: PasswordUser }>({
     });
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password-totp.spec.ts b/acceptance/tests/username-password-totp.spec.ts
index 33b1d9c09f1..4b6e6789318 100644
--- a/acceptance/tests/username-password-totp.spec.ts
+++ b/acceptance/tests/username-password-totp.spec.ts
@@ -23,6 +23,7 @@ const test = base.extend<{ user: PasswordUserWithTOTP; sink: any }>({
 
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });
 
diff --git a/acceptance/tests/username-password.spec.ts b/acceptance/tests/username-password.spec.ts
index 3f6bfd48f76..fcb6aad037b 100644
--- a/acceptance/tests/username-password.spec.ts
+++ b/acceptance/tests/username-password.spec.ts
@@ -24,6 +24,7 @@ const test = base.extend<{ user: PasswordUser }>({
     });
     await user.ensure(page);
     await use(user);
+    await user.cleanup();
   },
 });