@coopenomics/desktop 2.2.4 → 2.2.5

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.5](https://github.com/coopenomics/monocoop/compare/v2.2.4...v2.2.5) (2025-01-18)
+
+**Note:** Version bump only for package @coopenomics/desktop
+
+
+
+
+
 ## [2.2.4](https://github.com/coopenomics/monocoop/compare/v2.2.0...v2.2.4) (2025-01-17)
 
 **Note:** Version bump only for package @coopenomics/desktop

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coopenomics/desktop",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "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.4",
-    "@coopenomics/sdk": "2.2.4",
+    "@coopenomics/controller": "2.2.5",
+    "@coopenomics/sdk": "2.2.5",
     "@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.4",
+    "cooptypes": "2.2.5",
     "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": "cbfe37dbba00574ec4f1ca354ecf5a4438d72bc1"
+  "gitHead": "97b21a9d69b6c387a1a7f2c32642d29c0898694e"
 }

package/src/entities/Extension/model/types.ts

@@ -6,7 +6,7 @@ export type ISchemaType = 'string' | 'number' | 'integer' | 'boolean' | 'object'
 
 export type ISchemaProperty = {
   type?: ISchemaType;
-  description?: Types.DeserializedDescriptionOfExtension
+  description?: Types.Controller.DeserializedDescriptionOfExtension
   default?: any;
   required?: string[];
   properties?: ISchemaProperty;

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

@@ -7,7 +7,6 @@ import { IGeneratedAccount, ISendStatement } from 'src/shared/lib/types/user';
 import { useSessionStore } from 'src/entities/Session';
 import { useGlobalStore } from 'src/shared/store';
 import { COOPNAME } from 'src/shared/config';
-import { DigitalDocument } from 'src/shared/lib/document';
 import { IObjectedDocument } from 'src/shared/lib/types/document';
 import {
   ICreatedPayment,
@@ -17,7 +16,8 @@ import {
 } from 'src/entities/User';
 import { useRegistratorStore } from 'src/entities/Registrator'
 import { IEntrepreneurData, IIndividualData, IOrganizationData, IUserData } from 'src/shared/lib/types/user/IUserData';
-import { Cooperative } from 'cooptypes';
+import { client } from 'src/shared/api/client';
+import { Mutations } from '@coopenomics/sdk';
 
 export interface ICreateUser {
   email: string;
@@ -56,113 +56,124 @@ export function useCreateUser() {
 
 
   async function signStatement(): Promise<IObjectedDocument> {
-    const data: Cooperative.Registry.ParticipantApplication.Action = {
-      registry_id: Cooperative.Registry.ParticipantApplication.registry_id,
-      signature: store.signature,
-      skip_save: false,
-      coopname: COOPNAME,
-      username: store.account.username,
-      braname: store.selectedBranch,
-      links: [store.walletAgreement.hash, store.privacyAgreement.hash, store.signatureAgreement.hash, store.userAgreement.hash]
+    const variables: Mutations.Participants.GenerateParticipantApplication.IInput = {
+      data: {
+        signature: store.signature,
+        skip_save: false,
+        coopname: COOPNAME,
+        username: store.account.username,
+        braname: store.selectedBranch,
+        links: [store.walletAgreement.hash, store.privacyAgreement.hash, store.signatureAgreement.hash, store.userAgreement.hash]
+      }
     }
 
-    const document = await new DigitalDocument().generate<Cooperative.Registry.ParticipantApplication.Action>(data);
-    const globalStore = useGlobalStore();
-    const digital_signature = await globalStore.signDigest(document.hash);
+    const { [Mutations.Participants.GenerateParticipantApplication.name]: result } = await client.Mutation(
+      Mutations.Participants.GenerateParticipantApplication.mutation,
+      { variables }
+    );
 
-    store.statement = {
-      hash: document.hash,
-      meta: document.meta,
-      public_key: digital_signature.public_key,
-      signature: digital_signature.signature,
-    } as IObjectedDocument;
+    store.statement = await client.Document.signDocument(result)
 
     return store.statement;
   }
 
   async function signPrivacyAgreement(): Promise<IObjectedDocument> {
-    const data: Cooperative.Registry.PrivacyPolicy.Action= {
-      registry_id: Cooperative.Registry.PrivacyPolicy.registry_id,
-      coopname: COOPNAME,
-      username: store.account.username,
-    };
+    const variables: Mutations.Agreements.GeneratePrivacyAgreement.IInput = {
+      data: {
+        coopname: COOPNAME,
+        username: store.account.username,
+      }
+    }
 
-    const document = new DigitalDocument();
-    await document.generate(data);
-    await document.sign();
+    const { [Mutations.Agreements.GeneratePrivacyAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.GeneratePrivacyAgreement.mutation,
+      { variables }
+    );
 
-    store.privacyAgreement = document.signedDocument as IObjectedDocument;
+    store.privacyAgreement = await client.Document.signDocument(result)
 
     return store.privacyAgreement;
   }
 
   async function signSignatureAgreement(): Promise<IObjectedDocument> {
-    const data: Cooperative.Registry.RegulationElectronicSignature.Action= {
-      registry_id: Cooperative.Registry.RegulationElectronicSignature.registry_id,
-      coopname: COOPNAME,
-      username: store.account.username,
-    };
+    const variables: Mutations.Agreements.GenerateSignatureAgreement.IInput = {
+      data: {
+        coopname: COOPNAME,
+        username: store.account.username,
+      }
+    }
 
-    const document = new DigitalDocument();
-    await document.generate(data);
-    await document.sign();
+    const { [Mutations.Agreements.GenerateSignatureAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.GenerateSignatureAgreement.mutation,
+      { variables }
+    );
 
-    store.signatureAgreement = document.signedDocument as IObjectedDocument;
+    store.signatureAgreement = await client.Document.signDocument(result)
 
     return store.signatureAgreement;
+
   }
 
 
   async function signUserAgreement(): Promise<IObjectedDocument> {
-    const data: Cooperative.Registry.UserAgreement.Action= {
-      registry_id: Cooperative.Registry.UserAgreement.registry_id,
-      coopname: COOPNAME,
-      username: store.account.username,
-    };
+    const variables: Mutations.Agreements.GenerateUserAgreement.IInput = {
+      data: {
+        coopname: COOPNAME,
+        username: store.account.username,
+      }
+    }
 
-    const document = new DigitalDocument();
-    await document.generate(data);
-    await document.sign();
+    const { [Mutations.Agreements.GenerateUserAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.GenerateUserAgreement.mutation,
+      { variables }
+    );
 
-    store.userAgreement = document.signedDocument as IObjectedDocument;
+    store.userAgreement = await client.Document.signDocument(result)
 
     return store.userAgreement;
+
   }
 
 
 
 
   async function signWalletAgreement(): Promise<IObjectedDocument> {
-    const data: Cooperative.Registry.WalletAgreement.Action= {
-      registry_id: Cooperative.Registry.WalletAgreement.registry_id,
-      coopname: COOPNAME,
-      username: store.account.username,
-    };
-
-    const document = new DigitalDocument();
-    await document.generate(data);
-    await document.sign();
+    const variables: Mutations.Agreements.GenerateWalletAgreement.IInput = {
+      data: {
+        coopname: COOPNAME,
+        username: store.account.username,
+      }
+    }
 
-    store.walletAgreement = document.signedDocument as IObjectedDocument;
+    const { [Mutations.Agreements.GenerateWalletAgreement.name]: result } = await client.Mutation(
+      Mutations.Agreements.GenerateWalletAgreement.mutation,
+      { variables }
+    );
 
-    console.log('walletAgreement: ', store.walletAgreement)
+    store.walletAgreement = await client.Document.signDocument(result)
 
     return store.walletAgreement;
   }
 
 
   async function generateStatementWithoutSignature() {
+    const variables: Mutations.Participants.GenerateParticipantApplication.IInput = {
+      data: {
+        signature: '',
+        skip_save: true,
+        coopname: COOPNAME,
+        username: store.account.username,
+        braname: store.selectedBranch,
+      }
+    }
 
-    const document = await new DigitalDocument().generate<Cooperative.Registry.ParticipantApplication.Action>({
-      signature: '',
-      skip_save: true,
-      coopname: COOPNAME,
-      username: store.account.username,
-      braname: store.selectedBranch,
-      registry_id: Cooperative.Registry.ParticipantApplication.registry_id
-  });
+    const { [Mutations.Participants.GenerateParticipantApplication.name]: result } = await client.Mutation(
+      Mutations.Participants.GenerateParticipantApplication.mutation,
+      { variables }
+    );
+
+    return result;
 
-    return document;
   }
 
   async function createUser(

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

@@ -43,7 +43,7 @@ div
 <script lang="ts" setup>
 import { ref, computed, watch, onMounted } from 'vue'
 import { useCreateUser } from 'src/features/User/CreateUser'
-import { FailAlert } from 'src/shared/api';
+import { failAlert } from 'src/shared/api';
 import { Loader } from 'src/shared/ui/Loader';
 import { ReadAgreementDialog } from 'src/features/Agreementer/ReadAgreementDialog';
 import { useAgreementStore } from 'src/entities/Agreement'
@@ -70,7 +70,7 @@ const loadStatement = async (): Promise<void> => {
     isLoading.value = false
   } catch (e: any) {
     isLoading.value = false
-    FailAlert(e.message)
+    failAlert(e.message)
   }
 }
 

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

@@ -28,13 +28,14 @@
   <script lang="ts" setup>
   import { ref, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
   import { Notify } from 'quasar'
-  import { FailAlert } from 'src/shared/api'
+  import { failAlert, FailAlert } from 'src/shared/api'
   import { Loader } from 'src/shared/ui/Loader'
   import { useRegistratorStore } from 'src/entities/Registrator'
   import { useCreateUser } from 'src/features/User/CreateUser'
 
   // Импортируем класс
   import { Classes } from '@coopenomics/sdk'
+import { client } from 'src/shared/api/client'
 
   const store = useRegistratorStore()
   const createUser = useCreateUser()
@@ -124,6 +125,9 @@
       onSign.value = true
       store.state.signature = sign
 
+      // устанавливаем ключ для подписи документов
+      client.Document.setWif(store.state.account.private_key)
+
       loadingText.value = 'Подписываем положение о ЦПП "Цифровой Кошелёк"'
       await createUser.signWalletAgreement()
 
@@ -147,7 +151,7 @@
       store.next()
     } catch (err: any) {
       onSign.value = false
-      FailAlert(err.message)
+      failAlert(err)
     }
   }
   </script>

package/src/shared/api/client.ts

@@ -1,8 +1,8 @@
-import {createClient} from '@coopenomics/sdk'
+import { Client } from '@coopenomics/sdk'
 import { BACKEND_URL, CHAIN_ID, CHAIN_URL } from '../config'
 
 // Создаем и экспортируем экземпляр API-клиента
-export const client = createClient({
+export const client = Client.create({
   api_url: BACKEND_URL + '/v1/graphql',
   headers: {
     'Content-Type': 'application/json',