probably working backend

Author: Repumba

mwdb/app.py

@@ -49,6 +49,7 @@
     GroupListResource,
     GroupMemberResource,
     GroupResource,
+    JoinGroupInviteLinkResource,
     RequestGroupInviteLinkResource,
 )
 from mwdb.resources.karton import KartonAnalysisResource, KartonObjectResource
@@ -346,6 +347,7 @@ def require_auth():
 api.add_resource(GroupResource, "/group/<name>")
 api.add_resource(GroupMemberResource, "/group/<name>/member/<login>")
 api.add_resource(RequestGroupInviteLinkResource, "/group/<name>/invite/<invited_user>")
+api.add_resource(JoinGroupInviteLinkResource, "/group/join")
 
 # OAuth endpoints
 if app_config.mwdb.enable_oidc:

mwdb/model/user.py

@@ -209,14 +209,19 @@ def generate_group_invite_token(self, group_id, inviter):
             inviter=inviter,
         )
 
-    @staticmethod
-    def verify_group_invite_token(token):
-        result = User._verify_token(
-            token=token,
-            fields=[],
-            scope=AuthScope.group_invite,
-        )
-        return None if result is None else result[0]
+    def join_group_with_token(self, token):
+        data = verify_token(token, AuthScope.group_invite)
+
+        if data is None:
+            return False
+
+        group_id = data.get("group_id")
+        if group_id is None:
+            return False
+
+        group_obj = db.session.query(Group).filter(Group.id == group_id).first()
+
+        return group_obj.add_member(self)
 
     @staticmethod
     def verify_session_token(token) -> Optional[Tuple["User", Optional[str]]]:

mwdb/resources/group.py

@@ -690,6 +690,8 @@ def post(self, name, invited_user):
                 " not configured or unavailable."
             )
 
+        return token
+
 
 @rate_limited_resource
 class JoinGroupInviteLinkResource(Resource):
@@ -703,17 +705,24 @@ def post(selt):
 
         security:
             - bearerAuth: []
+        parameters:
+            - in: query
+              name: token
+              schema:
+                type: string
+              description: token
         tags:
             - group
         responses:
             200:
                 description: When user joined group successfully
+                content:
+                  application/json:
+                    schema: GroupSuccessResponseSchema
             400:
                 description: When request body is invalid
             403:
                 description: When there was a problem with the token
-            409:
-                description: When user is already a member of this group
             503:
                 description: |
                     Request canceled due to database statement timeout.
@@ -723,7 +732,8 @@ def post(selt):
         if token is None:
             raise Forbidden("Token not found")
 
-        invite_data = User.verify_group_invite_token(token)
+        success = g.auth_user.join_group_with_token(token)
 
-        if invite_data is None:
-            raise Forbidden("There was a problem while decoding your token")
+        if not success:
+            raise Forbidden("There was a problem while processing your request")
+        db.session.commit()

mwdb/templates/mail/invitation.txt

@@ -2,4 +2,4 @@ Hi {login}
 
 You have been invited to join new group.
 
-To view the invitation click this link: {base_url}/.../?token={group_invite_token}
+To view the invitation click this link: {base_url}/group/join/?token={group_invite_token}

mwdb/web/src/commons/api/index.tsx

@@ -412,8 +412,8 @@ function setGroupAdmin(
     return axios.put(`/group/${name}/member/${member}`, { group_admin });
 }
 
-function requestGroupInviteLink(name: string, invited_user: string){
-    return axios.post(`/group/${name}/invite/${invited_user}`)
+function requestGroupInviteLink(name: string, invited_user: string) {
+    return axios.post(`/group/${name}/invite/${invited_user}`);
 }
 
 function getUsers(): GetUsersResponse {