From 0021a93952a06f6723fce634142ef6b5e46fa947 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sat, 17 Apr 2021 19:16:23 +0200
Subject: [PATCH] web/admin: fix non-matching provider type being selected when
 creating an OAuth Source

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 authentik/core/api/providers.py                |  1 +
 web/src/pages/sources/SourcesListPage.ts       |  3 +++
 web/src/pages/sources/oauth/OAuthSourceForm.ts | 11 ++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/authentik/core/api/providers.py b/authentik/core/api/providers.py
index 0bc20c2ff..366e216a4 100644
--- a/authentik/core/api/providers.py
+++ b/authentik/core/api/providers.py
@@ -86,6 +86,7 @@ class ProviderViewSet(
                 "name": _("SAML Provider from Metadata"),
                 "description": _("Create a SAML Provider by importing its Metadata."),
                 "component": "ak-provider-saml-import-form",
+                "model_name": "",
             }
         )
         return Response(TypeCreateSerializer(data, many=True).data)
diff --git a/web/src/pages/sources/SourcesListPage.ts b/web/src/pages/sources/SourcesListPage.ts
index 1302d256f..c88241a9a 100644
--- a/web/src/pages/sources/SourcesListPage.ts
+++ b/web/src/pages/sources/SourcesListPage.ts
@@ -128,6 +128,9 @@ export class SourceListPage extends TablePage<Source> {
                                 </span>
                                 <ak-proxy-form
                                     slot="form"
+                                    .args=${{
+                                        "modelName": type.modelName
+                                    }}
                                     type=${type.component}>
                                 </ak-proxy-form>
                                 <button slot="trigger" class="pf-c-dropdown__menu-item">
diff --git a/web/src/pages/sources/oauth/OAuthSourceForm.ts b/web/src/pages/sources/oauth/OAuthSourceForm.ts
index 81a8c681a..c78a88254 100644
--- a/web/src/pages/sources/oauth/OAuthSourceForm.ts
+++ b/web/src/pages/sources/oauth/OAuthSourceForm.ts
@@ -22,6 +22,9 @@ export class OAuthSourceForm extends Form<OAuthSource> {
         });
     }
 
+    @property()
+    modelName?: string;
+
     @property({attribute: false})
     source?: OAuthSource;
 
@@ -148,7 +151,13 @@ export class OAuthSourceForm extends Form<OAuthSource> {
                         }}>
                             ${until(new SourcesApi(DEFAULT_CONFIG).sourcesOauthSourceTypes().then(types => {
                                 return types.map(type => {
-                                    return html`<option ?data-urls-custom=${type.urlsCustomizable} value=${type.slug} ?selected=${this.source?.providerType === type.slug}>${type.name}</option>`;
+                                    let selected = this.source?.providerType === type.slug;
+                                    if (!this.source?.pk) {
+                                        if (this.modelName?.replace("oauthsource", "") === type.slug) {
+                                            selected = true;
+                                        }
+                                    }
+                                    return html`<option ?data-urls-custom=${type.urlsCustomizable} value=${type.slug} ?selected=${selected}>${type.name}</option>`;
                                 });
                             }), html`<option>${t`Loading...`}</option>`)}
                         </select>