From 00d9bb4368506a5150b60bcd9bd1104c9fe2e735 Mon Sep 17 00:00:00 2001
From: Matthew Irish <meirish@users.noreply.github.com>
Date: Tue, 5 Mar 2019 10:03:54 -0600
Subject: [PATCH] use 'oidc' as the default when it's selected (#6338)

---
 ui/app/components/auth-jwt.js             | 3 ++-
 ui/app/templates/components/auth-form.hbs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/app/components/auth-jwt.js b/ui/app/components/auth-jwt.js
index 829cb8b1f6..5fcf281c66 100644
--- a/ui/app/components/auth-jwt.js
+++ b/ui/app/components/auth-jwt.js
@@ -16,6 +16,7 @@ export { ERROR_WINDOW_CLOSED, ERROR_MISSING_PARAMS };
 export default Component.extend({
   store: service(),
   selectedAuthPath: null,
+  selectedAuthType: null,
   roleName: null,
   role: null,
   onRoleName() {},
@@ -52,7 +53,7 @@ export default Component.extend({
       // debounce
       yield timeout(WAIT_TIME);
     }
-    let path = this.selectedAuthPath || 'jwt';
+    let path = this.selectedAuthPath || this.selectedAuthType;
     let id = JSON.stringify([path, roleName]);
     let role = null;
     try {
diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs
index 5c5a8c6b63..22ca15e946 100644
--- a/ui/app/templates/components/auth-form.hbs
+++ b/ui/app/templates/components/auth-form.hbs
@@ -65,6 +65,7 @@
       @onSubmit={{action "doSubmit"}}
       @onRoleName={{action (mut this.roleName)}}
       @roleName={{this.roleName}}
+      @selectedAuthType={{this.selectedAuthBackend.type}}
       @selectedAuthPath={{or this.customPath this.selectedAuthBackend.id}}
       @disabled={{authenticate.isRunning}}
     >