From 9303a66aa85f6db0ea87f5249dea00230957026f Mon Sep 17 00:00:00 2001
From: Vadim <vadim.olonin@gmail.com>
Date: Wed, 21 Oct 2026 12:56:57 +0300
Subject: [PATCH] fix get resources after login

---
 src/App.vue                      | 32 ++++++++++++++++++++++++++------
 src/components/SignInEmail.vue   |  5 +++++
 src/components/SignInOtp.vue     |  6 ++++--
 src/components/SnackbarQueue.vue |  2 +-
 src/lib/redirect.ts              |  7 +++++++
 src/stores/issue-type.ts         |  6 +++++-
 src/stores/issue.ts              |  9 ++++++++-
 src/stores/project.ts            |  8 ++++++++
 src/stores/status.ts             |  6 +++++-
 9 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 src/lib/redirect.ts

diff --git a/src/App.vue b/src/App.vue
index 1b3d301..68548f4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useEventSource } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
-import { computed, onMounted, watch } from 'vue'
+import { computed, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useStatusStore } from '@/stores/status.ts'
 import { useIssueTypeStore } from '@/stores/issue-type.ts'
@@ -25,7 +25,7 @@ interface IssueSseEvent {
   type: string
 }
 
-const { data, event } = useEventSource<string[], IssueSseEvent>(
+const { event, open, close } = useEventSource<string[], IssueSseEvent>(
   `${window.location.origin}/api/issues/events`,
   ['issue.created', 'issue.updated', 'issue.deleted'],
   {
@@ -61,10 +61,30 @@ const layout = computed(() => {
   return layout ? `${layout}Layout` : 'DefaultLayout'
 })
 
-onMounted(async () => {
-  await Promise.all([statusStore.list(), issueTypeStore.list()])
-  await issueStore.getStat(currentProjectId.value)
-})
+// Все эти ресурсы требуют авторизации: грузим при появлении сессии и чистим при выходе,
+// иначе запросы, ушедшие до логина, падают с 401 и больше не повторяются
+watch(
+  () => session.value.data?.user.id,
+  async (userId) => {
+    if (!userId) {
+      close()
+      statusStore.reset()
+      issueTypeStore.reset()
+      issueStore.reset()
+      projectStore.reset()
+      return
+    }
+
+    open()
+    try {
+      await Promise.all([statusStore.list(), issueTypeStore.list()])
+      await issueStore.getStat(currentProjectId.value)
+    } catch (e) {
+      console.error('Failed to load dictionaries', e)
+    }
+  },
+  { immediate: true },
+)
 </script>
 
 <template>
diff --git a/src/components/SignInEmail.vue b/src/components/SignInEmail.vue
index aca07a3..e6cd1db 100644
--- a/src/components/SignInEmail.vue
+++ b/src/components/SignInEmail.vue
@@ -1,8 +1,12 @@
 <script setup lang="ts">
 import { reactive } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { authClient } from '@/lib/auth-client.js'
+import { redirectTarget } from '@/lib/redirect.ts'
 
 const REMEMBERED_EMAIL_KEY = 'rememberedEmail'
+const router = useRouter()
+const route = useRoute()
 
 const signInData = reactive({
   email: localStorage.getItem(REMEMBERED_EMAIL_KEY) ?? '',
@@ -25,6 +29,7 @@ const signIn = async () => {
     } else {
       localStorage.removeItem(REMEMBERED_EMAIL_KEY)
     }
+    router.push(redirectTarget(route.query.redirect))
   }
 }
 </script>
diff --git a/src/components/SignInOtp.vue b/src/components/SignInOtp.vue
index b1c7746..e485a56 100644
--- a/src/components/SignInOtp.vue
+++ b/src/components/SignInOtp.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import { reactive, ref, watch } from 'vue'
 import { authClient } from '@/lib/auth-client.js'
-import { useRouter } from 'vue-router'
+import { redirectTarget } from '@/lib/redirect.ts'
+import { useRoute, useRouter } from 'vue-router'
 
 const REMEMBERED_EMAIL_KEY = 'rememberedEmail'
 const router = useRouter()
+const route = useRoute()
 
 const otpError = ref('')
 const signIn = reactive({
@@ -43,7 +45,7 @@ const checkOTP = async () => {
     email: signIn.email,
     otp: signIn.OTP,
   })
-  if (data) router.push('/')
+  if (data) router.push(redirectTarget(route.query.redirect))
   if (error) {
     if (error.status === 400 && error.message) otpError.value = error.message
     if (error.status === 403 && error.message) {
diff --git a/src/components/SnackbarQueue.vue b/src/components/SnackbarQueue.vue
index 4bf598b..fb05edf 100644
--- a/src/components/SnackbarQueue.vue
+++ b/src/components/SnackbarQueue.vue
@@ -8,7 +8,7 @@ const snackbarStore = useSnackbarStore()
   <v-snackbar-queue
     ref="queue"
     v-model="snackbarStore.snackbarQueue"
-    location="bottom end"
+    location="top end"
     timeout="5000"
     total-visible="5"
   />
diff --git a/src/lib/redirect.ts b/src/lib/redirect.ts
new file mode 100644
index 0000000..e5567b6
--- /dev/null
+++ b/src/lib/redirect.ts
@@ -0,0 +1,7 @@
+import type { LocationQueryValue } from 'vue-router'
+
+/** Path to return to after sign-in; only same-origin paths are accepted to avoid open redirects */
+export function redirectTarget(redirect: LocationQueryValue | LocationQueryValue[] | undefined): string {
+  const value = Array.isArray(redirect) ? redirect[0] : redirect
+  return value && value.startsWith('/') && !value.startsWith('//') ? value : '/'
+}
diff --git a/src/stores/issue-type.ts b/src/stores/issue-type.ts
index 7d7d2dc..ef9c256 100644
--- a/src/stores/issue-type.ts
+++ b/src/stores/issue-type.ts
@@ -9,5 +9,9 @@ export const useIssueTypeStore = defineStore('issueType', () => {
     issueTypes.value = await issueTypesList()
   }
 
-  return { issueTypes, list }
+  function reset() {
+    issueTypes.value = undefined
+  }
+
+  return { issueTypes, list, reset }
 })
diff --git a/src/stores/issue.ts b/src/stores/issue.ts
index 62c6417..067df48 100644
--- a/src/stores/issue.ts
+++ b/src/stores/issue.ts
@@ -120,7 +120,14 @@ export const useIssueStore = defineStore('item', () => {
     }
   }
 
-  return { stats, dailyStats, list, calendar, getByKey, create, update, remove, getStat, getDailyStat }
+  function reset() {
+    issues.value = []
+    stats.value = undefined
+    dailyStats.value = undefined
+    error.value = null
+  }
+
+  return { stats, dailyStats, list, calendar, getByKey, create, update, remove, getStat, getDailyStat, reset }
 })
 
 /** Local YYYY-MM-DD `days` days before today */
diff --git a/src/stores/project.ts b/src/stores/project.ts
index d137de7..ffd80f7 100644
--- a/src/stores/project.ts
+++ b/src/stores/project.ts
@@ -96,6 +96,13 @@ export const useProjectStore = defineStore('project', () => {
     }
   }
 
+  /** Clears loaded data on sign-out; the stored project id is kept and re-validated on next sign-in */
+  function reset() {
+    projects.value = []
+    current.value = null
+    error.value = null
+  }
+
   async function restoreCurrent() {
     const id = readStoredProjectId()
     if (!id) return
@@ -118,5 +125,6 @@ export const useProjectStore = defineStore('project', () => {
     clearError,
     select,
     restoreCurrent,
+    reset,
   }
 })
diff --git a/src/stores/status.ts b/src/stores/status.ts
index 429d56b..1194963 100644
--- a/src/stores/status.ts
+++ b/src/stores/status.ts
@@ -9,5 +9,9 @@ export const useStatusStore = defineStore('counter', () => {
     statuses.value = await statusesList()
   }
 
-  return { statuses, list }
+  function reset() {
+    statuses.value = undefined
+  }
+
+  return { statuses, list, reset }
 })