chore: Login fixed with organisationId

Author: dev-ashishk

server/errors/FliptaskError.js

@@ -6,6 +6,10 @@ class FliptaskError extends Error {
     static missingParams(message = "Missing Parameters") {
         return new FliptaskError(message);
     }
+
+    static serverError(message = "Oops something went wrong") {
+        return new FliptaskError(message);
+    }
 }
 
 global.FliptaskError = FliptaskError;

server/middlewares/Modifier.js

@@ -1,6 +1,6 @@
 class Modifier {
     static paramIdIsOrgId(req, res, next) {
-        res.locals.orgId = req.params.id;
+        req.organisationId = req.headers.organisationid;;
         next();
     }
 

server/routes/WorkspaceRouter.js

@@ -3,16 +3,19 @@ const CrudRouter = require("./base/CrudRouter");
 
 const workspaceRouter = new CrudRouter("/workspace", workspaceController);
 
+const workspacePermission = new Permissions();
 workspaceRouter.mergeRoutes({
     "/": {
         get: [
             bearerAuth,
-            Permission.userIsOrgMember,
+            Modifier.paramIdIsOrgId,
+            Modifier.createdByUser,
+            workspacePermission._userIsOrgMember,
             workspaceController.list
         ],
         post: [
             bearerAuth,
-            Permission.userIsOrgMember,
+            workspacePermission._userIsOrgMember,
             workspaceController.create
         ]
     }

server/routes/base/CrudRouter.js

@@ -14,7 +14,7 @@ class CrudRouter {
                     this.controller.create
                 ]
             },
-            "/:id": {
+            "/:id(^[-+]?\d+$)": {
                 get: [
                     bearerAuth,
                     this.controller.get

server/services/base/CrudService.js

@@ -61,7 +61,6 @@ class CrudService extends Permissions {
 
     get = async (id, query) => {
         let { include } = query;
-        console.log("get ", id, include);
         return await this.model.findByPk(id, { include });
     }
 

server/services/base/Permissions.js

@@ -1,20 +1,26 @@
 class Permissions {
-    _userIsOrgMember = async ({ createdBy, organisationId }) => {
-        const organisation = await Organisation.findByPk(organisationId);
-        if (!organisation) {
-            throw FliptaskError.missingParams("Missing or incorrect params");
-        } else {
-            const userOrganisationMap = await UserOrganisationMap.findOne({
-                where: {
-                    userId: createdBy,
-                    organisationId,
+    _userIsOrgMember = async (req, res, next) => {
+        try {
+            const { organisationId } = req;
+            const {createdBy} = req.query;
+            const organisation = await Organisation.findByPk(organisationId);
+            if (!organisation) {
+                throw FliptaskError.missingParams("Missing or incorrect params");
+            } else {
+                const userOrganisationMap = await UserOrganisationMap.findOne({
+                    where: {
+                        userId: createdBy,
+                        organisationId,
+                    }
+                });
+                if (!userOrganisationMap) {
+                    throw FliptaskError.permissionDenied();
                 }
-            });
-
-            if (!userOrganisationMap) {
-                throw FliptaskError.permissionDenied();
             }
+        } catch (err) {
+            throw FliptaskError.serverError();
         }
+        next();
     }
 }