From 1c1a5eaf36527bf6d5add2c0c2c383904748a0d8 Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabis94@live.com>
Date: Fri, 30 Jun 2023 11:23:23 +0300
Subject: [PATCH] fix(fe1): log out on invalid auth token

---
 packages/frontend/src/plugins/authHelpers.js | 13 ++++++++-----
 workspace.code-workspace                     |  1 -
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/plugins/authHelpers.js b/packages/frontend/src/plugins/authHelpers.js
index 81f42dc9f..4fa3f6eff 100644
--- a/packages/frontend/src/plugins/authHelpers.js
+++ b/packages/frontend/src/plugins/authHelpers.js
@@ -6,6 +6,7 @@ import { AppLocalStorage } from '@/utils/localStorage'
 import { has } from 'lodash'
 import { deletePostAuthRedirect } from '@/main/lib/auth/utils/postAuthRedirectManager'
 import { resolveMixpanelUserId } from '@speckle/shared'
+import { convertThrowIntoFetchResult } from '@/main/lib/common/apollo/helpers/apolloOperationHelper'
 
 const appId = 'spklwebapp'
 const appSecret = 'spklwebapp'
@@ -40,11 +41,13 @@ export async function prefetchUserAndSetID(apolloClient) {
   if (!token) return
 
   // Pull user info (& remember it in the Apollo cache)
-  const { data } = await apolloClient.query({
-    query: mainUserDataQuery
-  })
+  const { data } = await apolloClient
+    .query({
+      query: mainUserDataQuery
+    })
+    .catch(convertThrowIntoFetchResult)
 
-  const user = data.activeUser
+  const user = data?.activeUser
   if (user) {
     const distinctId = resolveMixpanelUserId(user.email)
     AppLocalStorage.set('distinct_id', distinctId)
@@ -52,7 +55,7 @@ export async function prefetchUserAndSetID(apolloClient) {
     AppLocalStorage.set('stcount', user.streams.totalCount)
     return data
   } else {
-    await signOut()
+    await signOut().catch(console.error)
     throw new InvalidAuthTokenError()
   }
 }
diff --git a/workspace.code-workspace b/workspace.code-workspace
index 6567f23c5..ed4422463 100644
--- a/workspace.code-workspace
+++ b/workspace.code-workspace
@@ -105,7 +105,6 @@
     "[vue]": {
       "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "prettier.prettierPath": "./node_modules/prettier"
   },
   "extensions": {
     // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.