adata-ui 2.1.40-beta.6 → 2.1.40-beta.7

package/components/modals/id/IdConfirmAccountOtpModal.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
 import IdOtpInput from '#adata-ui/components/modals/id/IdOtpInput.vue'
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import { writeAccessTokenCookie } from '#adata-ui/composables/useAccessTokenCookie'
 
 const { $toast } = useNuxtApp()
 const { t, locale } = useI18n()
@@ -40,17 +41,11 @@ async function loginUser() {
     },
   })
   const { data: cookiesData } = await response.json()
-  if (cookiesData) {
+  if (cookiesData?.access_token) {
     const { access_token, expire_in } = cookiesData
-    const hostname = location.hostname.split('.').reverse()
     useCookie('autoLogout').value = true
 
-    useCookie('accessToken', {
-      maxAge: expire_in,
-      domain: `.${hostname[1]}.${hostname[0]}`,
-      path: '/',
-      secure: true,
-    }).value = access_token
+    await writeAccessTokenCookie(access_token, expire_in)
   }
 }
 

package/components/modals/id/IdLoginModal.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import { writeAccessTokenCookie } from '#adata-ui/composables/useAccessTokenCookie'
 import { navigateToLocalizedPage } from '#adata-ui/utils/localizedNavigation'
 import * as z from 'zod'
 import { useUrls } from '#adata-ui/composables/useUrls'
@@ -127,17 +128,11 @@ async function submit() {
           },
         })
         const { data: cookiesData } = await response.json()
