Skip to content

Commit

Permalink
fix(authentication): team invite not requiring role and email
Browse files Browse the repository at this point in the history
fix(authentication): user query in invite using user object
  • Loading branch information
kkopanidis committed Mar 31, 2023
1 parent 8242ae3 commit 2261590
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions modules/authentication/src/handlers/team.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export class TeamsHandler implements IAuthenticationStrategy {
role: invite.role || 'member',
email: invite.email,
},
user: invite.inviter,
user: invite.inviter._id,
});
}

Expand Down Expand Up @@ -421,7 +421,7 @@ export class TeamsHandler implements IAuthenticationStrategy {
'Could not create invite, team does not exist',
);
}
const existingUser = await User.getInstance().findOne({ _id: user });
const existingUser = await User.getInstance().findOne({ _id: user._id });
if (!existingUser) {
throw new GrpcError(
status.INVALID_ARGUMENT,
Expand Down Expand Up @@ -691,8 +691,8 @@ export class TeamsHandler implements IAuthenticationStrategy {
teamId: ConduitObjectId.Required,
},
bodyParams: {
role: ConduitString.Optional,
email: ConduitString.Optional,
role: ConduitString.Required,
email: ConduitString.Required,
},
action: ConduitRouteActions.POST,
middlewares: ['authMiddleware'],
Expand Down Expand Up @@ -736,7 +736,7 @@ export class TeamsHandler implements IAuthenticationStrategy {
});
}
}
if (config.teams.invites.enabled && !config.teams.invites.sendEmail) {
if (config.teams.invites.enabled && config.teams.invites.sendEmail) {
if (!config.teams.invites.sendEmail || !this.grpcSdk.isAvailable('email')) {
ConduitGrpcSdk.Logger.warn(
'Team invites are enabled, but email sending is disabled. No invites will be sent.',
Expand Down

0 comments on commit 2261590

Please sign in to comment.