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

UI: Align auth method config ttl value with system setting #26658

Closed
wants to merge 9 commits into from
Closed

UI: Align auth method config ttl value with system setting #26658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1db3b1b
Make the internal UI mount read match what tune read does, by using t…
ncabatoff Oct 31, 2023
98655d0
Fix a couple of bugs
ncabatoff Dec 15, 2023
e353779
Limit impact of change to UI-specific endpoints
ncabatoff Dec 21, 2023
5b2d937
Fix test
ncabatoff Dec 21, 2023
7d0aa37
Merge remote-tracking branch 'origin/main' into vault-21112/fix-mount…
Apr 25, 2024
40b8284
refactor findAll to use internal/ui/mounts when authenticated as well
hellobontempo Apr 26, 2024
840f96f
format ttl in details view
hellobontempo Apr 26, 2024
0ee782b
include hours in format for easy comparison to CLI return
hellobontempo Apr 26, 2024
eb4c00c
Merge branch 'main' into ui/align-auth-method-ttl-with-tune
hellobontempo Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions ui/app/adapters/auth-method.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,21 @@ export default ApplicationAdapter.extend({

findAll(store, type, sinceToken, snapshotRecordArray) {
const isUnauthenticated = snapshotRecordArray?.adapterOptions?.unauthenticated;
if (isUnauthenticated) {
const url = `/${this.urlPrefix()}/internal/ui/mounts`;
return this.ajax(url, 'GET', {
unauthenticated: true,
const url = `/${this.urlPrefix()}/internal/ui/mounts`;
return this.ajax(url, 'GET', { unauthenticated: isUnauthenticated })
.then((result) => {
return {
data: result.data.auth,
};
})
.then((result) => {
return {
data: result.data.auth,
};
})
.catch(() => {
return {
data: {},
};
});
}
return this.ajax(this.url(), 'GET').catch((e) => {
if (e instanceof AdapterError) {
set(e, 'policyPath', 'sys/auth');
}
throw e;
});
.catch((e) => {
if (isUnauthenticated) {
return { data: {} };
} else if (e instanceof AdapterError) {
set(e, 'policyPath', 'sys/auth');
}
throw e;
});
},

createRecord(store, type, snapshot) {
Expand Down
2 changes: 2 additions & 0 deletions ui/app/templates/components/auth-method/configuration.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
@alwaysRender={{not (is-empty-value (get @model attr.name))}}
@label={{or attr.options.label (to-label attr.name)}}
@value={{stringify (get @model attr.name)}}
@formatTtl={{eq attr.options.editType "ttl"}}
/>
{{else}}
<InfoTableRow
@alwaysRender={{not (is-empty-value (get @model attr.name))}}
@label={{or attr.options.label (to-label attr.name)}}
@value={{get @model attr.name}}
@formatTtl={{eq attr.options.editType "ttl"}}
/>
{{/if}}
{{/each}}
Expand Down
7 changes: 5 additions & 2 deletions ui/lib/core/addon/helpers/format-duration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { helper } from '@ember/component/helper';
import { durationToSeconds } from 'core/utils/duration-utils';
import { convertFromSeconds, durationToSeconds, largestUnitFromSeconds } from 'core/utils/duration-utils';
import { formatDuration, intervalToDuration } from 'date-fns';

export function duration([time]) {
Expand All @@ -23,7 +23,10 @@ export function duration([time]) {
return '0 seconds';
}
// convert to human-readable format: '1 hour 6 seconds'
return formatDuration(durationObject);
let unit = largestUnitFromSeconds(seconds);
if (unit === 'd') unit = 'h'; // highest increment backend returns is hour
const duration = convertFromSeconds(seconds, unit);
return `${formatDuration(durationObject)} (${duration}${unit})`;
}
return time;
}
Expand Down
Loading