Changed: rename RecreateCurrentApiToken

Author: GPortas

src/users/domain/repositories/IUsersRepository.ts

@@ -3,7 +3,7 @@ import { AuthenticatedUser } from '../models/AuthenticatedUser'
 
 export interface IUsersRepository {
   getCurrentAuthenticatedUser(): Promise<AuthenticatedUser>
-  recreateApiToken(): Promise<ApiTokenInfo>
+  recreateCurrentApiToken(): Promise<ApiTokenInfo>
   getCurrentApiToken(): Promise<ApiTokenInfo>
   deleteCurrentApiToken(): Promise<void>
 }

…sers/domain/useCases/RecreateApiToken.ts …main/useCases/RecreateCurrentApiToken.tssrc/users/domain/useCases/RecreateApiToken.ts renamed to src/users/domain/useCases/RecreateCurrentApiToken.ts src/users/domain/useCases/RecreateApiToken.ts renamed to src/users/domain/useCases/RecreateCurrentApiToken.ts

@@ -2,7 +2,7 @@ import { UseCase } from '../../../core/domain/useCases/UseCase'
 import { ApiTokenInfo } from '../models/ApiTokenInfo'
 import { IUsersRepository } from '../repositories/IUsersRepository'
 
-export class RecreateApiToken implements UseCase<ApiTokenInfo> {
+export class RecreateCurrentApiToken implements UseCase<ApiTokenInfo> {
   private usersRepository: IUsersRepository
 
   constructor(usersRepository: IUsersRepository) {
@@ -15,6 +15,6 @@ export class RecreateApiToken implements UseCase<ApiTokenInfo> {
    * @returns {Promise<ApiTokenInfo>}
    */
   async execute(): Promise<ApiTokenInfo> {
-    return await this.usersRepository.recreateApiToken()
+    return await this.usersRepository.recreateCurrentApiToken()
   }
 }

src/users/index.ts

@@ -1,16 +1,21 @@
 import { UsersRepository } from './infra/repositories/UsersRepository'
 import { GetCurrentAuthenticatedUser } from './domain/useCases/GetCurrentAuthenticatedUser'
-import { RecreateApiToken } from './domain/useCases/RecreateApiToken'
+import { RecreateCurrentApiToken } from './domain/useCases/RecreateCurrentApiToken'
 import { GetCurrentApiToken } from './domain/useCases/GetCurrentApiToken'
 import { DeleteCurrentApiToken } from './domain/useCases/DeleteCurrentApiToken'
 
 const usersRepository = new UsersRepository()
 
 const getCurrentAuthenticatedUser = new GetCurrentAuthenticatedUser(usersRepository)
-const recreateApiToken = new RecreateApiToken(usersRepository)
+const recreateCurrentApiToken = new RecreateCurrentApiToken(usersRepository)
 const getCurrentApiToken = new GetCurrentApiToken(usersRepository)
 const deleteCurrentApiToken = new DeleteCurrentApiToken(usersRepository)
 
-export { getCurrentAuthenticatedUser, recreateApiToken, getCurrentApiToken, deleteCurrentApiToken }
+export {
+  getCurrentAuthenticatedUser,
+  recreateCurrentApiToken,
+  getCurrentApiToken,
+  deleteCurrentApiToken
+}
 export { AuthenticatedUser } from './domain/models/AuthenticatedUser'
 export { ApiTokenInfo } from './domain/models/ApiTokenInfo'

src/users/infra/repositories/UsersRepository.ts

@@ -19,7 +19,7 @@ export class UsersRepository extends ApiRepository implements IUsersRepository {
       })
   }
 
-  public async recreateApiToken(): Promise<ApiTokenInfo> {
+  public async recreateCurrentApiToken(): Promise<ApiTokenInfo> {
     return this.doPost(`/${this.usersResourceName}/token/recreate?returnExpiration=true`, {})
       .then((response) => transformRecreateApiTokenResponseToApiTokenInfo(response))
       .catch((error) => {

test/functional/users/DeleteCurrentApiToken.test.ts

@@ -25,8 +25,6 @@ describe('execute', () => {
     ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.API_KEY, testApiToken)
     await deleteCurrentApiToken.execute()
     // Since the token has been deleted, the next call using it should return a WriteError
-    await expect(
-      deleteCurrentApiToken.execute()
-    ).rejects.toBeInstanceOf(WriteError)
+    await expect(deleteCurrentApiToken.execute()).rejects.toBeInstanceOf(WriteError)
   })
 })

…unctional/users/RecreateApiToken.test.ts …al/users/RecreateCurrentApiToken.test.tstest/functional/users/RecreateApiToken.test.ts renamed to test/functional/users/RecreateCurrentApiToken.test.ts test/functional/users/RecreateApiToken.test.ts renamed to test/functional/users/RecreateCurrentApiToken.test.ts

@@ -1,4 +1,4 @@
-import { ApiConfig, recreateApiToken } from '../../../src'
+import { ApiConfig, recreateCurrentApiToken } from '../../../src'
 import { DataverseApiAuthMechanism } from '../../../src/core/infra/repositories/ApiConfig'
 import { TestConstants } from '../../testHelpers/TestConstants'
 import { createApiTokenViaApi } from '../../testHelpers/users/apiTokenHelper'
@@ -21,9 +21,9 @@ describe('execute', () => {
   })
 
   test('should successfully recreate the API token', async () => {
-    const testApiToken = await createApiTokenViaApi('recreateApiTokenFTUser')
+    const testApiToken = await createApiTokenViaApi('recreateCurrentApiTokenFTUser')
     ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.API_KEY, testApiToken)
-    const actualRecreatedApiTokenInfo = await recreateApiToken.execute()
+    const actualRecreatedApiTokenInfo = await recreateCurrentApiToken.execute()
     expect(actualRecreatedApiTokenInfo.apiToken).not.toBeUndefined()
     expect(actualRecreatedApiTokenInfo.apiToken).not.toBe(testApiToken)
     expect(typeof actualRecreatedApiTokenInfo.expirationDate).toBe('object')

test/integration/users/UsersRepository.test.ts

@@ -37,11 +37,11 @@ describe('UsersRepository', () => {
     })
   })
 
-  describe('recreateApiToken', () => {
+  describe('recreateCurrentApiToken', () => {
     test('should recreate API token and return the new API token info when valid authentication is provided', async () => {
-      const testApiToken = await createApiTokenViaApi('recreateApiTokenITUser')
+      const testApiToken = await createApiTokenViaApi('recreateCurrentApiTokenITUser')
       ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.API_KEY, testApiToken)
-      const actualRecreatedApiTokenInfo = await sut.recreateApiToken()
+      const actualRecreatedApiTokenInfo = await sut.recreateCurrentApiToken()
       expect(actualRecreatedApiTokenInfo.apiToken).not.toBeUndefined()
       expect(actualRecreatedApiTokenInfo.apiToken).not.toBe(testApiToken)
       expect(typeof actualRecreatedApiTokenInfo.expirationDate).toBe('object')
@@ -51,7 +51,7 @@ describe('UsersRepository', () => {
       ApiConfig.init(TestConstants.TEST_API_URL, DataverseApiAuthMechanism.API_KEY, 'invalidApiKey')
 
       const errorExpected: WriteError = new WriteError('[401] Bad API key')
-      await expect(sut.recreateApiToken()).rejects.toThrow(errorExpected)
+      await expect(sut.recreateCurrentApiToken()).rejects.toThrow(errorExpected)
     })
   })
 

test/unit/users/RecreateApiToken.test.ts …it/users/RecreateCurrentApiToken.test.tstest/unit/users/RecreateApiToken.test.ts renamed to test/unit/users/RecreateCurrentApiToken.test.ts test/unit/users/RecreateApiToken.test.ts renamed to test/unit/users/RecreateCurrentApiToken.test.ts

@@ -1,5 +1,5 @@
 import { IUsersRepository } from '../../../src/users/domain/repositories/IUsersRepository'
-import { RecreateApiToken } from '../../../src/users/domain/useCases/RecreateApiToken'
+import { RecreateCurrentApiToken } from '../../../src/users/domain/useCases/RecreateCurrentApiToken'
 import { WriteError } from '../../../src'
 import { ApiTokenInfo } from '../../../src/users/domain/models/ApiTokenInfo'
 import { TestConstants } from '../../testHelpers/TestConstants'
@@ -11,8 +11,8 @@ describe('execute', () => {
       expirationDate: new Date()
     }
     const usersRepositoryStub: IUsersRepository = {} as IUsersRepository
-    usersRepositoryStub.recreateApiToken = jest.fn().mockResolvedValue(testNewTokenInfo)
-    const sut = new RecreateApiToken(usersRepositoryStub)
+    usersRepositoryStub.recreateCurrentApiToken = jest.fn().mockResolvedValue(testNewTokenInfo)
+    const sut = new RecreateCurrentApiToken(usersRepositoryStub)
 
     const actual = await sut.execute()
 
@@ -21,8 +21,8 @@ describe('execute', () => {
 
   test('should return error result on repository error', async () => {
     const usersRepositoryStub: IUsersRepository = {} as IUsersRepository
-    usersRepositoryStub.recreateApiToken = jest.fn().mockRejectedValue(new WriteError())
-    const sut = new RecreateApiToken(usersRepositoryStub)
+    usersRepositoryStub.recreateCurrentApiToken = jest.fn().mockRejectedValue(new WriteError())
+    const sut = new RecreateCurrentApiToken(usersRepositoryStub)
 
     await expect(sut.execute()).rejects.toThrow(WriteError)
   })