feat(3576): include MS AD user object ID into public cloud NATS

app/components/modal/AddUser.tsx

@@ -17,7 +17,7 @@ interface Props {
 export default function AddUserModal({ open, setOpen, setUserPrincipalName, setUserEmail }: Props) {
   const [query, setQuery] = useState<string>('');
   const [selected, setSelected] = useState<AppUser | undefined>({
-    id: '0',
+    providerUserId: '0',
     upn: '',
     email: '',
     idir: '',

app/core/auth-options.ts

@@ -276,6 +276,7 @@ export const authOptions: AuthOptions = {
       const upsertedUser = await upsertUser(loweremail, { lastSeen });
       if (!upsertedUser) {
         const data = {
+          providerUserId: '',
           firstName: given_name,
           lastName: family_name,
           email: loweremail,

app/emails/_components/Params.ts

@@ -22,6 +22,7 @@ const publicRequestData = {
     signedById: 'signed-by-id',
     signedBy: {
       id: 'd',
+      providerUserId: '',
       firstName: 'John',
       lastName: 'Doe',
       email: 'john.doe@gov.bc.ca',
@@ -39,6 +40,7 @@ const publicRequestData = {
     approvedById: 'approved-by-id',
     approvedBy: {
       id: 'd',
+      providerUserId: '',
       firstName: 'John',
       lastName: 'Doe',
       email: 'john.doe@gov.bc.ca',
@@ -54,6 +56,7 @@ const publicRequestData = {
     expenseAuthorityId: 'expense-authority-id',
     expenseAuthority: {
       id: 'd',
+      providerUserId: '',
       firstName: 'John',
       lastName: 'Doe',
       email: 'john.doe@gov.bc.ca',
@@ -89,6 +92,7 @@ const publicRequestData = {
   provider: 'AWS',
   projectOwner: {
     id: 'd',
+    providerUserId: '',
     firstName: 'John',
     lastName: 'Doe',
     email: 'john.doe@gov.bc.ca',
@@ -103,6 +107,7 @@ const publicRequestData = {
   },
   primaryTechnicalLead: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',
@@ -117,6 +122,7 @@ const publicRequestData = {
   },
   expenseAuthority: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',
@@ -194,6 +200,7 @@ export const samplePublicRequest = {
     provider: 'AWS', // or GOOGLE
     projectOwner: {
       id: 'd',
+      providerUserId: '',
       firstName: 'John',
       lastName: 'Doe',
       email: 'john.doe@gov.bc.ca',
@@ -208,6 +215,7 @@ export const samplePublicRequest = {
     },
     primaryTechnicalLead: {
       id: 'c',
+      providerUserId: '',
       firstName: 'Sarah',
       lastName: 'Williams',
       email: 'sarah.williams@gov.bc.ca',
@@ -222,6 +230,7 @@ export const samplePublicRequest = {
     },
     expenseAuthority: {
       id: 'c',
+      providerUserId: '',
       firstName: 'Sarah',
       lastName: 'Williams',
       email: 'sarah.williams@gov.bc.ca',
@@ -283,6 +292,7 @@ export const samplePublicProduct: PublicCloudRequestedProjectWithContacts = {
   provider: 'AWS',
   projectOwner: {
     id: 'd',
+    providerUserId: '',
     firstName: 'John',
     lastName: 'Doe',
     email: 'john.doe@gov.bc.ca',
@@ -297,6 +307,7 @@ export const samplePublicProduct: PublicCloudRequestedProjectWithContacts = {
   },
   primaryTechnicalLead: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',
@@ -311,6 +322,7 @@ export const samplePublicProduct: PublicCloudRequestedProjectWithContacts = {
   },
   expenseAuthority: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',
@@ -648,6 +660,7 @@ export const samplePrivateProduct: PrivateCloudRequestedProjectWithContacts = {
   cluster: 'SILVER',
   projectOwner: {
     id: 'd',
+    providerUserId: '',
     firstName: 'John',
     lastName: 'Doe',
     email: 'john.doe@gov.bc.ca',
@@ -662,6 +675,7 @@ export const samplePrivateProduct: PrivateCloudRequestedProjectWithContacts = {
   },
   primaryTechnicalLead: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',
@@ -676,6 +690,7 @@ export const samplePrivateProduct: PrivateCloudRequestedProjectWithContacts = {
   },
   secondaryTechnicalLead: {
     id: 'c',
+    providerUserId: '',
     firstName: 'Sarah',
     lastName: 'Williams',
     email: 'sarah.williams@gov.bc.ca',

app/prisma/schema.prisma

@@ -13,6 +13,7 @@ datasource db {
 
 model User {
   id                                                    String                         @id @default(auto()) @map("_id") @db.ObjectId
+  providerUserId                                        String?
   firstName                                             String?
   lastName                                              String?
   email                                                 String                         @unique

app/queries/users.ts

@@ -22,7 +22,7 @@ export async function getMatchingUserIds(search: string) {
 export async function createProxyUsers() {
   const dbUsers = await Promise.all(
     proxyUsers.map((puser: MsUser) => {
-      const { id, displayName, idirGuid, ...clearnUserData } = processMsUser(puser);
+      const { displayName, idirGuid, ...clearnUserData } = processMsUser(puser);
 
       clearnUserData.email = clearnUserData.email.toLowerCase();
       return prisma.user.upsert({

app/services/db/user.ts

@@ -19,6 +19,7 @@ export async function upsertUser(email: string, extra = {}) {
     const adUserPhoto = await getUserPhoto(email);
     const data = {
       email,
+      providerUserId: adUser.providerUserId,
       firstName: adUser.firstName,
       lastName: adUser.lastName,
       ministry: adUser.ministry,

app/services/msgraph/index.ts

@@ -4,7 +4,7 @@ import { MsUser, AppUser } from '@/types/user';
 import { callMsGraph, getAccessToken } from './core';
 export function processMsUser(user: MsUser): AppUser {
   return {
-    id: user.id,
+    providerUserId: user.id,
     upn: user.userPrincipalName,
     email: user.mail.toLowerCase(),
     idir: user.onPremisesSamAccountName,

app/services/nats/public-cloud/index.ts

@@ -1,4 +1,5 @@
 import { Prisma, PublicCloudRequest, PublicCloudRequestedProject, RequestType } from '@prisma/client';
+import { formatFullName } from '@/helpers/user';
 
 export type PublicCloudRequestedProjectWithContacts = Prisma.PublicCloudRequestedProjectGetPayload<{
   include: {
@@ -20,6 +21,21 @@ export type PublicCloudProjectWithContacts = Prisma.PublicCloudRequestedProjectG
   };
 }>;
 
+function prepareUser(user?: Prisma.UserGetPayload<null> | null) {
+  if (!user)
+    return {
+      name: '',
+      email: '',
+      providerUserId: '',
+    };
+
+  return {
+    name: formatFullName(user),
+    email: user.email,
+    providerUserId: user.providerUserId,
+  };
+}
+
 // Create a test env variable that prefix the namespace name with "t"
 export default function createPublicCloudNatsMessage(
   requestType: RequestType,
@@ -54,47 +70,19 @@ export default function createPublicCloudNatsMessage(
         prod: decisionData.environmentsEnabled.production,
         tools: decisionData.environmentsEnabled.tools,
       },
-      requested_product_owner: {
-        name: `${decisionData.projectOwner.firstName} ${decisionData.projectOwner.lastName}`,
-        email: decisionData.projectOwner.email,
-      },
-      current_product_owner: !currentProject
-        ? null
-        : {
-            name: `${currentProject.projectOwner.firstName} ${currentProject.projectOwner.lastName}`,
-            email: currentProject.projectOwner.email,
-          },
-      requested_expense_authority: {
-        name: `${decisionData.expenseAuthority?.firstName} ${decisionData.expenseAuthority?.lastName}`,
-        email: decisionData.expenseAuthority?.email,
-      },
-      current_expense_authority: !currentProject
-        ? null
-        : {
-            name: `${currentProject.expenseAuthority?.firstName} ${currentProject.expenseAuthority?.lastName}`,
-            email: currentProject.expenseAuthority?.email,
-          },
+      requested_product_owner: prepareUser(decisionData.projectOwner),
+      current_product_owner: !currentProject ? null : prepareUser(currentProject.projectOwner),
+      requested_expense_authority: prepareUser(decisionData.expenseAuthority),
+      current_expense_authority: !currentProject ? null : prepareUser(currentProject.expenseAuthority),
       requested_tech_leads: [
-        {
-          name: `${decisionData.primaryTechnicalLead.firstName} ${decisionData.primaryTechnicalLead.lastName}`,
-          email: decisionData.primaryTechnicalLead.email,
-        },
-        {
-          name: `${decisionData?.secondaryTechnicalLead?.firstName} ${decisionData?.secondaryTechnicalLead?.lastName}`,
-          email: decisionData?.secondaryTechnicalLead?.email,
-        },
+        prepareUser(decisionData.primaryTechnicalLead),
+        prepareUser(decisionData.secondaryTechnicalLead),
       ].filter((techLead) => Boolean(techLead.email)),
       current_tech_leads: !currentProject
         ? null
         : [
-            {
-              name: `${currentProject.primaryTechnicalLead.firstName} ${currentProject.primaryTechnicalLead.lastName}`,
-              email: currentProject.primaryTechnicalLead.email,
-            },
-            {
-              name: `${currentProject?.secondaryTechnicalLead?.firstName} ${currentProject?.secondaryTechnicalLead?.lastName}`,
-              email: currentProject?.secondaryTechnicalLead?.email,
-            },
+            prepareUser(currentProject.primaryTechnicalLead),
+            prepareUser(currentProject?.secondaryTechnicalLead),
           ].filter((techLead) => Boolean(techLead.email)),
     },
   };

app/types/user.ts

@@ -11,7 +11,7 @@ export interface MsUser {
 }
 
 export interface AppUser {
-  id: string;
+  providerUserId: string;
   upn: string;
   email: string;
   idir: string;