Fixes

PostHog · Mar 22, 2024 · e6d7d89 · e6d7d89
1 parent cf41bfa
commit e6d7d89
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 94 deletions.
diff --git a/frontend/src/toolbar/bar/Toolbar.tsx b/frontend/src/toolbar/bar/Toolbar.tsx
@@ -84,10 +84,11 @@ function MoreMenu(): JSX.Element {
     )
 }
 
-export function ToolbarInfoMenu(): JSX.Element {
+export function ToolbarInfoMenu(): JSX.Element | null {
     const ref = useRef<HTMLDivElement | null>(null)
     const { visibleMenu, isDragging, menuProperties, minimized, isBlurred } = useValues(toolbarLogic)
     const { setMenu } = useActions(toolbarLogic)
+    const { isAuthenticated } = useValues(toolbarConfigLogic)
 
     const content = minimized ? null : visibleMenu === 'flags' ? (
         <FlagsToolbarMenu />
@@ -104,6 +105,10 @@ export function ToolbarInfoMenu(): JSX.Element {
         return () => setMenu(null)
     }, [ref.current])
 
+    if (!isAuthenticated) {
+        return null
+    }
+
     return (
         <div
             className={clsx(

diff --git a/frontend/src/toolbar/bar/ToolbarButton.scss b/frontend/src/toolbar/bar/ToolbarButton.scss
@@ -24,6 +24,7 @@
         border: none;
         border-radius: var(--radius);
         transition: transform 100ms ease;
+        font-weight: 600;
 
         > svg {
             font-size: 1.5rem;

diff --git a/frontend/src/toolbar/flags/flagsToolbarLogic.ts b/frontend/src/toolbar/flags/flagsToolbarLogic.ts
@@ -40,11 +40,6 @@ export const flagsToolbarLogic = kea<flagsToolbarLogicType>([
                         `/api/projects/@current/feature_flags/my_flags${encodeParams(params, '?')}`
                     )
 
-                    if (response.status >= 400) {
-                        toolbarConfigLogic.actions.tokenExpired()
-                        return []
-                    }
-
                     breakpoint()
                     if (!response.ok) {
                         return []

diff --git a/frontend/src/toolbar/toolbarConfigLogic.ts b/frontend/src/toolbar/toolbarConfigLogic.ts
@@ -120,9 +120,12 @@ export async function toolbarFetch(
     if (response.status === 403) {
         const responseData = await response.json()
         // Do not try to authenticate if the user has no project access altogether
-        if (responseData.detail !== "You don't have access to the project.") {
+        if (responseData.detail === "You don't have access to the project.") {
             toolbarConfigLogic.actions.authenticate()
         }
     }
+    if (response.status == 401) {
+        toolbarConfigLogic.actions.tokenExpired()
+    }
     return response
 }
diff --git a/frontend/src/toolbar/toolbarLogic.ts b/frontend/src/toolbar/toolbarLogic.ts