From 166b98fa34fa57af6b280727a0762e4f2271aca9 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 2 Jun 2021 18:00:26 +0200
Subject: [PATCH] web/admin: fix BoundPoliciesList's edit policy button not
 working

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
---
 internal/web/web_proxy.go                   |  2 +-
 web/src/pages/policies/BoundPoliciesList.ts | 33 ++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/internal/web/web_proxy.go b/internal/web/web_proxy.go
index 2eb7f7ab9..84537b645 100644
--- a/internal/web/web_proxy.go
+++ b/internal/web/web_proxy.go
@@ -32,6 +32,6 @@ func (ws *WebServer) proxyErrorHandler(rw http.ResponseWriter, req *http.Request
 }
 
 func (ws *WebServer) proxyModifyResponse(r *http.Response) error {
-	r.Header.Set("X-authentik-from", "authentik")
+	r.Header.Set("server", "authentik")
 	return nil
 }
diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts
index 61b4be6af..982691c57 100644
--- a/web/src/pages/policies/BoundPoliciesList.ts
+++ b/web/src/pages/policies/BoundPoliciesList.ts
@@ -72,7 +72,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
                 <ak-proxy-form
                     slot="form"
                     .args=${{
-                        "policyUUID": item.policy
+                        "instancePk": item.policy
                     }}
                     type=${ifDefined(item.policyObj?.component)}>
                 </ak-proxy-form>
@@ -174,8 +174,21 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
 
     renderToolbar(): TemplateResult {
         return html`
+        <ak-forms-modal size=${PFSize.Medium}>
+            <span slot="submit">
+                ${t`Create`}
+            </span>
+            <span slot="header">
+                ${t`Create Binding`}
+            </span>
+            <ak-policy-binding-form slot="form" targetPk=${ifDefined(this.target)} ?policyOnly=${this.policyOnly}>
+            </ak-policy-binding-form>
+            <button slot="trigger" class="pf-c-button pf-m-primary">
+                ${t`Create Binding`}
+            </button>
+        </ak-forms-modal>
         <ak-dropdown class="pf-c-dropdown">
-            <button class="pf-m-primary pf-c-dropdown__toggle" type="button">
+            <button class="pf-m-secondary pf-c-dropdown__toggle" type="button">
                 <span class="pf-c-dropdown__toggle-text">${t`Create Policy`}</span>
                 <i class="fas fa-caret-down pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </button>
@@ -204,20 +217,6 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
                 }), html`<ak-spinner></ak-spinner>`)}
             </ul>
         </ak-dropdown>
-        <ak-forms-modal size=${PFSize.Medium}>
-            <span slot="submit">
-                ${t`Create`}
-            </span>
-            <span slot="header">
-                ${t`Create Binding`}
-            </span>
-            <ak-policy-binding-form slot="form" targetPk=${ifDefined(this.target)} ?policyOnly=${this.policyOnly}>
-            </ak-policy-binding-form>
-            <button slot="trigger" class="pf-c-button pf-m-secondary">
-                ${t`Create Binding`}
-            </button>
-        </ak-forms-modal>
-        ${super.renderToolbar()}
-        `;
+        ${super.renderToolbar()}`;
     }
 }