@coopenomics/desktop 2.2.2 → 2.2.3

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.3](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.3) (2025-01-16)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.1](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.1) (2025-01-14)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "A Desktop Project",
   "productName": "Desktop App",
   "author": "Alex Ant <dacom.dark.sun@gmail.com>",
@@ -20,8 +20,8 @@
     "prepublishOnly": "npm run build:lib"
   },
   "dependencies": {
-    "@coopenomics/controller": "2.2.2",
-    "@coopenomics/sdk": "2.2.2",
+    "@coopenomics/controller": "2.2.3",
+    "@coopenomics/sdk": "2.2.3",
     "@dicebear/collection": "^9.0.1",
     "@dicebear/core": "^9.0.1",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -45,7 +45,7 @@
     "@wharfkit/wallet-plugin-privatekey": "^1.1.0",
     "axios": "^1.2.1",
     "compression": "^1.7.4",
-    "cooptypes": "^2.2.2",
+    "cooptypes": "^2.2.3",
     "dompurify": "^3.1.7",
     "dotenv": "^16.4.5",
     "email-regex": "^5.0.0",
@@ -94,5 +94,5 @@
     "npm": ">= 6.13.4",
     "yarn": ">= 1.21.1"
   },
-  "gitHead": "88352202b02fd190abd2c892290cb668ba137cb8"
+  "gitHead": "40fb5c80eb4136e82813fd553703f4a7926166a0"
 }

package/src/features/User/LoginUser/model/index.ts

@@ -5,6 +5,7 @@ import {client} from 'src/shared/api/client'
 import { useCurrentUserStore } from 'src/entities/User'
 import { useSystemStore } from 'src/entities/System/model'
 import { useRegistratorStore } from 'src/entities/Registrator'
+import type { ITokens } from 'src/shared/lib/types/user'
 
 export function useLoginUser() {
   const globalStore = useGlobalStore()
@@ -12,10 +13,23 @@ export function useLoginUser() {
   const system = useSystemStore()
 
   async function login(email: string, wif: string): Promise<void> {
-    const auth = await api.loginUser(email, wif)
+    const auth = await api.loginUser(email, wif);
+    const { tokens, account } = await client.login(email, wif);
 
-    await globalStore.setWif(auth.user.username, wif)
-    await globalStore.setTokens(auth.tokens)
+    // Создаём объект tokens с правильными типами
+    const adaptedTokens: ITokens = {
+      access: {
+        token: tokens.access.token,
+        expires: new Date(tokens.access.expires as string),
+      },
+      refresh: {
+        token: tokens.refresh.token,
+        expires: new Date(tokens.refresh.expires as string),
+      },
+    };
+
+    await globalStore.setWif(account.username, wif);
+    await globalStore.setTokens(adaptedTokens);
 
     const session = useSessionStore()
     await session.init()

package/src/pages/Registrator/SignUp/GenerateAccount.vue

@@ -34,6 +34,8 @@ import { ref, computed } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
 import { Notify, copyToClipboard } from 'quasar'
 import { useRegistratorStore } from 'src/entities/Registrator'
+import { Classes } from '@coopenomics/sdk'
+
 const store = useRegistratorStore()
 
 import { FailAlert } from 'src/shared/api'
@@ -43,7 +45,7 @@ const i_save = ref(false)
 const account = ref(store.state.account)
 
 if (!account.value.private_key || !account.value.public_key || !account.value.username)
-  account.value = api.generateAccount()
+  account.value = new Classes.Account()
 
 const email = computed(() => store.state.email)
 const userData = computed(() => store.state.userData)