Update to accept/send accessTokenValidity to api in seconds, not minu…

…tes (#79)
ministryofjustice · Feb 26, 2024 · bff25d6 · bff25d6
1 parent daf41ef
commit bff25d6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/server/data/localMockData/baseClientsResponseMock.ts b/server/data/localMockData/baseClientsResponseMock.ts
@@ -44,7 +44,7 @@ export const getBaseClientResponseMock: (grantType: GrantTypes) => GetBaseClient
     ips: [],
     jiraNumber: 'jiraNumber',
     validDays: 1,
-    accessTokenValidityMinutes: 60,
+    accessTokenValiditySeconds: 3600,
     deployment: {
       clientType: 'service',
       team: 'deployment team',

diff --git a/server/interfaces/baseClientApi/baseClientRequestBody.ts b/server/interfaces/baseClientApi/baseClientRequestBody.ts
@@ -6,7 +6,7 @@ export interface AddBaseClientRequest {
   jiraNumber?: string
   databaseUserName?: string
   validDays?: number
-  accessTokenValidityMinutes?: number
+  accessTokenValiditySeconds?: number
   grantType?: string
   mfa?: string
   mfaRememberMe?: boolean
@@ -21,7 +21,7 @@ export interface UpdateBaseClientRequest {
   jiraNumber?: string
   databaseUserName?: string
   validDays?: number
-  accessTokenValidityMinutes?: number
+  accessTokenValiditySeconds?: number
   grantType?: string
   mfa?: string
   mfaRememberMe?: boolean

diff --git a/server/interfaces/baseClientApi/baseClientResponse.ts b/server/interfaces/baseClientApi/baseClientResponse.ts
@@ -21,7 +21,7 @@ export interface GetBaseClientResponse {
   jiraNumber?: string
   databaseUserName?: string
   validDays?: number
-  accessTokenValidityMinutes?: number
+  accessTokenValiditySeconds?: number
   grantType?: string
   mfa?: string
   mfaRememberMe?: boolean

diff --git a/server/mappers/baseClientApi/addBaseClient.ts b/server/mappers/baseClientApi/addBaseClient.ts
@@ -11,7 +11,7 @@ export default (baseClient: BaseClient): AddBaseClientRequest => {
     jiraNumber: baseClient.audit,
     databaseUserName: baseClient.clientCredentials.databaseUserName,
     validDays: baseClient.config.expiryDate ? daysRemaining(baseClient.config.expiryDate) : null,
-    accessTokenValidityMinutes: baseClient.accessTokenValidity ? baseClient.accessTokenValidity / 60 : null,
+    accessTokenValiditySeconds: baseClient.accessTokenValidity ? baseClient.accessTokenValidity : null,
     grantType: baseClient.grantType,
     mfa: baseClient.authorisationCode.mfa,
     mfaRememberMe: baseClient.authorisationCode.mfaRememberMe,

diff --git a/server/mappers/baseClientApi/getBaseClient.ts b/server/mappers/baseClientApi/getBaseClient.ts
@@ -7,7 +7,7 @@ import { snake } from '../../utils/utils'
 export default (response: GetBaseClientResponse): BaseClient => {
   return {
     baseClientId: response.clientId,
-    accessTokenValidity: response.accessTokenValidityMinutes ? response.accessTokenValidityMinutes * 60 : 0,
+    accessTokenValidity: response.accessTokenValiditySeconds ? response.accessTokenValiditySeconds : 0,
     scopes: response.scopes ? response.scopes : [],
     grantType: snake(response.grantType),
     audit: response.jiraNumber ? response.jiraNumber : '',

diff --git a/server/mappers/baseClientApi/updateBaseClient.ts b/server/mappers/baseClientApi/updateBaseClient.ts
@@ -10,7 +10,7 @@ export default (baseClient: BaseClient): UpdateBaseClientRequest => {
     jiraNumber: baseClient.audit,
     databaseUserName: baseClient.clientCredentials.databaseUserName,
     validDays: baseClient.config.expiryDate ? daysRemaining(baseClient.config.expiryDate) : null,
-    accessTokenValidityMinutes: baseClient.accessTokenValidity ? baseClient.accessTokenValidity / 60 : null,
+    accessTokenValiditySeconds: baseClient.accessTokenValidity ? baseClient.accessTokenValidity : null,
     grantType: baseClient.grantType,
     mfa: baseClient.authorisationCode.mfa,
     mfaRememberMe: baseClient.authorisationCode.mfaRememberMe,