From 556a37e836117fca10c4d693066de670a84860dc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 24 Aug 2026 19:24:14 +0300
Subject: [PATCH] login/logout/register woes

---
 src/components/desktop_nav/desktop_nav.js     |  4 ++--
 src/components/mobile_nav/mobile_nav.js       |  2 +-
 .../oauth_callback/oauth_callback.js          |  4 ++--
 src/components/registration/registration.vue  |  2 +-
 src/components/timeline/timeline.vue          |  4 +++-
 src/stores/auth_flow.js                       |  4 ++--
 src/stores/oauth.js                           |  2 +-
 src/stores/streaming.js                       |  1 -
 src/stores/timelines.js                       | 24 +++++++++++++------
 test/unit/specs/stores/timelines.spec.js      |  2 --
 test/unit/specs/stores/users.spec.js          |  1 -
 11 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 32d0b37a9..15a5cfb15 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -135,9 +135,9 @@ export default {
         this.showConfirmLogout()
       }
     },
-    doLogout() {
+    async doLogout() {
+      await useUsersStore().logout()
       this.$router.replace('/main/public')
-      useUsersStore().logout()
       this.hideConfirmLogout()
     },
     onSearchBarToggled(hidden) {
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 163c0e9aa..97645ca73 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -145,9 +145,9 @@ const MobileNav = {
       }
     },
     doLogout() {
-      this.$router.replace('/main/public')
       useUsersStore().logout()
       this.hideConfirmLogout()
+      this.$router.replace('/main/public')
     },
     markNotificationsAsSeen() {
       useNotificationsStore().markNotificationsAsSeen()
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index bf6e03c9e..824ab7bda 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -16,10 +16,10 @@ const oac = {
         clientSecret,
         instance: useInstanceStore().server,
         code: this.code,
-      }).then(({ data: result }) => {
+      }).then(async ({ data: result }) => {
         oauthStore.setToken(result.access_token)
 
-        useUsersStore().loginUser(result.access_token)
+        await useUsersStore().loginUser(result.access_token)
         this.$router.push({ name: 'friends' })
       })
     }
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 0abcfe656..0ad7c026a 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -303,7 +303,7 @@
           <!-- eslint-enable vue/no-v-html -->
           </div>
           <div
-            v-if="serverValidationErrors.length"
+            v-if="signUpErrors.length"
             class="form-group"
           >
             <div class="alert error">
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 7e3eefce2..69657525c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,5 +1,7 @@
 <template>
-  <div :class="['Timeline', classes.root]">
+  <!-- there is a brief moment during logout when old timeline gets forcibly deactivated -->
+  <div v-if="timeline.fetcher" :class="['Timeline', classes.root]">
+    {{ timelineRef }}
     <div
       v-if="!embedded"
       :class="classes.header"
diff --git a/src/stores/auth_flow.js b/src/stores/auth_flow.js
index 0841dc558..6600fe3f8 100644
--- a/src/stores/auth_flow.js
+++ b/src/stores/auth_flow.js
@@ -63,8 +63,8 @@ export const useAuthFlowStore = defineStore('authFlow', {
       this.settings = {}
     },
     async login({ access_token: accessToken }) {
-      useOAuthStore().setToken(accessToken)
-      useUsersStore().loginUser(accessToken, { root: true })
+      await useOAuthStore().setToken(accessToken)
+      await useUsersStore().loginUser(accessToken, { root: true })
       this.resetState()
     },
   },
diff --git a/src/stores/oauth.js b/src/stores/oauth.js
index 35cd67afb..2d87645eb 100644
--- a/src/stores/oauth.js
+++ b/src/stores/oauth.js
@@ -53,7 +53,7 @@ export const useOAuthStore = defineStore('oauth', {
       this.userToken = token
     },
     clearToken() {
-      this.userToken = false
+      this.userToken = null
     },
     async createApp() {
       const instance = useInstanceStore().server
diff --git a/src/stores/streaming.js b/src/stores/streaming.js
index cce3c175b..5129a571d 100644
--- a/src/stores/streaming.js
+++ b/src/stores/streaming.js
@@ -180,7 +180,6 @@ export const useStreamingStore = defineStore('streaming', {
           case 'delete':
             return [data.id]
           default:
-            console.log('UNKNOWN', eventName, eventStream, data)
             return data
         }
       })()
diff --git a/src/stores/timelines.js b/src/stores/timelines.js
index 6840a28f5..fe098587a 100644
--- a/src/stores/timelines.js
+++ b/src/stores/timelines.js
@@ -258,14 +258,24 @@ export const useTimelinesStore = defineStore('timelines', {
       timeline.fetcher.startFetching()
     },
     stopFetchingTimeline(timelineName, reason) {
-      console.debug(
-        '[Timelines] Stopped fetching timeline',
-        timelineName,
-        'Reason:',
-        reason,
-      )
       const timeline = this[timelineName]
-      timeline.fetcher.stopFetching()
+      if (timeline.fetcher === null) {
+        console.debug(
+          '[Timelines] Already inactive timeline',
+          timelineName,
+          'Reason:',
+          reason,
+        )
+        return
+      } else {
+        timeline.fetcher.stopFetching()
+        console.debug(
+          '[Timelines] Stopped fetching timeline',
+          timelineName,
+          'Reason:',
+          reason,
+        )
+      }
     },
 
     // Queues & Timeline manip
diff --git a/test/unit/specs/stores/timelines.spec.js b/test/unit/specs/stores/timelines.spec.js
index f810c029d..cfc84ea3d 100644
--- a/test/unit/specs/stores/timelines.spec.js
+++ b/test/unit/specs/stores/timelines.spec.js
@@ -21,7 +21,6 @@ describe('Timelines store', () => {
       const sub = vi.fn()
       useStreamingStore().addSubscriber = sub
 
-      console.log(store.activate)
       store.activate('friends', undefined, true)
 
       expect(sub).to.have.been.called
@@ -34,7 +33,6 @@ describe('Timelines store', () => {
       const sub = vi.fn()
       useStreamingStore().addSubscriber = sub
 
-      console.log(store.activate)
       store.activate('user', '1')
 
       expect(sub).to.not.have.been.called
diff --git a/test/unit/specs/stores/users.spec.js b/test/unit/specs/stores/users.spec.js
index e9e557960..7e196565d 100644
--- a/test/unit/specs/stores/users.spec.js
+++ b/test/unit/specs/stores/users.spec.js
@@ -1095,7 +1095,6 @@ describe('Users store', () => {
       const store = useUsersStore()
       const { storeAction, apiUrl } = actionKeys(action)
       await store[storeAction](userId)
-      console.log(apiUrl)
 
       expect(mockFetch).to.have.been.calledWith(
         USER_API[apiUrl](userId),