chore: fixed specs

api/src/middlewares/authenticateToken.ts

@@ -68,7 +68,7 @@ const authenticateToken = (
   tokenType: 'accessToken' | 'refreshToken'
 ) => {
   const { MODE } = process.env
-  if (MODE?.trim() !== 'server') {
+  if (MODE === ModeType.Desktop) {
     req.user = {
       userId: 1234,
       clientId: 'desktopModeClientId',

api/src/middlewares/verifyAdmin.ts

@@ -1,8 +1,9 @@
 import { RequestHandler } from 'express'
+import { ModeType } from '../utils'
 
 export const verifyAdmin: RequestHandler = (req, res, next) => {
   const { MODE } = process.env
-  if (MODE?.trim() !== 'server') return next()
+  if (MODE === ModeType.Desktop) return next()
 
   const { user } = req
   if (!user?.isAdmin) return res.status(401).send('Admin account required')

api/src/routes/api/spec/drive.spec.ts

@@ -65,25 +65,25 @@ describe('drive', () => {
 
     const dbUser = await controller.createUser(user)
     accessToken = await generateAndSaveToken(dbUser.id)
-    permissionController.createPermission({
+    await permissionController.createPermission({
       uri: '/SASjsApi/drive/deploy',
       principalType: PrincipalType.user,
       principalId: dbUser.id,
       setting: PermissionSetting.grant
     })
-    permissionController.createPermission({
+    await permissionController.createPermission({
       uri: '/SASjsApi/drive/deploy/upload',
       principalType: PrincipalType.user,
       principalId: dbUser.id,
       setting: PermissionSetting.grant
     })
-    permissionController.createPermission({
+    await permissionController.createPermission({
       uri: '/SASjsApi/drive/file',
       principalType: PrincipalType.user,
       principalId: dbUser.id,
       setting: PermissionSetting.grant
     })
-    permissionController.createPermission({
+    await permissionController.createPermission({
       uri: '/SASjsApi/drive/folder',
       principalType: PrincipalType.user,
       principalId: dbUser.id,

api/src/routes/api/spec/permission.spec.ts

@@ -120,10 +120,14 @@ describe('permission', () => {
       expect(res.body).toEqual({})
     })
 
-    it('should respond with Unauthorized if access token is not of an admin account', async () => {
-      const accessToken = await generateSaveTokenAndCreateUser({
-        ...user,
-        username: 'create' + user.username
+    it('should respond with Unauthorized if access token is not of an admin account even if user has permission', async () => {
+      const accessToken = await generateAndSaveToken(dbUser.id)
+
+      await permissionController.createPermission({
+        uri: '/SASjsApi/permission',
+        principalType: PrincipalType.user,
+        principalId: dbUser.id,
+        setting: PermissionSetting.grant
       })
 
       const res = await request(app)
@@ -459,7 +463,7 @@ describe('permission', () => {
       })
       const accessToken = await generateAndSaveToken(dbUser.id)
       await permissionController.createPermission({
-        uri: '/SASjsApi/permission/',
+        uri: '/SASjsApi/permission',
         principalType: PrincipalType.user,
         principalId: dbUser.id,
         setting: PermissionSetting.grant

api/src/utils/getAuthorizedRoutes.ts

@@ -5,7 +5,7 @@ const StaticAuthorizedRoutes = [
   '/SASjsApi/code/execute',
   '/SASjsApi/stp/execute',
   '/SASjsApi/drive/deploy',
-  '/SASjsApi/drive/upload',
+  '/SASjsApi/drive/deploy/upload',
   '/SASjsApi/drive/file',
   '/SASjsApi/drive/folder',
   '/SASjsApi/drive/fileTree',

api/src/utils/specs/extractHeaders.spec.ts

@@ -1,4 +1,4 @@
-import { extractHeaders } from '..'
+import { extractHeaders } from '../extractHeaders'
 
 describe('extractHeaders', () => {
   it('should return valid http headers', () => {

api/src/utils/specs/parseLogToArray.spec.ts

@@ -1,4 +1,4 @@
-import { parseLogToArray } from '..'
+import { parseLogToArray } from '../parseLogToArray'
 
 describe('parseLogToArray', () => {
   it('should parse log to array type', () => {