Fix user add endpoint

bcgov · Sep 4, 2024 · 2caea88 · 2caea88
1 parent a2be81a
commit 2caea88
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/api/src/paths/user/add.ts b/api/src/paths/user/add.ts
@@ -148,10 +148,9 @@ export function addSystemRoleUser(): RequestHandler {
 
       const userService = new UserService(connection);
 
-      // If user already exists, do nothing and return early
       const user = await userService.getUserByIdentifier(userIdentifier, identitySource);
-
-      if (user) {
+      if (user?.record_end_date === null) {
+        // User already exists and is active, do nothing and return early
         throw new HTTP409('Failed to add user. User with matching identifier already exists.');
       }
 
@@ -166,12 +165,16 @@ export function addSystemRoleUser(): RequestHandler {
         family_name
       );
 
-      if (userObject) {
-        if (role_name) {
-          await userService.addUserSystemRoleByName(userObject.system_user_id, role_name);
-        } else {
-          await userService.addUserSystemRoles(userObject.system_user_id, [roleId]);
-        }
+      // Delete existin role
+      if (userObject.role_ids.length) {
+        await userService.deleteUserSystemRoles(userObject.system_user_id);
+      }
+
+      // Add the new role
+      if (role_name) {
+        await userService.addUserSystemRoleByName(userObject.system_user_id, role_name);
+      } else {
+        await userService.addUserSystemRoles(userObject.system_user_id, [roleId]);
       }
 
       await connection.commit();

diff --git a/database/tsconfig.json b/database/tsconfig.json
@@ -24,7 +24,7 @@
     "strict": true,
     "typeRoots": ["node_modules/@types"]
   },
-  "include": ["src", "20240722000002_remove_duplicate_users.ts", "20240722000002_remove_duplicate_users.ts"],
+  "include": ["src"],
   "ts-node": {
     "swc": true
   }