Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change for api updates to accessTokenValidity #79

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Change for api updates to accessTokenValidity #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb330e
Update to accept/send accessTokenValidity to api in seconds, not minutes
thomasridd Feb 26, 2024
91123c3
Merge branch 'main' into bugfix/change-for-api-updates
thomasridd Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/data/localMockData/baseClientsResponseMock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions server/interfaces/baseClientApi/baseClientRequestBody.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface AddBaseClientRequest {
jiraNumber?: string
databaseUserName?: string
validDays?: number
accessTokenValidityMinutes?: number
accessTokenValiditySeconds?: number
grantType?: string
mfa?: string
mfaRememberMe?: boolean
Expand All @@ -21,7 +21,7 @@ export interface UpdateBaseClientRequest {
jiraNumber?: string
databaseUserName?: string
validDays?: number
accessTokenValidityMinutes?: number
accessTokenValiditySeconds?: number
grantType?: string
mfa?: string
mfaRememberMe?: boolean
Expand Down
2 changes: 1 addition & 1 deletion server/interfaces/baseClientApi/baseClientResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export interface GetBaseClientResponse {
jiraNumber?: string
databaseUserName?: string
validDays?: number
accessTokenValidityMinutes?: number
accessTokenValiditySeconds?: number
grantType?: string
mfa?: string
mfaRememberMe?: boolean
Expand Down
2 changes: 1 addition & 1 deletion server/mappers/baseClientApi/addBaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion server/mappers/baseClientApi/getBaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 : '',
Expand Down
2 changes: 1 addition & 1 deletion server/mappers/baseClientApi/updateBaseClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down