Rename GrantTypes to make singular

integration_tests/e2e/edit-base-client-deployment.cy.ts

@@ -1,7 +1,7 @@
 import Page from '../pages/page'
 import ViewBaseClientPage from '../pages/viewBaseClient'
 import EditBaseClientDeploymentDetailsPage from '../pages/editBaseClientDeploymentDetails'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 import AuthSignInPage from '../pages/authSignIn'
 import AuthErrorPage from '../pages/authError'
 
@@ -16,7 +16,7 @@ context('Edit base client deployment: Auth', () => {
     cy.task('stubSignIn')
     cy.task('stubManageUser')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubGetListClientInstancesList')
   })
 
@@ -41,7 +41,7 @@ context('Edit base client deployment details page', () => {
     cy.task('stubSignIn')
     cy.task('stubManageUser')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubGetListClientInstancesList')
     editBaseClientDeploymentDetailsPage = visitEditBaseClientDeploymentDetailsPage()
   })

integration_tests/e2e/edit-base-client-details.cy.ts

@@ -1,7 +1,7 @@
 import Page from '../pages/page'
 import EditBaseClientDetailsPage from '../pages/editBaseClientDetails'
 import ViewBaseClientPage from '../pages/viewBaseClient'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 import AuthSignInPage from '../pages/authSignIn'
 import AuthErrorPage from '../pages/authError'
 
@@ -16,7 +16,7 @@ context('Edit base client details: Auth', () => {
     cy.task('stubSignIn')
     cy.task('stubManageUser')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubGetListClientInstancesList')
   })
 
@@ -41,7 +41,7 @@ context('Edit base client details page - client-credentials flow', () => {
     cy.task('stubSignIn')
     cy.task('stubManageUser')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubGetListClientInstancesList')
     cy.task('stubAuthManageDetails')
     editBaseClientDetailsPage = visitEditBaseClientDetailsPage()
@@ -126,7 +126,7 @@ context('Edit base client details page - authorization-code flow', () => {
     cy.task('stubSignIn')
     cy.task('stubManageUser')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.AuthorizationCode })
+    cy.task('stubGetBaseClient', { grantType: GrantType.AuthorizationCode })
     cy.task('stubGetListClientInstancesList')
     editBaseClientDetailsPage = visitEditBaseClientDetailsPage()
   })

integration_tests/e2e/edit-client-instances.cy.ts

