awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(server): rebased migration files and resolved commits

Browse Source
This commit is contained in:
Akhil Mohan
2024-03-12 21:57:45 +05:30
parent 47906c4dd4
commit 0f0e2b360c
4 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
backend/src/db/migrations/20240308154949_temp-roles.ts → backend/src/db/migrations/20240312162549_temp-roles.ts
View File

0
backend/src/db/migrations/20240311093939_temp-role-identity.ts → backend/src/db/migrations/20240312162556_temp-role-identity.ts
View File

4
backend/src/services/project-membership/project-membership-dal.ts
View File

@@ -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: [

1
frontend/src/hooks/api/users/types.ts
View File

@@ -68,6 +68,7 @@ export type TWorkspaceUser = {
id: string;
user: {
email: string;
username: string;
firstName: string;
lastName: string;
id: string;