adata-ui 2.1.10 → 2.1.12

package/components/modals/id/AuthModal.vue

@@ -42,6 +42,10 @@ function goRegister() {
     registrationModal.value = true
   }
 }
+const close = () => {
+  isOpen.value = false
+  emit('close')
+}
 </script>
 
 <template>
@@ -63,7 +67,7 @@ function goRegister() {
         <a-button
           view="outline"
           block
-          @click="emit('close')"
+          @click="close"
         >
           {{ t('modals.buttons.close') }}
         </a-button>

package/components/modals/id/IdLoginModal.vue

@@ -10,6 +10,11 @@ const { t, locale } = useI18n()
 const { pk, landing } = useUrls()
 const route = useRoute()
 
+const { myLayer } = useAppConfig()
+const mode = myLayer.mode
+
+const COOKIE_DOMAIN = `.${mode}.kz`
+
 const regex = /^\/counterparty\/main\/company\/\d+\/basic-info$/;
 
 const { loginModal, registrationModal, recoveryModal, confirmAccountOtpModal, twoFactorModal, intermediateState } = useIdModals()
@@ -42,20 +47,23 @@ function getError(path: string) {
 function savePassAndLogin(form: { username: string, password: string }) {
   const { username, password } = form
   const cookieOptions = {
+    domain: COOKIE_DOMAIN,
     expires: rememberMe.value ? new Date(Date.now() + 14 * 24 * 60 * 60 * 1000) : undefined, // Срок действия 14 дней
   }
   useCookie('username', cookieOptions).value = username
   useCookie('password', cookieOptions).value = password
 }
 function clearAuthCookie() {
-  useCookie('username').value = null
-  useCookie('password').value = null
+  const options = { domain: COOKIE_DOMAIN }
+
+  useCookie('username', options).value = null
+  useCookie('password', options).value = null
 }
 
 const loading = ref(false)
 const form: ILoginForm = reactive({
-  username: useCookie('username').value || '',
-  password: useCookie('password').value || '',
+  username: useCookie('username', { domain: COOKIE_DOMAIN }).value || '',
+  password: useCookie('password', { domain: COOKIE_DOMAIN }).value || '',
 })
 const rememberMe = ref(false)
 
@@ -126,7 +134,7 @@ async function submit() {
 
           useCookie('accessToken', {
             maxAge: expire_in,
-            domain: `.${hostname[1]}.${hostname[0]}`,
+            domain: COOKIE_DOMAIN,
             path: '/',
             secure: true,
           }).value = access_token
@@ -187,7 +195,9 @@ function toTariffs() {
 }
 
 onMounted(() => {
-  rememberMe.value = !!useCookie('username').value && !!useCookie('password').value
+  const options = { domain: COOKIE_DOMAIN }
+
+  rememberMe.value = !!useCookie('username', options).value && !!useCookie('password', options).value
 })
 
 function handleEnter(e: KeyboardEvent) {

package/package.json

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