From ab4569e5d6b6bd0aa813004ff2ee0df658cea3e4 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Sun, 11 Apr 2021 13:33:35 +0200
Subject: [PATCH] web/admin: fix application form's provider selection not
 working

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 authentik/providers/proxy/api.py                  | 5 -----
 web/src/pages/applications/ApplicationForm.ts     | 4 ++--
 web/src/pages/applications/ApplicationListPage.ts | 6 +++---
 web/src/pages/applications/ApplicationViewPage.ts | 6 +++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/authentik/providers/proxy/api.py b/authentik/providers/proxy/api.py
index ce0de0add..cd2e54cff 100644
--- a/authentik/providers/proxy/api.py
+++ b/authentik/providers/proxy/api.py
@@ -100,8 +100,3 @@ class ProxyOutpostConfigViewSet(ReadOnlyModelViewSet):
     queryset = ProxyProvider.objects.filter(application__isnull=False)
     serializer_class = ProxyOutpostConfigSerializer
     ordering = ["name"]
-
-    def get_queryset(self):
-        qs = super().get_queryset()
-        print(qs)
-        return qs
diff --git a/web/src/pages/applications/ApplicationForm.ts b/web/src/pages/applications/ApplicationForm.ts
index 3d000959a..a169e0d94 100644
--- a/web/src/pages/applications/ApplicationForm.ts
+++ b/web/src/pages/applications/ApplicationForm.ts
@@ -72,7 +72,7 @@ export class ApplicationForm extends Form<Application> {
             ${Array.from(m).map(([group, providers]) => {
                 return html`<optgroup label=${group}>
                     ${providers.map(p => {
-                        const selected = (this.application?.provider?.pk === p.pk) || (this.provider === p.pk);
+                        const selected = (this.application?.provider === p.pk) || (this.provider === p.pk);
                         return html`<option ?selected=${selected} value=${ifDefined(p.pk)}>${p.name}</option>`;
                     })}
                 </optgroup>`;
@@ -98,7 +98,7 @@ export class ApplicationForm extends Form<Application> {
             </ak-form-element-horizontal>
             <ak-form-element-horizontal
                 label=${t`Provider`}
-                name="parent">
+                name="provider">
                 <select class="pf-c-form-control">
                     <option value="" ?selected=${this.application?.provider === undefined}>---------</option>
                     ${until(new ProvidersApi(DEFAULT_CONFIG).providersAllList({}).then(providers => {
diff --git a/web/src/pages/applications/ApplicationListPage.ts b/web/src/pages/applications/ApplicationListPage.ts
index bcf323272..d3901493b 100644
--- a/web/src/pages/applications/ApplicationListPage.ts
+++ b/web/src/pages/applications/ApplicationListPage.ts
@@ -75,11 +75,11 @@ export class ApplicationListPage extends TablePage<Application> {
             </a>`,
             html`<code>${item.slug}</code>`,
             item.provider ?
-                html`<a href="#/core/providers/${item.provider.pk}">
-                    ${item.provider?.name}
+                html`<a href="#/core/providers/${item.providerObj?.pk}">
+                    ${item.providerObj?.name}
                 </a>` :
                 html`-`,
-            html`${item.provider?.verboseName || "-"}`,
+            html`${item.providerObj?.verboseName || "-"}`,
             html`
             <ak-forms-modal>
                 <span slot="submit">
diff --git a/web/src/pages/applications/ApplicationViewPage.ts b/web/src/pages/applications/ApplicationViewPage.ts
index 67df95d50..95d28a557 100644
--- a/web/src/pages/applications/ApplicationViewPage.ts
+++ b/web/src/pages/applications/ApplicationViewPage.ts
@@ -81,15 +81,15 @@ export class ApplicationViewPage extends LitElement {
                             <div class="pf-c-card__title">${t`Related`}</div>
                             <div class="pf-c-card__body">
                                 <dl class="pf-c-description-list">
-                                    ${this.application.provider ?
+                                    ${this.application.providerObj ?
                                     html`<div class="pf-c-description-list__group">
                                             <dt class="pf-c-description-list__term">
                                                 <span class="pf-c-description-list__text">${t`Provider`}</span>
                                             </dt>
                                             <dd class="pf-c-description-list__description">
                                                 <div class="pf-c-description-list__text">
-                                                    <a href="#/core/providers/${this.application.provider.pk}">
-                                                        ${this.application.provider.name}
+                                                    <a href="#/core/providers/${this.application.providerObj?.pk}">
+                                                        ${this.application.providerObj?.name}
                                                     </a>
                                                 </div>
                                             </dd>