Fix Join workspace using invitation link (#382)

* update the workspace method for confirmationlink

* update the confirmmembership function of workspace

* comments added

* lints removed

* Bump version up to 1.0.7

* Bump version up to 1.0.8

* Bump version up to 1.0.9

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {

src/models/workspace.ts

@@ -230,41 +230,33 @@ export default class WorkspaceModel extends AbstractModel<WorkspaceDBScheme> imp
    *
    * @param member - member for whom confirm membership
    */
-  public async confirmMembership(member: UserModel): Promise<boolean> {
-    const { matchedCount, modifiedCount } = await this.collection.updateOne(
-      {
-        userId: new ObjectId(member._id.toString()),
-      },
-      { $unset: { isPending: '' } }
-    );
-
-    const isUserAlreadyConfirmedInvitation = matchedCount > 0 && modifiedCount === 0;
+  public async confirmMembership(member: UserModel): Promise<void> {
+    /**
+     * Check if user is already a member of workspace or not.
+     */
+    const isUserAlreadyConfirmedInvitation = await this.teamCollection.findOne({
+      userId: new ObjectId(member._id.toString()),
+    });
 
     if (isUserAlreadyConfirmedInvitation) {
       throw new Error('User is already confirmed the invitation');
     }
 
     /**
-     * In case user was invited via email instead of invite link
+     * If user is not member of workspace
+     * then edit team collection.
      */
-    if (matchedCount === 0) {
-      await this.collection.updateOne(
-        {
-          userEmail: member.email,
+    await this.teamCollection.updateOne(
+      {
+        userEmail: member.email,
+      },
+      {
+        $set: { userId: new ObjectId(member._id.toString()) },
+        $unset: {
+          userEmail: '',
         },
-        {
-          $set: { userId: new ObjectId(member._id.toString()) },
-          $unset: {
-            userEmail: '',
-            isPending: '',
-          },
-        }
-      );
-
-      return false;
-    }
-
-    return true;
+      }
+    );
   }
 
   /**

src/resolvers/workspace.js

@@ -191,13 +191,8 @@ module.exports = {
         throw new ApolloError('The link is broken');
       }
 
-      const membershipExists = await workspace.confirmMembership(currentUser);
-
-      if (membershipExists) {
-        await currentUser.confirmMembership(workspaceId);
-      } else {
-        await currentUser.addWorkspace(workspaceId);
-      }
+      await workspace.confirmMembership(currentUser);
+      await currentUser.addWorkspace(workspaceId);
 
       return {
         recordId: workspace._id.toString(),