Improve login/logout flow

Signed-off-by: Knut Ahlers <knut@ahlers.me>
Luzifer · Jun 20, 2024 · b75af63 · b75af63
1 parent d10c78a
commit b75af63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/_headNav.vue b/src/components/_headNav.vue
@@ -79,7 +79,7 @@ export default defineComponent({
 
   data() {
     return {
-      socketConnected: false,
+      socketConnected: true, // Directly after load it should always be connected
     }
   },
 

diff --git a/src/main.ts b/src/main.ts
@@ -31,8 +31,8 @@ const app = createApp({
     },
 
     tokenRenewAt(): Date | null {
-      if (this.tokenExpiresAt === null || this.tokenExpiresAt.getTime() < this.now.getTime()) {
-        // We don't know when it expires or it's expired, we can't renew
+      if (this.tokenExpiresAt === null) {
+        // We don't know when it expires, we can't renew
         return null
       }
 
@@ -88,7 +88,7 @@ const app = createApp({
       this.tokenUser = username
       window.localStorage.setItem('twitch-bot-token', JSON.stringify({ expiresAt, token, username }))
       // Nuke the Twitch auth-response from the browser history
-      window.history.replaceState(null, '', window.location.href.split('#')[0])
+      this.$router.replace({ name: 'dashboard' })
 
       fetch(`config-editor/user?user=${this.tokenUser}`, this.$root.fetchOpts)
         .then((resp: Response) => this.$root.parseResponseFromJSON(resp))