From 6c88eeabd2252ad60a6ffb28ae4da3fcf3a2bc55 Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Tue, 9 May 2023 15:21:54 +0500 Subject: [PATCH] chore: specs fixed --- api/src/routes/api/spec/auth.spec.ts | 2 +- api/src/routes/api/spec/client.spec.ts | 12 ++-- api/src/routes/api/spec/drive.spec.ts | 14 ++--- api/src/routes/api/spec/group.spec.ts | 60 +++++++++---------- api/src/routes/api/spec/permission.spec.ts | 50 ++++++++-------- api/src/routes/api/spec/stp.spec.ts | 6 +- api/src/routes/api/spec/user.spec.ts | 70 +++++++++++----------- 7 files changed, 107 insertions(+), 107 deletions(-) diff --git a/api/src/routes/api/spec/auth.spec.ts b/api/src/routes/api/spec/auth.spec.ts index 0e1e5b1..0e35d89 100644 --- a/api/src/routes/api/spec/auth.spec.ts +++ b/api/src/routes/api/spec/auth.spec.ts @@ -20,7 +20,7 @@ import { const clientId = 'someclientID' const clientSecret = 'someclientSecret' const user = { - id: 1234, + id: '1234', displayName: 'Test User', username: 'testUsername', password: '87654321', diff --git a/api/src/routes/api/spec/client.spec.ts b/api/src/routes/api/spec/client.spec.ts index a901a65..353b4d0 100644 --- a/api/src/routes/api/spec/client.spec.ts +++ b/api/src/routes/api/spec/client.spec.ts @@ -40,10 +40,10 @@ describe('client', () => { const dbUser = await userController.createUser(adminUser) adminAccessToken = generateAccessToken({ clientId: client.clientId, - userId: dbUser.id + userId: dbUser.uid }) await saveTokensInDB( - dbUser.id, + dbUser.uid, client.clientId, adminAccessToken, 'refreshToken' @@ -95,10 +95,10 @@ describe('client', () => { const dbUser = await userController.createUser(user) const accessToken = generateAccessToken({ clientId: client.clientId, - userId: dbUser.id + userId: dbUser.uid }) await saveTokensInDB( - dbUser.id, + dbUser.uid, client.clientId, accessToken, 'refreshToken' @@ -212,10 +212,10 @@ describe('client', () => { const dbUser = await userController.createUser(user) const accessToken = generateAccessToken({ clientId: client.clientId, - userId: dbUser.id + userId: dbUser.uid }) await saveTokensInDB( - dbUser.id, + dbUser.uid, client.clientId, accessToken, 'refreshToken' diff --git a/api/src/routes/api/spec/drive.spec.ts b/api/src/routes/api/spec/drive.spec.ts index c4c28ce..5e5bd5d 100644 --- a/api/src/routes/api/spec/drive.spec.ts +++ b/api/src/routes/api/spec/drive.spec.ts @@ -71,31 +71,31 @@ describe('drive', () => { con = await mongoose.connect(mongoServer.getUri()) const dbUser = await controller.createUser(user) - accessToken = await generateAndSaveToken(dbUser.id) + accessToken = await generateAndSaveToken(dbUser.uid) await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/deploy', - principalId: dbUser.id + principalId: dbUser.uid }) await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/deploy/upload', - principalId: dbUser.id + principalId: dbUser.uid }) await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/file', - principalId: dbUser.id + principalId: dbUser.uid }) await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/folder', - principalId: dbUser.id + principalId: dbUser.uid }) await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/rename', - principalId: dbUser.id + principalId: dbUser.uid }) }) @@ -1197,7 +1197,7 @@ const getExampleService = (): ServiceMember => ((getTreeExample().members[0] as FolderMember).members[0] as FolderMember) .members[0] as ServiceMember -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const adminAccessToken = generateAccessToken({ clientId, userId diff --git a/api/src/routes/api/spec/group.spec.ts b/api/src/routes/api/spec/group.spec.ts index 56af21a..72215a2 100644 --- a/api/src/routes/api/spec/group.spec.ts +++ b/api/src/routes/api/spec/group.spec.ts @@ -155,7 +155,7 @@ describe('group', () => { const dbGroup = await groupController.createGroup(group) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}`) + .delete(`/SASjsApi/group/${dbGroup.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -174,17 +174,17 @@ describe('group', () => { username: 'deletegroup2' }) - await groupController.addUserToGroup(dbGroup.groupId, dbUser1.id) - await groupController.addUserToGroup(dbGroup.groupId, dbUser2.id) + await groupController.addUserToGroup(dbGroup.uid, dbUser1.uid) + await groupController.addUserToGroup(dbGroup.uid, dbUser2.uid) await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}`) + .delete(`/SASjsApi/group/${dbGroup.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) const res1 = await request(app) - .get(`/SASjsApi/user/${dbUser1.id}`) + .get(`/SASjsApi/user/${dbUser1.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -192,7 +192,7 @@ describe('group', () => { expect(res1.body.groups).toEqual([]) const res2 = await request(app) - .get(`/SASjsApi/user/${dbUser2.id}`) + .get(`/SASjsApi/user/${dbUser2.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -229,7 +229,7 @@ describe('group', () => { }) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}`) + .delete(`/SASjsApi/group/${dbGroup.uid}`) .auth(accessToken, { type: 'bearer' }) .send() .expect(401) @@ -245,10 +245,10 @@ describe('group', () => { }) it('should respond with group', async () => { - const { groupId } = await groupController.createGroup(group) + const { uid } = await groupController.createGroup(group) const res = await request(app) - .get(`/SASjsApi/group/${groupId}`) + .get(`/SASjsApi/group/${uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -266,10 +266,10 @@ describe('group', () => { username: 'get' + user.username }) - const { groupId } = await groupController.createGroup(group) + const { uid } = await groupController.createGroup(group) const res = await request(app) - .get(`/SASjsApi/group/${groupId}`) + .get(`/SASjsApi/group/${uid}`) .auth(accessToken, { type: 'bearer' }) .send() .expect(200) @@ -426,7 +426,7 @@ describe('group', () => { const dbUser = await userController.createUser(user) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -452,13 +452,13 @@ describe('group', () => { }) await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) const res = await request(app) - .get(`/SASjsApi/user/${dbUser.id}`) + .get(`/SASjsApi/user/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -478,10 +478,10 @@ describe('group', () => { ...user, username: 'addUserRandomUser' }) - await groupController.addUserToGroup(dbGroup.groupId, dbUser.id) + await groupController.addUserToGroup(dbGroup.uid, dbUser.uid) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -539,7 +539,7 @@ describe('group', () => { it('should respond with Not Found if userId is incorrect', async () => { const dbGroup = await groupController.createGroup(group) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/123`) + .post(`/SASjsApi/group/${dbGroup.uid}/123`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(404) @@ -556,7 +556,7 @@ describe('group', () => { }) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(400) @@ -577,7 +577,7 @@ describe('group', () => { }) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(405) @@ -596,7 +596,7 @@ describe('group', () => { }) const res = await request(app) - .post(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .post(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(405) @@ -618,10 +618,10 @@ describe('group', () => { ...user, username: 'removeUserRandomUser' }) - await groupController.addUserToGroup(dbGroup.groupId, dbUser.id) + await groupController.addUserToGroup(dbGroup.uid, dbUser.uid) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -639,16 +639,16 @@ describe('group', () => { ...user, username: 'removeGroupFromUser' }) - await groupController.addUserToGroup(dbGroup.groupId, dbUser.id) + await groupController.addUserToGroup(dbGroup.uid, dbUser.uid) await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) const res = await request(app) - .get(`/SASjsApi/user/${dbUser.id}`) + .get(`/SASjsApi/user/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -667,7 +667,7 @@ describe('group', () => { }) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(405) @@ -686,7 +686,7 @@ describe('group', () => { }) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}/${dbUser.id}`) + .delete(`/SASjsApi/group/${dbGroup.uid}/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(405) @@ -736,7 +736,7 @@ describe('group', () => { it('should respond with Not Found if userId is incorrect', async () => { const dbGroup = await groupController.createGroup(group) const res = await request(app) - .delete(`/SASjsApi/group/${dbGroup.groupId}/123`) + .delete(`/SASjsApi/group/${dbGroup.uid}/123`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(404) @@ -752,10 +752,10 @@ const generateSaveTokenAndCreateUser = async ( ): Promise => { const dbUser = await userController.createUser(someUser ?? adminUser) - return generateAndSaveToken(dbUser.id) + return generateAndSaveToken(dbUser.uid) } -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const adminAccessToken = generateAccessToken({ clientId, userId diff --git a/api/src/routes/api/spec/permission.spec.ts b/api/src/routes/api/spec/permission.spec.ts index f193d05..b8580ff 100644 --- a/api/src/routes/api/spec/permission.spec.ts +++ b/api/src/routes/api/spec/permission.spec.ts @@ -103,10 +103,10 @@ describe('permission', () => { const res = await request(app) .post('/SASjsApi/permission') .auth(adminAccessToken, { type: 'bearer' }) - .send({ ...permission, principalId: dbUser.id }) + .send({ ...permission, principalId: dbUser.uid }) .expect(200) - expect(res.body.permissionId).toBeTruthy() + expect(res.body.uid).toBeTruthy() expect(res.body.path).toEqual(permission.path) expect(res.body.type).toEqual(permission.type) expect(res.body.setting).toEqual(permission.setting) @@ -122,11 +122,11 @@ describe('permission', () => { .send({ ...permission, principalType: 'group', - principalId: dbGroup.groupId + principalId: dbGroup.uid }) .expect(200) - expect(res.body.permissionId).toBeTruthy() + expect(res.body.uid).toBeTruthy() expect(res.body.path).toEqual(permission.path) expect(res.body.type).toEqual(permission.type) expect(res.body.setting).toEqual(permission.setting) @@ -144,7 +144,7 @@ describe('permission', () => { }) it('should respond with Unauthorized if access token is not of an admin account', async () => { - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) .post('/SASjsApi/permission') @@ -307,7 +307,7 @@ describe('permission', () => { .auth(adminAccessToken, { type: 'bearer' }) .send({ ...permission, - principalId: adminUser.id + principalId: adminUser.uid }) .expect(400) @@ -347,13 +347,13 @@ describe('permission', () => { it('should respond with Conflict (409) if permission already exists', async () => { await permissionController.createPermission({ ...permission, - principalId: dbUser.id + principalId: dbUser.uid }) const res = await request(app) .post('/SASjsApi/permission') .auth(adminAccessToken, { type: 'bearer' }) - .send({ ...permission, principalId: dbUser.id }) + .send({ ...permission, principalId: dbUser.uid }) .expect(409) expect(res.text).toEqual( @@ -368,7 +368,7 @@ describe('permission', () => { beforeAll(async () => { dbPermission = await permissionController.createPermission({ ...permission, - principalId: dbUser.id + principalId: dbUser.uid }) }) @@ -378,7 +378,7 @@ describe('permission', () => { it('should respond with updated permission', async () => { const res = await request(app) - .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .patch(`/SASjsApi/permission/${dbPermission?.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send({ setting: PermissionSettingForRoute.deny }) .expect(200) @@ -388,7 +388,7 @@ describe('permission', () => { it('should respond with Unauthorized if access token is not present', async () => { const res = await request(app) - .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .patch(`/SASjsApi/permission/${dbPermission?.uid}`) .send() .expect(401) @@ -403,7 +403,7 @@ describe('permission', () => { }) const res = await request(app) - .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .patch(`/SASjsApi/permission/${dbPermission?.uid}`) .auth(accessToken, { type: 'bearer' }) .send() .expect(401) @@ -414,7 +414,7 @@ describe('permission', () => { it('should respond with Bad Request if setting is missing', async () => { const res = await request(app) - .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .patch(`/SASjsApi/permission/${dbPermission?.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(400) @@ -425,7 +425,7 @@ describe('permission', () => { it('should respond with Bad Request if setting is invalid', async () => { const res = await request(app) - .patch(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .patch(`/SASjsApi/permission/${dbPermission?.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send({ setting: 'invalid' @@ -454,10 +454,10 @@ describe('permission', () => { it('should delete permission', async () => { const dbPermission = await permissionController.createPermission({ ...permission, - principalId: dbUser.id + principalId: dbUser.uid }) const res = await request(app) - .delete(`/SASjsApi/permission/${dbPermission?.permissionId}`) + .delete(`/SASjsApi/permission/${dbPermission?.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -481,12 +481,12 @@ describe('permission', () => { await permissionController.createPermission({ ...permission, path: '/test-1', - principalId: dbUser.id + principalId: dbUser.uid }) await permissionController.createPermission({ ...permission, path: '/test-2', - principalId: dbUser.id + principalId: dbUser.uid }) }) @@ -505,12 +505,12 @@ describe('permission', () => { ...user, username: 'get' + user.username }) - const accessToken = await generateAndSaveToken(nonAdminUser.id) + const accessToken = await generateAndSaveToken(nonAdminUser.uid) await permissionController.createPermission({ path: '/test-1', type: PermissionType.route, principalType: PrincipalType.user, - principalId: nonAdminUser.id, + principalId: nonAdminUser.uid, setting: PermissionSettingForRoute.grant }) @@ -531,7 +531,7 @@ describe('permission', () => { await permissionController.createPermission({ ...permission, path: '/SASjsApi/drive/deploy', - principalId: dbUser.id + principalId: dbUser.uid }) }) @@ -551,7 +551,7 @@ describe('permission', () => { }) it('should create files in SASJS drive', async () => { - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) await request(app) .get('/SASjsApi/drive/deploy') @@ -561,7 +561,7 @@ describe('permission', () => { }) it('should respond unauthorized', async () => { - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) await request(app) .get('/SASjsApi/drive/deploy/upload') @@ -577,10 +577,10 @@ const generateSaveTokenAndCreateUser = async ( ): Promise => { const dbUser = await userController.createUser(someUser ?? adminUser) - return generateAndSaveToken(dbUser.id) + return generateAndSaveToken(dbUser.uid) } -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const adminAccessToken = generateAccessToken({ clientId, userId diff --git a/api/src/routes/api/spec/stp.spec.ts b/api/src/routes/api/spec/stp.spec.ts index 1512378..f21c97c 100644 --- a/api/src/routes/api/spec/stp.spec.ts +++ b/api/src/routes/api/spec/stp.spec.ts @@ -58,12 +58,12 @@ describe('stp', () => { mongoServer = await MongoMemoryServer.create() con = await mongoose.connect(mongoServer.getUri()) const dbUser = await userController.createUser(user) - accessToken = await generateAndSaveToken(dbUser.id) + accessToken = await generateAndSaveToken(dbUser.uid) await permissionController.createPermission({ path: '/SASjsApi/stp/execute', type: PermissionType.route, principalType: PrincipalType.user, - principalId: dbUser.id, + principalId: dbUser.uid, setting: PermissionSettingForRoute.grant }) }) @@ -456,7 +456,7 @@ const makeRequestAndAssert = async ( ) } -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const accessToken = generateAccessToken({ clientId, userId diff --git a/api/src/routes/api/spec/user.spec.ts b/api/src/routes/api/spec/user.spec.ts index da8b829..734dc5b 100644 --- a/api/src/routes/api/spec/user.spec.ts +++ b/api/src/routes/api/spec/user.spec.ts @@ -101,9 +101,9 @@ describe('user', () => { const dbUser = await controller.createUser(user) const accessToken = generateAccessToken({ clientId, - userId: dbUser.id + userId: dbUser.uid }) - await saveTokensInDB(dbUser.id, clientId, accessToken, 'refreshToken') + await saveTokensInDB(dbUser.uid, clientId, accessToken, 'refreshToken') const res = await request(app) .post('/SASjsApi/user') @@ -187,7 +187,7 @@ describe('user', () => { const newDisplayName = 'My new display Name' const res = await request(app) - .patch(`/SASjsApi/user/${dbUser.id}`) + .patch(`/SASjsApi/user/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send({ ...user, displayName: newDisplayName }) .expect(200) @@ -200,11 +200,11 @@ describe('user', () => { it('should respond with updated user when user himself requests', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const newDisplayName = 'My new display Name' const res = await request(app) - .patch(`/SASjsApi/user/${dbUser.id}`) + .patch(`/SASjsApi/user/${dbUser.uid}`) .auth(accessToken, { type: 'bearer' }) .send({ displayName: newDisplayName, @@ -221,11 +221,11 @@ describe('user', () => { it('should respond with Bad Request, only admin can update isAdmin/isActive', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const newDisplayName = 'My new display Name' await request(app) - .patch(`/SASjsApi/user/${dbUser.id}`) + .patch(`/SASjsApi/user/${dbUser.uid}`) .auth(accessToken, { type: 'bearer' }) .send({ ...user, displayName: newDisplayName }) .expect(400) @@ -277,10 +277,10 @@ describe('user', () => { ...user, username: 'randomUser' }) - const accessToken = await generateAndSaveToken(dbUser2.id) + const accessToken = await generateAndSaveToken(dbUser2.uid) const res = await request(app) - .patch(`/SASjsApi/user/${dbUser1.id}`) + .patch(`/SASjsApi/user/${dbUser1.uid}`) .auth(accessToken, { type: 'bearer' }) .send(user) .expect(401) @@ -297,7 +297,7 @@ describe('user', () => { }) const res = await request(app) - .patch(`/SASjsApi/user/${dbUser1.id}`) + .patch(`/SASjsApi/user/${dbUser1.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send({ username: dbUser2.username }) .expect(409) @@ -325,7 +325,7 @@ describe('user', () => { it('should respond with updated user when user himself requests', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const newDisplayName = 'My new display Name' const res = await request(app) @@ -346,7 +346,7 @@ describe('user', () => { it('should respond with Bad Request, only admin can update isAdmin/isActive', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const newDisplayName = 'My new display Name' await request(app) @@ -372,10 +372,10 @@ describe('user', () => { ...user, username: 'randomUser' }) - const accessToken = await generateAndSaveToken(dbUser2.id) + const accessToken = await generateAndSaveToken(dbUser2.uid) const res = await request(app) - .patch(`/SASjsApi/user/${dbUser1.id}`) + .patch(`/SASjsApi/user/${dbUser1.uid}`) .auth(accessToken, { type: 'bearer' }) .send(user) .expect(401) @@ -418,7 +418,7 @@ describe('user', () => { const dbUser = await controller.createUser(user) const res = await request(app) - .delete(`/SASjsApi/user/${dbUser.id}`) + .delete(`/SASjsApi/user/${dbUser.uid}`) .auth(adminAccessToken, { type: 'bearer' }) .send() .expect(200) @@ -428,10 +428,10 @@ describe('user', () => { it('should respond with OK when user himself requests', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) - .delete(`/SASjsApi/user/${dbUser.id}`) + .delete(`/SASjsApi/user/${dbUser.uid}`) .auth(accessToken, { type: 'bearer' }) .send({ password: user.password }) .expect(200) @@ -441,10 +441,10 @@ describe('user', () => { it('should respond with Bad Request when user himself requests and password is missing', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) - .delete(`/SASjsApi/user/${dbUser.id}`) + .delete(`/SASjsApi/user/${dbUser.uid}`) .auth(accessToken, { type: 'bearer' }) .send() .expect(400) @@ -469,10 +469,10 @@ describe('user', () => { ...user, username: 'randomUser' }) - const accessToken = await generateAndSaveToken(dbUser2.id) + const accessToken = await generateAndSaveToken(dbUser2.uid) const res = await request(app) - .delete(`/SASjsApi/user/${dbUser1.id}`) + .delete(`/SASjsApi/user/${dbUser1.uid}`) .auth(accessToken, { type: 'bearer' }) .send(user) .expect(401) @@ -483,10 +483,10 @@ describe('user', () => { it('should respond with Unauthorized when user himself requests and password is incorrect', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) - .delete(`/SASjsApi/user/${dbUser.id}`) + .delete(`/SASjsApi/user/${dbUser.uid}`) .auth(accessToken, { type: 'bearer' }) .send({ password: 'incorrectpassword' }) .expect(401) @@ -510,7 +510,7 @@ describe('user', () => { it('should respond with OK when user himself requests', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) .delete(`/SASjsApi/user/by/username/${dbUser.username}`) @@ -523,7 +523,7 @@ describe('user', () => { it('should respond with Bad Request when user himself requests and password is missing', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) .delete(`/SASjsApi/user/by/username/${dbUser.username}`) @@ -551,7 +551,7 @@ describe('user', () => { ...user, username: 'randomUser' }) - const accessToken = await generateAndSaveToken(dbUser2.id) + const accessToken = await generateAndSaveToken(dbUser2.uid) const res = await request(app) .delete(`/SASjsApi/user/by/username/${dbUser1.username}`) @@ -565,7 +565,7 @@ describe('user', () => { it('should respond with Unauthorized when user himself requests and password is incorrect', async () => { const dbUser = await controller.createUser(user) - const accessToken = await generateAndSaveToken(dbUser.id) + const accessToken = await generateAndSaveToken(dbUser.uid) const res = await request(app) .delete(`/SASjsApi/user/by/username/${dbUser.username}`) @@ -592,7 +592,7 @@ describe('user', () => { it('should respond with user autoExec when same user requests', async () => { const dbUser = await controller.createUser(user) - const userId = dbUser.id + const userId = dbUser.uid const accessToken = await generateAndSaveToken(userId) const res = await request(app) @@ -611,7 +611,7 @@ describe('user', () => { it('should respond with user autoExec when admin user requests', async () => { const dbUser = await controller.createUser(user) - const userId = dbUser.id + const userId = dbUser.uid const res = await request(app) .get(`/SASjsApi/user/${userId}`) @@ -634,7 +634,7 @@ describe('user', () => { }) const dbUser = await controller.createUser(user) - const userId = dbUser.id + const userId = dbUser.uid const res = await request(app) .get(`/SASjsApi/user/${userId}`) @@ -652,7 +652,7 @@ describe('user', () => { it('should respond with user along with associated groups', async () => { const dbUser = await controller.createUser(user) - const userId = dbUser.id + const userId = dbUser.uid const accessToken = await generateAndSaveToken(userId) const group = { @@ -661,7 +661,7 @@ describe('user', () => { } const groupController = new GroupController() const dbGroup = await groupController.createGroup(group) - await groupController.addUserToGroup(dbGroup.groupId, dbUser.id) + await groupController.addUserToGroup(dbGroup.uid, dbUser.uid) const res = await request(app) .get(`/SASjsApi/user/${userId}`) @@ -703,7 +703,7 @@ describe('user', () => { describe('by username', () => { it('should respond with user autoExec when same user requests', async () => { const dbUser = await controller.createUser(user) - const userId = dbUser.id + const userId = dbUser.uid const accessToken = await generateAndSaveToken(userId) const res = await request(app) @@ -859,10 +859,10 @@ const generateSaveTokenAndCreateUser = async ( ): Promise => { const dbUser = await controller.createUser(someUser ?? adminUser) - return generateAndSaveToken(dbUser.id) + return generateAndSaveToken(dbUser.uid) } -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const adminAccessToken = generateAccessToken({ clientId, userId