Merge pull request #380 from chaynHQ/develop

Merge Develop onto Main

.github/workflows/.ci.yml

@@ -2,7 +2,7 @@ name: Bloom Backend CI Pipeline
 
 on:
   pull_request:
-    branches: [develop, main]
+    branches: [develop]
   push:
     branches: [develop]
 

.github/workflows/codeql-analysis.yml

@@ -15,7 +15,7 @@ on:
   push:
     branches: [develop, main]
   pull_request:
-    branches: [develop, main]
+    branches: [develop]
   schedule:
     - cron: '25 5 * * 5'
 

.github/workflows/create-release-pr.yml

@@ -2,8 +2,7 @@ name: Create release PR
 
 on:
   push:
-    branches:
-      - develop
+    branches: [develop]
 
 jobs:
   create-pr-to-main:

src/api/crisp/crisp-api.ts

@@ -210,3 +210,25 @@ export const deleteCrispProfile = async (email: string) => {
     throw error;
   }
 };
+
+export const deleteCypressCrispProfiles = async () => {
+  try {
+    const profiles = await apiCall({
+      url: `${baseUrl}/people/profiles/1?search_text=cypresstestemail+`,
+      type: 'get',
+      headers,
+    });
+
+    profiles.data.data.forEach(async (profile) => {
+      await apiCall({
+        url: `${baseUrl}/people/profile/${profile.email}`,
+        type: 'delete',
+        headers,
+      });
+    });
+
+    return 'ok';
+  } catch (error) {
+    throw error;
+  }
+};

src/partner-access/partner-access.service.ts

@@ -206,7 +206,7 @@ export class PartnerAccessService {
       const partnerAccessRecords = await this.partnerAccessRepository //get partner access instances where user is a cypress user
         .createQueryBuilder('partnerAccess')
         .leftJoinAndSelect('partnerAccess.user', 'user')
-        .where('user.name LIKE :searchTerm', { searchTerm: `%Cypress test user%` })
+        .where('user.name LIKE :searchTerm', { searchTerm: `%Cypress test%` })
         .getMany();
       await Promise.all(
         partnerAccessRecords.map(async (access) => {

src/user/user.controller.ts

@@ -69,6 +69,13 @@ export class UserController {
     return await this.userService.deleteCypressTestUsers();
   }
 
+  @ApiBearerAuth('access-token')
+  @Delete('/cypress-clean')
+  @UseGuards(SuperAdminAuthGuard)
+  async cleanCypressUsers(): Promise<UserEntity[]> {
+    return await this.userService.deleteCypressTestUsers(true);
+  }
+
   @ApiBearerAuth()
   @Delete(':id')
   @ApiParam({ name: 'id', description: 'User id to delete' })

src/user/user.service.ts

@@ -14,6 +14,7 @@ import {
 import {
   addCrispProfile,
   deleteCrispProfile,
+  deleteCypressCrispProfiles,
   updateCrispProfileData,
 } from '../api/crisp/crisp-api';
 import { AuthService } from '../auth/auth.service';
@@ -353,7 +354,8 @@ export class UserService {
 
     return user;
   }
-  public async deleteCypressTestUsers(): Promise<UserEntity[]> {
+
+  public async deleteCypressTestUsers(clean = false): Promise<UserEntity[]> {
     try {
       const queryResult = await this.userRepository
         .createQueryBuilder('user')
@@ -364,6 +366,7 @@ export class UserService {
       const deletedUsers = await Promise.all(
         queryResult.map(async (user) => {
           try {
+            await deleteCrispProfile(user.email);
             await this.authService.deleteFirebaseUser(user.firebaseUid);
             await this.userRepository.delete(user);
             return user;
@@ -373,15 +376,28 @@ export class UserService {
         }),
       );
 
-      // Delete all remaining cypress firebase users (e.g. from failed user creations)
-      this.authService.deleteCypressFirebaseUsers();
-
       return deletedUsers;
     } catch (error) {
-      // If this fails we don't want to break cypress tests
-      this.logger.error(`deleteCypressTestAccessCodes - Unable to delete all cypress users`, error);
+      // If this fails we don't want to break cypress tests but we want to be alerted
+      this.logger.error(`deleteCypressTestUsers - Unable to delete all cypress users`, error);
+    }
+
+    try {
+      // Clean remaining user accounts in firebase and crisp that do not have a user record in the db
+      // These rogue accounts may be left over from incomplete signups or errors
+      if (clean) {
+        // Delete all remaining cypress firebase users (e.g. from failed user creations)
+        await this.authService.deleteCypressFirebaseUsers();
+
+        // Delete all remaining crisp accounts
+        await deleteCypressCrispProfiles();
+      }
+    } catch (error) {
+      // If this fails we don't want to break cypress tests but we want to be alerted
+      this.logger.error(`deleteCypressTestUsers - Unable to clean all cypress users`, error);
     }
   }
+
   public async getUsers(
     filters: {
       email?: string;