Skip to content

Commit d93c968

Browse files
authored
Merge pull request #737 from learner-enthusiast/fixnullpointerexp
fix:null pointer exception
2 parents fb9a8cf + c662b2e commit d93c968

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,10 @@ export class AdminUsersService {
104104
users: team.users,
105105
};
106106
});
107-
return { teams: updatedFilteredTeams, users: newestUniqueUsers };
107+
return {
108+
teams: updatedFilteredTeams,
109+
users: newestUniqueUsers.filter((user) => !!user.email),
110+
};
108111
}
109112
async getUserDetails(
110113
ownerId: string,

0 commit comments

Comments
 (0)