Continue developing service token v2

backend/src/middleware/requireServiceTokenDataAuth.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from 'express';
 import { ServiceToken, ServiceTokenData } from '../models';
 import { validateMembership } from '../helpers/membership';
-import { AccountNotFoundError } from '../utils/errors';
+import { AccountNotFoundError, UnauthorizedRequestError } from '../utils/errors';
 
 type req = 'params' | 'body' | 'query';
 
@@ -15,21 +15,25 @@ const requireServiceTokenDataAuth = ({
     location?: req;
 }) => {
     return async (req: Request, res: Response, next: NextFunction) => {
-    
+        const { serviceTokenDataId } = req[location];
+
         const serviceTokenData = await ServiceTokenData
             .findById(req[location].serviceTokenDataId)
             .select('+encryptedKey +iv +tag');
-        
+
         if (!serviceTokenData) {
             return next(AccountNotFoundError({message: 'Failed to locate service token data'}));
         }
-        
-        await validateMembership({
-            userId: req.user._id.toString(),
-            workspaceId: serviceTokenData.workspace.toString(),
-            acceptedRoles,
-            acceptedStatuses
-        });
+
+        if (req.user) {
+            // case: jwt auth
+            await validateMembership({
+                userId: req.user._id.toString(),
+                workspaceId: serviceTokenData.workspace.toString(),
+                acceptedRoles,
+                acceptedStatuses
+            });
+        }
         
         req.serviceTokenData = serviceTokenData;