Skip to content

Commit 037cc85

Browse files
fixed user not found in db logic
1 parent eb82d0d commit 037cc85

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/modules/identity/repositories/user.repository.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,14 @@ export class UserRepository {
6666
{ _id },
6767
{ projection: { password: 0, verificationCode: 0, refresh_tokens: 0 } },
6868
);
69+
6970
const userObj: DecodedUserObject = {
70-
_id: data._id,
71-
email: data.email,
72-
name: data.name,
71+
_id: data?._id,
72+
email: data?.email,
73+
name: data?.name,
7374
role: "",
74-
teams: data.teams,
75-
workspaces: data.workspaces,
75+
teams: data?.teams,
76+
workspaces: data?.workspaces,
7677
emailVerificationCodeTimeStamp: data?.emailVerificationCodeTimeStamp,
7778
lastActive: data?.lastActive,
7879
};

src/modules/user-admin/services/user-admin.enterprise-user.service.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ export class AdminUsersService {
7373
const userRole = team.users.find(
7474
(member: any) => member.id.toString() === user.id.toString(),
7575
)?.role;
76-
76+
console.log(team?._id, "TeamId");
7777
return {
78-
id: team._id,
78+
id: team?._id || "1234",
7979
name: team.name,
8080
role: userRole,
8181
};
@@ -86,9 +86,9 @@ export class AdminUsersService {
8686
currentUser,
8787
);
8888
return {
89-
id: user.id,
89+
id: user?.id || user?._id,
9090
name: user.name,
91-
email: userOrg.email,
91+
email: userOrg.email || "",
9292
teams: userTeams,
9393
teamsAccess: user.teams.length,
9494
lastActive: userOrg?.lastActive || "",

0 commit comments

Comments
 (0)