scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

use 'oidc' as the default when it's selected (#6338)

Browse Source
This commit is contained in:
Matthew Irish
2019-03-05 10:03:54 -06:00
committed by GitHub
parent 8b4e30c1a1
commit 00d9bb4368
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ui/app/components/auth-jwt.js
View File

@@ -16,6 +16,7 @@ export { ERROR_WINDOW_CLOSED, ERROR_MISSING_PARAMS };
export default Component.extend({ export default Component.extend({
store: service(), store: service(),
selectedAuthPath: null, selectedAuthPath: null,
selectedAuthType: null,
roleName: null, roleName: null,
role: null, role: null,
onRoleName() {}, onRoleName() {},
@@ -52,7 +53,7 @@ export default Component.extend({
// debounce // debounce
yield timeout(WAIT_TIME); yield timeout(WAIT_TIME);
} }
let path = this.selectedAuthPath || 'jwt'; let path = this.selectedAuthPath || this.selectedAuthType;
let id = JSON.stringify([path, roleName]); let id = JSON.stringify([path, roleName]);
let role = null; let role = null;
try { try {

1
ui/app/templates/components/auth-form.hbs
View File

@@ -65,6 +65,7 @@
@onSubmit={{action "doSubmit"}} @onSubmit={{action "doSubmit"}}
@onRoleName={{action (mut this.roleName)}} @onRoleName={{action (mut this.roleName)}}
@roleName={{this.roleName}} @roleName={{this.roleName}}
@selectedAuthType={{this.selectedAuthBackend.type}}
@selectedAuthPath={{or this.customPath this.selectedAuthBackend.id}} @selectedAuthPath={{or this.customPath this.selectedAuthBackend.id}}
@disabled={{authenticate.isRunning}} @disabled={{authenticate.isRunning}}
> >