sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-07 06:30:06 +00:00
Code Issues Projects Releases Wiki Activity

chore: fixed specs

Browse Source
This commit is contained in:
Saad Jutt
2022-07-05 03:26:37 +05:00
parent 0b759a5594
commit 451cb4f6dd
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/middlewares/authenticateToken.ts
View File

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

3
api/src/middlewares/verifyAdmin.ts
View File

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

8
api/src/routes/api/spec/drive.spec.ts
View File

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

14
api/src/routes/api/spec/permission.spec.ts
View File

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

2
api/src/utils/getAuthorizedRoutes.ts
View File

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

2
api/src/utils/specs/extractHeaders.spec.ts
View File

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

2
api/src/utils/specs/parseLogToArray.spec.ts
View File

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