@@ -2,7 +2,7 @@ import Page from '../pages/page'
 import ViewBaseClientPage from '../pages/viewBaseClient'
 import ViewClientSecretsPage from '../pages/viewClientSecrets'
 import ConfirmDeleteClientPage from '../pages/confirmDeleteClient'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 
 const visitBaseClientPage = (): ViewBaseClientPage => {
   cy.signIn({ failOnStatusCode: true, redirectPath: '/base-clients/base_client_id_1' })
@@ -21,7 +21,7 @@ context('Base client page - client instances', () => {
   beforeEach(() => {
     cy.task('reset')
     cy.task('stubSignIn')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
   })

integration_tests/e2e/login.cy.ts

@@ -2,15 +2,15 @@ import IndexPage from '../pages/index'
 import AuthSignInPage from '../pages/authSignIn'
 import Page from '../pages/page'
 import AuthManageDetailsPage from '../pages/authManageDetails'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 import AuthErrorPage from '../pages/authError'
 
 context('SignIn', () => {
   beforeEach(() => {
     cy.task('reset')
     cy.task('stubSignIn', ['ROLE_OAUTH_ADMIN'])
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubAuthManageDetails')
   })

integration_tests/e2e/view-base-client-list.cy.ts

@@ -2,7 +2,7 @@ import Page from '../pages/page'
 import ViewBaseClientListPage from '../pages/viewBaseClientList'
 import ViewBaseClientPage from '../pages/viewBaseClient'
 import NewBaseClientGrantPage from '../pages/newBaseClientGrant'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 import AuthSignInPage from '../pages/authSignIn'
 import AuthErrorPage from '../pages/authError'
 
@@ -17,7 +17,7 @@ context('Homepage - Auth', () => {
     cy.task('reset')
     cy.task('stubSignIn')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
   })
@@ -42,7 +42,7 @@ context('Homepage - list base-clients', () => {
     cy.task('reset')
     cy.task('stubSignIn')
     cy.task('stubListBaseClients')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
 

integration_tests/e2e/view-base-client.cy.ts

@@ -4,7 +4,7 @@ import ViewClientSecretsPage from '../pages/viewClientSecrets'
 import ConfirmDeleteClientPage from '../pages/confirmDeleteClient'
 import EditBaseClientDetailsPage from '../pages/editBaseClientDetails'
 import EditBaseClientDeploymentDetailsPage from '../pages/editBaseClientDeploymentDetails'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 import AuthSignInPage from '../pages/authSignIn'
 import AuthErrorPage from '../pages/authError'
 
@@ -17,7 +17,7 @@ context('Base client page - Auth', () => {
   beforeEach(() => {
     cy.task('reset')
     cy.task('stubSignIn')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
     cy.task('stubAddClientInstance')
@@ -42,7 +42,7 @@ context('Base client page - client credentials flow', () => {
   beforeEach(() => {
     cy.task('reset')
     cy.task('stubSignIn')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.ClientCredentials })
+    cy.task('stubGetBaseClient', { grantType: GrantType.ClientCredentials })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
     cy.task('stubAddClientInstance')
@@ -115,7 +115,7 @@ context('Base client page - authorization-code flow', () => {
   beforeEach(() => {
     cy.task('reset')
     cy.task('stubSignIn')
-    cy.task('stubGetBaseClient', { grantType: GrantTypes.AuthorizationCode })
+    cy.task('stubGetBaseClient', { grantType: GrantType.AuthorizationCode })
     cy.task('stubManageUser')
     cy.task('stubGetListClientInstancesList')
     cy.task('stubAddClientInstance')

integration_tests/mockApis/baseClientsApi.ts

@@ -5,7 +5,7 @@ import {
   getListClientInstancesResponseMock,
   getSecretsResponseMock,
 } from '../../server/data/localMockData/baseClientsResponseMock'
-import { GrantTypes } from '../../server/data/enums/grantTypes'
+import { GrantType } from '../../server/data/enums/grantType'
 
 export default {
   stubListBaseClients: () => {
@@ -24,7 +24,7 @@ export default {
     })
   },
 
-  stubGetBaseClient: (config: { grantType: GrantTypes }) => {
+  stubGetBaseClient: (config: { grantType: GrantType }) => {
     return stubFor({
       request: {
         method: 'GET',

server/controllers/baseClientController.ts

@@ -7,7 +7,7 @@ import { mapCreateBaseClientForm, mapEditBaseClientDeploymentForm, mapEditBaseCl
 import { BaseClient, BaseClientListFilter, ClientSecrets } from '../interfaces/baseClientApi/baseClient'
 import editBaseClientPresenter from '../views/presenters/editBaseClientPresenter'
 import mapFilterForm from '../mappers/forms/mapFilterForm'
-import { GrantTypes } from '../data/enums/grantTypes'
+import { GrantType } from '../data/enums/grantType'
 import { kebab } from '../utils/utils'
 import baseClientAudit, { BaseClientAuditFunction } from '../audit/baseClientAudit'
 import { BaseClientEvent } from '../audit/baseClientEvent'
@@ -71,7 +71,7 @@ export default class BaseClientController {
   public displayNewBaseClient(): RequestHandler {
     return async (req, res) => {
       const { grant } = req.query
-      if (!(grant === kebab(GrantTypes.ClientCredentials) || grant === kebab(GrantTypes.AuthorizationCode))) {
+      if (!(grant === kebab(GrantType.ClientCredentials) || grant === kebab(GrantType.AuthorizationCode))) {
         res.render('pages/new-base-client-grant.njk', { enableAuthorizationCode })
         return
       }

server/data/enums/grantTypes.ts → server/data/enums/grantType.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-shadow,import/prefer-default-export
-export enum GrantTypes {
+export enum GrantType {
   ClientCredentials = 'client_credentials',
   AuthorizationCode = 'authorization_code',
 }

server/data/localMockData/baseClientsResponseMock.ts

@@ -4,7 +4,7 @@ import {
   ListBaseClientsResponse,
   ListClientInstancesResponse,
 } from '../../interfaces/baseClientApi/baseClientResponse'
-import { GrantTypes } from '../enums/grantTypes'
+import { GrantType } from '../enums/grantType'
 import { MfaType } from '../enums/mfaTypes'
 import { snake } from '../../utils/utils'
 
@@ -36,7 +36,7 @@ export const listBaseClientsResponseMock: ListBaseClientsResponse = {
   ],
 }
 
-export const getBaseClientResponseMock: (grantType: GrantTypes) => GetBaseClientResponse = (grantType: GrantTypes) => {
+export const getBaseClientResponseMock: (grantType: GrantType) => GetBaseClientResponse = (grantType: GrantType) => {
   const response: GetBaseClientResponse = {
     grantType: 'CLIENT_CREDENTIALS',
     clientId: 'base_client_id_1',
@@ -59,7 +59,7 @@ export const getBaseClientResponseMock: (grantType: GrantTypes) => GetBaseClient
       deploymentInfo: 'deployment deployment info',
     },
   }
-  if (snake(grantType) === GrantTypes.ClientCredentials) {
+  if (snake(grantType) === GrantType.ClientCredentials) {
     return {
       ...response,
       grantType: 'CLIENT_CREDENTIALS',

server/interfaces/baseClientApi/baseClient.ts

@@ -1,4 +1,6 @@
 import { MfaType } from '../../data/enums/mfaTypes'
+import { GrantType } from '../../data/enums/grantType'
+import { ClientType } from '../../data/enums/clientTypes'
 
 export interface BaseClient {
   baseClientId: string

server/mappers/forms/mapEditBaseClientDetailsForm.test.ts

@@ -3,7 +3,7 @@ import { createMock } from '@golevelup/ts-jest'
 import { baseClientFactory } from '../../testutils/factories'
 import { dateISOString, offsetNow } from '../../utils/utils'
 import { mapEditBaseClientDetailsForm } from '../index'
-import { GrantTypes } from '../../data/enums/grantTypes'
+import { GrantType } from '../../data/enums/grantType'
 import { MfaType } from '../../data/enums/mfaTypes'
 
 const formRequest = (form: Record<string, unknown>) => {
@@ -99,7 +99,7 @@ describe('mapEditBaseClientDetailsForm', () => {
         baseClientId: detailedBaseClient.baseClientId,
         approvedScopes: 'requestscope1,requestscope2',
         audit: 'request audit',
-        grantType: GrantTypes.ClientCredentials,
+        grantType: GrantType.ClientCredentials,
         authorities: 'requestauthority1\r\nrequestauthority2',
         databaseUsername: 'request databaseUsername',
         allowedIPs: 'requestallowedIP1\r\nrequestallowedIP2',
@@ -114,7 +114,7 @@ describe('mapEditBaseClientDetailsForm', () => {
       expect(update.baseClientId).toEqual(detailedBaseClient.baseClientId)
       expect(update.scopes).toEqual(['requestscope1', 'requestscope2'])
       expect(update.audit).toEqual('request audit')
-      expect(update.grantType).toEqual(GrantTypes.ClientCredentials)
+      expect(update.grantType).toEqual(GrantType.ClientCredentials)
       expect(update.clientCredentials.authorities).toEqual(['requestauthority1', 'requestauthority2'])
       expect(update.clientCredentials.databaseUserName).toEqual('request databaseUsername')
       expect(update.config.allowedIPs).toEqual(['requestallowedIP1', 'requestallowedIP2'])
@@ -141,7 +141,7 @@ describe('mapEditBaseClientDetailsForm', () => {
         baseClientId: detailedBaseClient.baseClientId,
         approvedScopes: 'requestscope1,requestscope2',
         audit: 'request audit',
-        grantType: GrantTypes.AuthorizationCode,
+        grantType: GrantType.AuthorizationCode,
         redirectUris: 'requestredirectUri1\r\nrequestredirectUri2',
         jwtFields: 'request jwtFields',
         azureAdLoginFlow: 'redirect',