chore(e2e): Clean up users with test phone numbers

.changeset/polite-flies-kick.md

@@ -0,0 +1,2 @@
+---
+---

integration/cleanup/cleanup.setup.ts

@@ -17,12 +17,20 @@ setup('cleanup instances ', async () => {
   for (const entry of entries) {
     console.log(`Cleanup for ${entry.secretKey.replace(/(sk_test_)(.+)(...)/, '$1***$3')}`);
     const clerkClient = createClerkClient({ secretKey: entry.secretKey });
-    const { data: users } = await clerkClient.users.getUserList({
+    const { data: usersWithEmail } = await clerkClient.users.getUserList({
       orderBy: '-created_at',
       query: 'clerkcookie',
       limit: 150,
     });
 
+    const { data: usersWithPhoneNumber } = await clerkClient.users.getUserList({
+      orderBy: '-created_at',
+      query: '55501',
+      limit: 150,
+    });
+
+    const users = [...usersWithEmail, ...usersWithPhoneNumber];
+
     const { data: orgs } = await clerkClient.organizations
       .getOrganizationList({
         limit: 150,

integration/testUtils/usersService.ts

@@ -64,7 +64,7 @@ export type UserService = {
    * Creates a BAPI user if it doesn't exist, otherwise returns the existing user.
    */
   getOrCreateUser: (fakeUser: FakeUser) => Promise<User>;
-  deleteIfExists: (opts: { id?: string; email?: string }) => Promise<void>;
+  deleteIfExists: (opts: { id?: string; email?: string; phoneNumber?: string }) => Promise<void>;
   createFakeOrganization: (userId: string) => Promise<FakeOrganization>;
   getUser: (opts: { id?: string; email?: string }) => Promise<User | undefined>;
 };
@@ -92,15 +92,16 @@ export const createUserService = (clerkClient: ClerkClient) => {
       const email = fictionalEmail
         ? `${randomHash}+clerk_test@clerkcookie.com`
         : `clerkcookie+${randomHash}@mailsac.com`;
+      const phoneNumber = fakerPhoneNumber();
 
       return {
         firstName: faker.person.firstName(),
         lastName: faker.person.lastName(),
         email: withEmail ? email : undefined,
         username: withUsername ? `${randomHash}_clerk_cookie` : undefined,
         password: withPassword ? `${email}${randomHash}` : undefined,
-        phoneNumber: withPhoneNumber ? fakerPhoneNumber() : undefined,
-        deleteIfExists: () => self.deleteIfExists({ email }),
+        phoneNumber: withPhoneNumber ? phoneNumber : undefined,
+        deleteIfExists: () => self.deleteIfExists({ email, phoneNumber }),
       };
     },
     createBapiUser: async fakeUser => {
@@ -121,16 +122,19 @@ export const createUserService = (clerkClient: ClerkClient) => {
       }
       return await self.createBapiUser(fakeUser);
     },
-    deleteIfExists: async (opts: { id?: string; email?: string }) => {
+    deleteIfExists: async (opts: { id?: string; email?: string; phoneNumber?: string }) => {
       let id = opts.id;
 
       if (!id) {
-        const { data: users } = await clerkClient.users.getUserList({ emailAddress: [opts.email] });
+        const { data: users } = await clerkClient.users.getUserList({
+          emailAddress: [opts.email],
+          phoneNumber: [opts.phoneNumber],
+        });
         id = users[0]?.id;
       }
 
       if (!id) {
-        console.log(`User "${opts.email}" does not exist!`);
+        console.log(`User "${opts.email || opts.phoneNumber}" does not exist!`);
         return;
       }
 

integration/tests/whatsapp-phone-code.test.ts

@@ -21,7 +21,7 @@ test.describe('sign up and sign in with WhatsApp phone code @generic', () => {
         await app.withEnv(appConfigs.envs.withWhatsappPhoneCode);
         await app.dev();
         fakeUser = createTestUtils({ app }).services.users.createFakeUser({
-          fictionalEmail: true,
+          withEmail: false,
           withPhoneNumber: true,
           withPassword: false,
         });