Merge branch 'dev' into feat/SSOTEAM-1221-01

bcgov · Dec 18, 2023 · 1fa2e2b · 1fa2e2b
2 parents b8d74d3 + be7c5f1
commit 1fa2e2b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/app/controllers/keycloak.ts b/app/controllers/keycloak.ts
@@ -28,7 +28,7 @@ export const removeUserAsRealmAdmin = async (emails: (string | null)[], env: str
     return;
   }
 
-  const role = await kcAdminClient.roles.findOneByName({ realm: 'master', name: `${realm}-realm-admins` });
+  const role = await kcAdminClient.roles.findOneByName({ realm: 'master', name: `${realm}-realm-admin` });
 
   if (role === null) return;
 

diff --git a/app/pages/api/realms/[id].ts b/app/pages/api/realms/[id].ts
@@ -265,30 +265,31 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
       if (!prResponse?.data.number) {
         console.info(`PR Failed for deletion of realm id ${id}`);
         // Intentionally not awaiting since 500 already, handling error async
-        failPR().catch((err) => console.error(err));
+        await failPR().catch((err) => console.error(err));
         return res.status(500).send('Unexpected error removing request. Please try again.');
       }
 
       const pr = await mergePullRequest(prResponse.data.number);
       if (!pr.data.merged) {
         console.info(`Failed to merge pull request for realm id ${id}`);
-        failPR().catch((err) => console.error(err));
+        await failPR().catch((err) => console.error(err));
         return res.status(500).send('Unexpected error removing request. Please try again.');
       }
 
       await deleteBranch(realm.realm!);
-
-      prisma.roster.update({
-        data: {
-          archived: true,
-          prNumber: prResponse.data.number,
-          status: StatusEnum.PRSUCCESS,
-        },
-        where: {
-          id: parseInt(id as string, 10),
-        },
-      });
-      sendDeleteEmail(realm, session);
+      await Promise.all([
+        prisma.roster.update({
+          data: {
+            archived: true,
+            prNumber: prResponse.data.number,
+            status: StatusEnum.PRSUCCESS,
+          },
+          where: {
+            id: parseInt(id as string, 10),
+          },
+        }),
+        sendDeleteEmail(realm, session),
+      ]);
       res.status(200).send('Success');
     } else {
       return res.status(404).json({ success: false, error: 'not found' });

diff --git a/app/pages/api/realms/pending.ts b/app/pages/api/realms/pending.ts
@@ -95,7 +95,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
               );
             }),
           );
-          sendDeletionCompleteEmail(currentRequest);
+          await sendDeletionCompleteEmail(currentRequest);
         } else if (success && action === ActionEnum.TF_APPLY) {
           const currentRequest = await prisma.roster.findUnique({
             where: {