squarefi-bff-api-module 1.24.34 → 1.24.35

package/dist/api/types/autogen/apiV2.types.d.ts

@@ -1237,8 +1237,6 @@ export interface components {
         TransactionsFilter: {
             created_at?: string;
             /** @enum {string} */
-            status?: "complete" | "pending" | "canceled" | "failed" | "processing" | "new";
-            /** @enum {string} */
             type?: "deposit_crypto" | "withdrawal_crypto" | "deposit_fiat" | "withdrawal_fiat" | "deposit_vcard" | "withdrawal_vcard" | "deposit" | "withdrawal";
             /** @enum {string|null} */
             method?: "p2p" | "crypto" | "bank_transfer" | "exchange" | "sbp" | "internal_fiat" | null;
@@ -1255,6 +1253,7 @@ export interface components {
             to_created_at?: string;
             /** @default false */
             show_low_balance: boolean;
+            status?: ("complete" | "pending" | "canceled" | "failed" | "processing" | "new")[];
         };
         ChainDto: {
             id: number;
@@ -2984,7 +2983,9 @@ export interface operations {
     };
     WalletsTransactionsController_export: {
         parameters: {
-            query?: never;
+            query?: {
+                status?: ("complete" | "pending" | "canceled" | "failed" | "processing" | "new")[];
+            };
             header?: never;
             path: {
                 wallet_id: string;

package/dist/api/types/types.d.ts

@@ -668,136 +668,6 @@ export declare namespace API {
             }
         }
     }
-    namespace SubAccountsV2 {
-        type SubAccountDetails = {
-            iban: string;
-            bank_name: string;
-            swift_code: string;
-            bank_address: string;
-            receiver_name: string;
-            payment_details: string;
-            reference_number: string;
-            registration_number: string;
-        };
-        interface SubAccount {
-            balance: number;
-            cards_count: number;
-            created_at: string;
-            currency: API.Currencies.FiatCurrency;
-            fiat_balance: number;
-            id: string;
-            issuing_program: API.Cards.Config.Program;
-            nick_name: string;
-            program_id: string;
-            realtimeauth_balance: number;
-            status: string;
-            total_balance: number;
-            wallet_id: string;
-        }
-        namespace ExtendedSubAccount {
-            interface ExtendedSubAccount extends SubAccount {
-                account_details?: SubAccountDetails;
-                payment_types: Array<{
-                    order_type: OrderType;
-                }>;
-                realtime_auth: [
-                    {
-                        crypto_token: string;
-                        fiat_account: string;
-                        id: string;
-                        priority: number;
-                    }
-                ];
-            }
-            interface Request {
-                wallet_uuid: string;
-                fiat_account_id: string;
-            }
-            type Response = ExtendedSubAccount;
-        }
-        interface SubAccountWithCards extends SubAccount {
-            cards: API.Cards.IssuingCardListItem[];
-        }
-        interface SubAccountsList<T extends SubAccount | SubAccountWithCards> {
-            count: number;
-            data: T[];
-        }
-        type SubAccountsListWithCards = SubAccountsList<SubAccountWithCards>;
-        type SubAccountsListWithoutCards = SubAccountsList<SubAccount>;
-        namespace CreateSubAccount {
-            interface Request {
-                wallet_id: string;
-                program_id: string;
-            }
-            type Response = {
-                id: string;
-                balance: number;
-                nick_name: string;
-                wallet_id: string;
-                created_at: string;
-                account_currency: string;
-                type: SubAccountType | string;
-                program_id: string;
-                status: 'ACTIVE';
-                fiat: {
-                    code: string;
-                    uuid: string;
-                    symbol: string;
-                    enabled: boolean;
-                    coingecko: string;
-                };
-                issuing_program: {
-                    id: string;
-                    form_factor: CardFormFactor | string;
-                    brand: string;
-                    tokenizable: boolean;
-                    type: CardType | string;
-                };
-            };
-        }
-        namespace Transactions {
-            type Transaction = {
-                vendor_transaction_id: string;
-                created_at: string;
-                cleared_at: string;
-                merchant: {
-                    name: string;
-                    category_code: string;
-                    city: string;
-                    country: string;
-                };
-                last4: string;
-                title: string;
-                billing_amount: number;
-                billing_currency: string;
-                transaction_amount: number;
-                transaction_currency: string;
-                vendor_sub_account_id: string;
-                failure_reason: string;
-                status: string;
-                transaction_type: string;
-                is_credit: boolean;
-                has_receipt: boolean;
-                adjustment_type: string;
-                review_status: string;
-                group: string;
-                total_amount: number;
-            };
-            namespace TransactionList {
-                interface Request {
-                    fiat_account_id: string;
-                    wallet_uuid: string;
-                    limit?: number;
-                    offset?: number;
-                }
-                interface Response {
-                    count: number;
-                    data: Transaction[];
-                    has_more: boolean;
-                }
-            }
-        }
-    }
     namespace Issuing {
         namespace Programs {
             type Request = {
@@ -2419,7 +2289,7 @@ export declare namespace API {
                     offset: number;
                     filter?: {
                         created_at?: string;
-                        status?: WalletTransactionStatus;
+                        status?: WalletTransactionStatus[];
                         type?: WalletTransactionType;
                         method?: WalletTransactionMethod;
                         record_type?: WalletTransactionRecordType;
@@ -2435,6 +2305,15 @@ export declare namespace API {
                     total: number;
                     data: Transaction[];
                 };
+                namespace ExportCsv {
+                    type Request = {
+                        wallet_uuid: string;
+                        status?: WalletTransactionStatus[];
+                        from_created_at?: string;
+                        to_created_at?: string;
+                    };
+                    type Response = string;
+                }
             }
         }
     }

package/dist/api/wallets.d.ts

@@ -18,7 +18,7 @@ export declare const wallets: {
             getByUuid: ({ wallet_uuid, uuid, }: API.Wallets.WalletTransactions.GetByUuid.Request) => Promise<API.Wallets.WalletTransactions.DetailedTransaction>;
         };
         csv: {
-            getByWalletUuid: (wallet_uuid: string) => Promise<string>;
+            getByWalletUuid: ({ wallet_uuid, ...params }: API.Wallets.WalletTransactions.TransactionList.ExportCsv.Request) => Promise<API.Wallets.WalletTransactions.TransactionList.ExportCsv.Response>;
         };
     };
 };

package/dist/api/wallets.js

@@ -47,7 +47,10 @@ exports.wallets = {
             getByUuid: ({ wallet_uuid, uuid, }) => apiClientFactory_1.apiClientV2.getRequest(`/wallets/${wallet_uuid}/transactions/${uuid}`),
         },
         csv: {
-            getByWalletUuid: (wallet_uuid) => apiClientFactory_1.apiClientV1.getRequest(`/wallets/transactions/${wallet_uuid}/csv`),
+            getByWalletUuid: (_a) => {
+                var { wallet_uuid } = _a, params = __rest(_a, ["wallet_uuid"]);
+                return apiClientFactory_1.apiClientV2.getRequest(`/wallets/${wallet_uuid}/transactions/export/csv`, { params });
+            },
         },
     },
 };

package/dist/utils/encrypt.js

@@ -27,10 +27,56 @@ const decryptAESData = (encryptedData, iv, secretKey) => __awaiter(void 0, void
     return JSON.parse(decrypted);
 });
 exports.decryptAESData = decryptAESData;
+/**
+ * Очищает и валидирует публичный RSA ключ
+ * Исправляет ошибку InvalidAsn1Error: encoding too long
+ * путем удаления лишних символов и нормализации переносов строк
+ */
+const cleanAndValidatePublicKey = (publicKey) => {
+    try {
+        // Декодируем base64 ключ
+        const publicKeyBase64 = Buffer.from(publicKey, 'base64').toString('utf8');
+        // Удаляем лишние символы (переносы строк, пробелы в начале и конце)
+        // Нормализуем переносы строк для корректной обработки ASN.1
+        const cleanedKey = publicKeyBase64.trim().replace(/\r?\n|\r/g, '\n');
+        // Проверяем, что ключ содержит необходимые маркеры
+        if (!cleanedKey.includes('BEGIN') || !cleanedKey.includes('END')) {
+            throw new Error('Invalid public key format: missing BEGIN/END markers');
+        }
+        return cleanedKey;
+    }
+    catch (error) {
+        throw new Error(`Invalid public key format: ${error instanceof Error ? error.message : 'Unknown error'}`);
+    }
+};
+/**
+ * Автоматически определяет формат RSA ключа по заголовку
+ * Помогает избежать ошибок импорта при неправильном указании формата
+ */
+const detectKeyFormat = (key) => {
+    if (key.includes('BEGIN RSA PUBLIC KEY')) {
+        return 'pkcs1';
+    }
+    else if (key.includes('BEGIN PUBLIC KEY')) {
+        return 'pkcs8';
+    }
+    // По умолчанию возвращаем pkcs8, как было ранее
+    return 'pkcs8';
+};
 const makeSecureRequest = (_a) => __awaiter(void 0, [_a], void 0, function* ({ callback, publicKey }) {
     const clientRsa = new node_rsa_1.default();
-    const publicKeyBase64 = Buffer.from(publicKey, 'base64').toString('utf8');
-    clientRsa.importKey(publicKeyBase64, 'pkcs8-public-pem');
+    try {
+        // Очищаем и валидируем публичный ключ
+        const cleanedPublicKey = cleanAndValidatePublicKey(publicKey);
+        // Определяем формат ключа автоматически
+        const keyFormat = detectKeyFormat(cleanedPublicKey);
+        // Импортируем ключ с правильным форматом
+        clientRsa.importKey(cleanedPublicKey, `${keyFormat}-public-pem`);
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+        throw new Error(`Failed to import RSA public key: ${errorMessage}`);
+    }
     const clientSecretKey = (0, exports.generateSecretKey)();
     const clientPayload = {
         key: clientSecretKey.toString('base64'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squarefi-bff-api-module",
-  "version": "1.24.34",
+  "version": "1.24.35",
   "description": "Squarefi BFF API client module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/api/types/autogen/apiV2.types.ts

@@ -1238,8 +1238,6 @@ export interface components {
         TransactionsFilter: {
             created_at?: string;
             /** @enum {string} */
-            status?: "complete" | "pending" | "canceled" | "failed" | "processing" | "new";
-            /** @enum {string} */
             type?: "deposit_crypto" | "withdrawal_crypto" | "deposit_fiat" | "withdrawal_fiat" | "deposit_vcard" | "withdrawal_vcard" | "deposit" | "withdrawal";
             /** @enum {string|null} */
             method?: "p2p" | "crypto" | "bank_transfer" | "exchange" | "sbp" | "internal_fiat" | null;
@@ -1256,6 +1254,7 @@ export interface components {
             to_created_at?: string;
             /** @default false */
             show_low_balance: boolean;
+            status?: ("complete" | "pending" | "canceled" | "failed" | "processing" | "new")[];
         };
         ChainDto: {
             id: number;
@@ -2985,7 +2984,9 @@ export interface operations {
     };
     WalletsTransactionsController_export: {
         parameters: {
-            query?: never;
+            query?: {
+                status?: ("complete" | "pending" | "canceled" | "failed" | "processing" | "new")[];
+            };
             header?: never;
             path: {
                 wallet_id: string;

package/src/api/types/types.ts

@@ -819,144 +819,144 @@ export namespace API {
     }
   }
 
-  export namespace SubAccountsV2 {
-    export type SubAccountDetails = {
-      iban: string;
-      bank_name: string;
-      swift_code: string;
-      bank_address: string;
-      receiver_name: string;
-      payment_details: string;
-      reference_number: string;
-      registration_number: string;
-    };
-
-    export interface SubAccount {
-      balance: number;
-      cards_count: number;
-      created_at: string;
-      currency: API.Currencies.FiatCurrency;
-      fiat_balance: number;
-      id: string;
-      issuing_program: API.Cards.Config.Program;
-      nick_name: string;
-      program_id: string;
-      realtimeauth_balance: number;
-      status: string;
-      total_balance: number;
-      wallet_id: string;
-    }
-
-    export namespace ExtendedSubAccount {
-      export interface ExtendedSubAccount extends SubAccount {
-        account_details?: SubAccountDetails;
-        payment_types: Array<{ order_type: OrderType }>;
-        realtime_auth: [
-          {
-            crypto_token: string;
-            fiat_account: string;
-            id: string;
-            priority: number;
-          }
-        ];
-      }
-      export interface Request {
-        wallet_uuid: string;
-        fiat_account_id: string;
-      }
-
-      export type Response = ExtendedSubAccount;
-    }
-
-    export interface SubAccountWithCards extends SubAccount {
-      cards: API.Cards.IssuingCardListItem[];
-    }
-
-    export interface SubAccountsList<T extends SubAccount | SubAccountWithCards> {
-      count: number;
-      data: T[];
-    }
-
-    export type SubAccountsListWithCards = SubAccountsList<SubAccountWithCards>;
-    export type SubAccountsListWithoutCards = SubAccountsList<SubAccount>;
-
-    export namespace CreateSubAccount {
-      export interface Request {
-        wallet_id: string;
-        program_id: string;
-      }
-      export type Response = {
-        id: string;
-        balance: number;
-        nick_name: string;
-        wallet_id: string;
-        created_at: string;
-        account_currency: string;
-        type: SubAccountType | string;
-        program_id: string;
-        status: 'ACTIVE';
-        fiat: {
-          code: string;
-          uuid: string;
-          symbol: string;
-          enabled: boolean;
-          coingecko: string;
-        };
-        issuing_program: {
-          id: string;
-          form_factor: CardFormFactor | string;
-          brand: string;
-          tokenizable: boolean;
-          type: CardType | string;
-        };
-      };
-    }
-
-    export namespace Transactions {
-      // export type Transaction = API.Cards.TransactionItem;
-      export type Transaction = {
-        vendor_transaction_id: string;
-        created_at: string;
-        cleared_at: string;
-        merchant: {
-          name: string;
-          category_code: string;
-          city: string;
-          country: string;
-        };
-        last4: string;
-        title: string;
-        billing_amount: number;
-        billing_currency: string;
-        transaction_amount: number;
-        transaction_currency: string;
-        vendor_sub_account_id: string;
-        failure_reason: string;
-        status: string;
-        transaction_type: string;
-        is_credit: boolean;
-        has_receipt: boolean;
-        adjustment_type: string;
-        review_status: string;
-        group: string;
-        total_amount: number;
-      };
-
-      export namespace TransactionList {
-        export interface Request {
-          fiat_account_id: string;
-          wallet_uuid: string;
-          limit?: number;
-          offset?: number;
-        }
-        export interface Response {
-          count: number;
-          data: Transaction[];
-          has_more: boolean;
-        }
-      }
-    }
-  }
+  // export namespace SubAccountsV2 {
+  //   export type SubAccountDetails = {
+  //     iban: string;
+  //     bank_name: string;
+  //     swift_code: string;
+  //     bank_address: string;
+  //     receiver_name: string;
+  //     payment_details: string;
+  //     reference_number: string;
+  //     registration_number: string;
+  //   };
+
+  //   export interface SubAccount {
+  //     balance: number;
+  //     cards_count: number;
+  //     created_at: string;
+  //     currency: API.Currencies.FiatCurrency;
+  //     fiat_balance: number;
+  //     id: string;
+  //     issuing_program: API.Cards.Config.Program;
+  //     nick_name: string;
+  //     program_id: string;
+  //     realtimeauth_balance: number;
+  //     status: string;
+  //     total_balance: number;
+  //     wallet_id: string;
+  //   }
+
+  //   export namespace ExtendedSubAccount {
+  //     export interface ExtendedSubAccount extends SubAccount {
+  //       account_details?: SubAccountDetails;
+  //       payment_types: Array<{ order_type: OrderType }>;
+  //       realtime_auth: [
+  //         {
+  //           crypto_token: string;
+  //           fiat_account: string;
+  //           id: string;
+  //           priority: number;
+  //         }
+  //       ];
+  //     }
+  //     export interface Request {
+  //       wallet_uuid: string;
+  //       fiat_account_id: string;
+  //     }
+
+  //     export type Response = ExtendedSubAccount;
+  //   }
+
+  //   export interface SubAccountWithCards extends SubAccount {
+  //     cards: API.Cards.IssuingCardListItem[];
+  //   }
+
+  //   export interface SubAccountsList<T extends SubAccount | SubAccountWithCards> {
+  //     count: number;
+  //     data: T[];
+  //   }
+
+  //   export type SubAccountsListWithCards = SubAccountsList<SubAccountWithCards>;
+  //   export type SubAccountsListWithoutCards = SubAccountsList<SubAccount>;
+
+  //   export namespace CreateSubAccount {
+  //     export interface Request {
+  //       wallet_id: string;
+  //       program_id: string;
+  //     }
+  //     export type Response = {
+  //       id: string;
+  //       balance: number;
+  //       nick_name: string;
+  //       wallet_id: string;
+  //       created_at: string;
+  //       account_currency: string;
+  //       type: SubAccountType | string;
+  //       program_id: string;
+  //       status: 'ACTIVE';
+  //       fiat: {
+  //         code: string;
+  //         uuid: string;
+  //         symbol: string;
+  //         enabled: boolean;
+  //         coingecko: string;
+  //       };
+  //       issuing_program: {
+  //         id: string;
+  //         form_factor: CardFormFactor | string;
+  //         brand: string;
+  //         tokenizable: boolean;
+  //         type: CardType | string;
+  //       };
+  //     };
+  //   }
+
+  //   export namespace Transactions {
+  //     // export type Transaction = API.Cards.TransactionItem;
+  //     export type Transaction = {
+  //       vendor_transaction_id: string;
+  //       created_at: string;
+  //       cleared_at: string;
+  //       merchant: {
+  //         name: string;
+  //         category_code: string;
+  //         city: string;
+  //         country: string;
+  //       };
+  //       last4: string;
+  //       title: string;
+  //       billing_amount: number;
+  //       billing_currency: string;
+  //       transaction_amount: number;
+  //       transaction_currency: string;
+  //       vendor_sub_account_id: string;
+  //       failure_reason: string;
+  //       status: string;
+  //       transaction_type: string;
+  //       is_credit: boolean;
+  //       has_receipt: boolean;
+  //       adjustment_type: string;
+  //       review_status: string;
+  //       group: string;
+  //       total_amount: number;
+  //     };
+
+  //     export namespace TransactionList {
+  //       export interface Request {
+  //         fiat_account_id: string;
+  //         wallet_uuid: string;
+  //         limit?: number;
+  //         offset?: number;
+  //       }
+  //       export interface Response {
+  //         count: number;
+  //         data: Transaction[];
+  //         has_more: boolean;
+  //       }
+  //     }
+  //   }
+  // }
 
   export namespace Issuing {
     export namespace Programs {
@@ -2824,7 +2824,7 @@ export namespace API {
           offset: number;
           filter?: {
             created_at?: string;
-            status?: WalletTransactionStatus;
+            status?: WalletTransactionStatus[];
             type?: WalletTransactionType;
             method?: WalletTransactionMethod;
             record_type?: WalletTransactionRecordType;
@@ -2840,6 +2840,16 @@ export namespace API {
           total: number;
           data: Transaction[];
         };
+
+        export namespace ExportCsv {
+          export type Request = {
+            wallet_uuid: string;
+            status?: WalletTransactionStatus[];
+            from_created_at?: string;
+            to_created_at?: string;
+          };
+          export type Response = string;
+        }
       }
     }
   }

package/src/api/wallets.ts

@@ -1,6 +1,6 @@
 import { API } from './types/types';
 
-import { apiClientV1, apiClientV2 } from '../utils/apiClientFactory';
+import { apiClientV2 } from '../utils/apiClientFactory';
 
 import { defaultPaginationParams, WalletTypeValues } from '../constants';
 
@@ -52,8 +52,14 @@ export const wallets = {
         ),
     },
     csv: {
-      getByWalletUuid: (wallet_uuid: string): Promise<string> =>
-        apiClientV1.getRequest<string>(`/wallets/transactions/${wallet_uuid}/csv`),
+      getByWalletUuid: ({
+        wallet_uuid,
+        ...params
+      }: API.Wallets.WalletTransactions.TransactionList.ExportCsv.Request): Promise<API.Wallets.WalletTransactions.TransactionList.ExportCsv.Response> =>
+        apiClientV2.getRequest<API.Wallets.WalletTransactions.TransactionList.ExportCsv.Response>(
+          `/wallets/${wallet_uuid}/transactions/export/csv`,
+          { params }
+        ),
     },
   },
 };

package/src/utils/encrypt.ts

@@ -20,11 +20,61 @@ export const decryptAESData = async (encryptedData: string, iv: string, secretKe
   return JSON.parse(decrypted);
 };
 
+/**
+ * Очищает и валидирует публичный RSA ключ
+ * Исправляет ошибку InvalidAsn1Error: encoding too long
+ * путем удаления лишних символов и нормализации переносов строк
+ */
+const cleanAndValidatePublicKey = (publicKey: string): string => {
+  try {
+    // Декодируем base64 ключ
+    const publicKeyBase64 = Buffer.from(publicKey, 'base64').toString('utf8');
+
+    // Удаляем лишние символы (переносы строк, пробелы в начале и конце)
+    // Нормализуем переносы строк для корректной обработки ASN.1
+    const cleanedKey = publicKeyBase64.trim().replace(/\r?\n|\r/g, '\n');
+
+    // Проверяем, что ключ содержит необходимые маркеры
+    if (!cleanedKey.includes('BEGIN') || !cleanedKey.includes('END')) {
+      throw new Error('Invalid public key format: missing BEGIN/END markers');
+    }
+
+    return cleanedKey;
+  } catch (error) {
+    throw new Error(`Invalid public key format: ${error instanceof Error ? error.message : 'Unknown error'}`);
+  }
+};
+
+/**
+ * Автоматически определяет формат RSA ключа по заголовку
+ * Помогает избежать ошибок импорта при неправильном указании формата
+ */
+const detectKeyFormat = (key: string): 'pkcs1' | 'pkcs8' => {
+  if (key.includes('BEGIN RSA PUBLIC KEY')) {
+    return 'pkcs1';
+  } else if (key.includes('BEGIN PUBLIC KEY')) {
+    return 'pkcs8';
+  }
+  // По умолчанию возвращаем pkcs8, как было ранее
+  return 'pkcs8';
+};
+
 export const makeSecureRequest = async <T>({ callback, publicKey }: MakeSecureRequestParams): Promise<T> => {
   const clientRsa = new NodeRSA();
 
-  const publicKeyBase64 = Buffer.from(publicKey, 'base64').toString('utf8');
-  clientRsa.importKey(publicKeyBase64, 'pkcs8-public-pem');
+  try {
+    // Очищаем и валидируем публичный ключ
+    const cleanedPublicKey = cleanAndValidatePublicKey(publicKey);
+
+    // Определяем формат ключа автоматически
+    const keyFormat = detectKeyFormat(cleanedPublicKey);
+
+    // Импортируем ключ с правильным форматом
+    clientRsa.importKey(cleanedPublicKey, `${keyFormat}-public-pem`);
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+    throw new Error(`Failed to import RSA public key: ${errorMessage}`);
+  }
 
   const clientSecretKey = generateSecretKey();
   const clientPayload = {