🐛 Fix activate user route

Honeybrain · Sep 18, 2023 · 0392ad8 · 0392ad8
1 parent 3457e21
commit 0392ad8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/invitation/invitation.repository.ts b/src/invitation/invitation.repository.ts
@@ -14,6 +14,9 @@ export class InvitationRepository {
   findByToken = (token: string) =>
     this.model.findOne({ activationToken: token }).orFail(new RpcException('INVITATION_NOT_FOUND')).exec();
 
-  markUsed = (token: string): Promise<InvitationDocument> =>
-    this.model.findByIdAndUpdate(token, { used: true }).orFail(new RpcException('INVITATION_NOT_FOUND')).exec();
+  markUsed = async (token: string): Promise<InvitationDocument> => {
+    const invitation = await this.findByToken(token);
+    invitation.used = true;
+    return invitation.save();
+  };
 }
diff --git a/src/user/_utils/user.proto b/src/user/_utils/user.proto
@@ -41,14 +41,18 @@ message GetUsersResponse {
   repeated string users = 1;
 }
 
+message ActivateUserRequest {
+  string token = 1;
+}
+
 // The UserService defines the methods that our service exposes
 service User {
   rpc SignIn(SignInSignUpRequest) returns (UserResponse);
   rpc SignUp(SignInSignUpRequest) returns (UserResponse);
   rpc ResetPassword(PasswordRequest) returns (EmptyResponse);
   rpc ChangeEmail(EmailRequest) returns (EmptyResponse);
   rpc InviteUser(InviteUserRequest) returns (EmptyResponse);
-  rpc ActivateUser(EmptyRequest) returns (EmptyResponse);
+  rpc ActivateUser(ActivateUserRequest) returns (EmptyResponse);
   rpc ChangeRights(ChangeRightsRequest) returns (EmptyResponse);
   rpc GetUsers(EmptyRequest) returns (GetUsersResponse);
   rpc DeleteUser(EmailRequest) returns (EmptyResponse);