-        if (cookiesData) {
+        if (cookiesData?.access_token) {
           const { access_token, expire_in } = cookiesData
-          const hostname = location.hostname.split('.').reverse()
           useCookie('autoLogout').value = true
 
-          useCookie('accessToken', {
-            maxAge: expire_in,
-            domain: COOKIE_DOMAIN,
-            path: '/',
-            secure: true,
-          }).value = access_token
+          await writeAccessTokenCookie(access_token, expire_in)
         }
         $toast.success(t('reuse.successfully'))
 

package/components/modals/id/IdModals.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import IdAutoLogoutModal from '#adata-ui/components/modals/id/IdAutoLogoutModal.vue'
 import IdConfirmAccountOtpModal from '#adata-ui/components/modals/id/IdConfirmAccountOtpModal.vue'
 import IdConfirmSuccessfulModal from '#adata-ui/components/modals/id/IdConfirmSuccessfulModal.vue'
 import IdLoginModal from '#adata-ui/components/modals/id/IdLoginModal.vue'
@@ -9,7 +9,8 @@ import IdRecoveryModal from '#adata-ui/components/modals/id/IdRecoveryModal.vue'
 import IdRegistrationModal from '#adata-ui/components/modals/id/IdRegistrationModal.vue'
 import IdResetPasswordOtpModal from '#adata-ui/components/modals/id/IdResetPasswordOtpModal.vue'
 import IdTwoFactorModal from '#adata-ui/components/modals/id/IdTwoFactorModal.vue'
-import IdAutoLogoutModal from '#adata-ui/components/modals/id/IdAutoLogoutModal.vue'
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import { writeAccessTokenCookie } from '#adata-ui/composables/useAccessTokenCookie'
 
 const emit = defineEmits<{
   (e: 'closed', value: boolean): void
@@ -35,6 +36,10 @@ const authApiURL = commonAuth.authApiURL
 const accessToken = useCookie('accessToken')
 const isAuthenticated = computed(() => !!accessToken.value)
 
+// one-shot флаг: обмен по auth-сессии перезагружает страницу максимум один раз,
+// иначе нечитаемая кука accessToken зацикливает reload
+const AUTH_RELOAD_FLAG = 'auth-exchange-reloaded'
+
 onMounted(async () => {
   const response = await fetch(`${removeTrailingSlash(authApiURL)}/access/cookie`, {
     method: 'GET',
@@ -46,17 +51,25 @@ onMounted(async () => {
   const { data: cookiesData } = await response.json()
   if (cookiesData?.access_token && !accessToken.value) {
     const { access_token, expire_in } = cookiesData
-    const hostname = location.hostname.split('.').reverse()
     useCookie('autoLogout').value = true
 
-    useCookie('accessToken', {
-      maxAge: expire_in,
-      domain: `.${hostname[1]}.${hostname[0]}`,
-      path: '/',
-      secure: true,
-    }).value = access_token
+    const persisted = await writeAccessTokenCookie(access_token, expire_in)
 
-    window.location.reload()
+    if (persisted && !sessionStorage.getItem(AUTH_RELOAD_FLAG)) {
+      sessionStorage.setItem(AUTH_RELOAD_FLAG, '1')
+      window.location.reload()
+    }
+    else {
+      sessionStorage.removeItem(AUTH_RELOAD_FLAG)
+      console.warn(
+        persisted
+          ? '[auth] accessToken cookie is erased between page loads (SSR resetTokens?), reload skipped to avoid a loop'
+          : '[auth] accessToken cookie was not persisted (domain/secure/maxAge rejected by browser), reload skipped',
+      )
+    }
+  }
+  else {
+    sessionStorage.removeItem(AUTH_RELOAD_FLAG)
   }
 })
 

package/components/modals/id/IdTwoFactorModal.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
 import IdOtpInput from '#adata-ui/components/modals/id/IdOtpInput.vue'
+import { removeTrailingSlash } from '#adata-ui/components/utils/removeTrailingSlash'
+import { writeAccessTokenCookie } from '#adata-ui/composables/useAccessTokenCookie'
 import { useUrls } from '#adata-ui/composables/useUrls'
 
 const { $toast } = useNuxtApp()
@@ -54,15 +55,9 @@ async function onConfirm() {
     const { data: cookiesData } = await response.json()
     if (cookiesData?.access_token) {
       const { access_token, expire_in } = cookiesData
-      const hostname = location.hostname.split('.').reverse()
       useCookie('autoLogout').value = true
 
-      useCookie('accessToken', {
-        maxAge: expire_in,
-        domain: `.${hostname[1]}.${hostname[0]}`,
-        path: '/',
-        secure: true,
-      }).value = access_token
+      await writeAccessTokenCookie(access_token, expire_in)
     }
     $toast.success(t('login.successfully'))
     twoFactorModal.value = false

package/composables/useAccessTokenCookie.ts

@@ -0,0 +1,25 @@
+import { useUrls } from '#adata-ui/composables/useUrls'
+
+/**
+ * Единая точка записи куки accessToken (логин, 2FA, OTP, обмен по auth-сессии).
+ * Домен должен совпадать с доменом удаления в resetTokens (adata-common-auth),
+ * иначе кука не находится на следующей загрузке и логин-флоу зацикливается на reload.
+ */
+export async function writeAccessTokenCookie(accessToken: string, expireIn?: number): Promise<boolean> {
+  const { mode } = useUrls()
+  const sharedDomain = `${mode}.kz`
+  const onSharedDomain = location.hostname === sharedDomain || location.hostname.endsWith(`.${sharedDomain}`)
+  const maxAge = Number(expireIn) > 0 ? Number(expireIn) : undefined
+
+  useCookie('accessToken', {
+    maxAge,
+    // на localhost/превью-хостах атрибут domain невалиден — пишем host-only куку
+    domain: onSharedDomain ? `.${sharedDomain}` : undefined,
+    path: '/',
+    secure: location.protocol === 'https:',
+  }).value = accessToken
+
+  // useCookie пишет document.cookie на следующем flush, не синхронно
+  await nextTick()
+  return document.cookie.split('; ').some(part => part.startsWith('accessToken='))
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.1.40-beta.6",
+  "version": "2.1.40-beta.7",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",