From f84c176bd092318410dc46cf3469935f5a0996e5 Mon Sep 17 00:00:00 2001
From: Jens L <jens@goauthentik.io>
Date: Wed, 5 Apr 2023 15:49:18 +0200
Subject: [PATCH] web/admin: fix sidebar avatar not loaded (#5184)

---
 web/src/elements/sidebar/SidebarUser.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/web/src/elements/sidebar/SidebarUser.ts b/web/src/elements/sidebar/SidebarUser.ts
index 77730cedd..97cdad27b 100644
--- a/web/src/elements/sidebar/SidebarUser.ts
+++ b/web/src/elements/sidebar/SidebarUser.ts
@@ -1,9 +1,10 @@
-import { AdminInterface } from "@goauthentik/admin/AdminInterface";
-import { AKElement, rootInterface } from "@goauthentik/elements/Base";
+import { me } from "@goauthentik/common/users";
+import { AKElement } from "@goauthentik/elements/Base";
 
 import { CSSResult, TemplateResult, css, html } from "lit";
 import { customElement } from "lit/decorators.js";
 import { ifDefined } from "lit/directives/if-defined.js";
+import { until } from "lit/directives/until.js";
 
 import PFAvatar from "@patternfly/patternfly/components/Avatar/avatar.css";
 import PFNav from "@patternfly/patternfly/components/Nav/nav.css";
@@ -33,12 +34,18 @@ export class SidebarUser extends AKElement {
     }
 
     render(): TemplateResult {
-        const me = rootInterface<AdminInterface>()?.user;
         return html`
             <a href="/if/user/#/settings" class="pf-c-nav__link user-avatar" id="user-settings">
-                ${me
-                    ? html`<img class="pf-c-avatar" src="${ifDefined(me.user.avatar)}" alt="" />`
-                    : html``}
+                ${until(
+                    me().then((u) => {
+                        return html`<img
+                            class="pf-c-avatar"
+                            src="${ifDefined(u.user.avatar)}"
+                            alt=""
+                        />`;
+                    }),
+                    html``,
+                )}
             </a>
             <a href="/flows/-/default/invalidation/" class="pf-c-nav__link user-logout" id="logout">
                 <i class="fas fa-sign-out-alt" aria-hidden="true"></i>