feat(server): rebased migration files and resolved commits

Infisical · Mar 12, 2024 · 0f0e2b3 · 0f0e2b3
1 parent 47906c4
commit 0f0e2b3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/...b/migrations/20240308154949_temp-roles.ts → ...b/migrations/20240312162549_temp-roles.ts b/...b/migrations/20240308154949_temp-roles.ts → ...b/migrations/20240312162549_temp-roles.ts
diff --git a/...ions/20240311093939_temp-role-identity.ts → ...ions/20240312162556_temp-role-identity.ts b/...ions/20240311093939_temp-role-identity.ts → ...ions/20240312162556_temp-role-identity.ts
diff --git a/backend/src/services/project-membership/project-membership-dal.ts b/backend/src/services/project-membership/project-membership-dal.ts
@@ -53,11 +53,11 @@ export const projectMembershipDALFactory = (db: TDbClient) => {
 
       const members = sqlNestRelationships({
         data: docs,
-        parentMapper: ({ email, firstName, lastName, publicKey, isGhost, id, userId }) => ({
+        parentMapper: ({ email, firstName, username, lastName, publicKey, isGhost, id, userId }) => ({
           id,
           userId,
           projectId,
-          user: { email, firstName, lastName, id: userId, publicKey, isGhost }
+          user: { email, username, firstName, lastName, id: userId, publicKey, isGhost }
         }),
         key: "id",
         childrenMapper: [

diff --git a/frontend/src/hooks/api/users/types.ts b/frontend/src/hooks/api/users/types.ts
@@ -68,6 +68,7 @@ export type TWorkspaceUser = {
   id: string;
   user: {
     email: string;
+    username: string;
     firstName: string;
     lastName: string;
     id: string;