fix #9: updates for list mmethods

jfkz · Feb 2, 2025 · c0cc5fa · c0cc5fa
1 parent ef673c8
commit c0cc5fa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ A Node.js SDK for Tinkoff Bank's Payment API.
 ## Version difference
 
 - 0.x - old interface for Merchant provider, only CryptoPro is supported
-- 1.x - updated interface for Merchant provider, support both CryptoPro and RSA signatures for request signatures
+- 1.x and higher - updated interface for Merchant provider, support both CryptoPro and RSA signatures for request signatures
 
 ## Installation
 
@@ -102,7 +102,7 @@ ApiManagerInstance.initPayment({
 
 ## License (MIT)
 
-Copyright (c) 2020 jfkz, Slava Fomin II
+Copyright (c) 2020-2025 jfkz, Slava Fomin II
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/api-client/clients/api-client.ts b/src/api-client/clients/api-client.ts
@@ -19,7 +19,7 @@ export class ApiClient extends BaseClient {
     super(options, apiClientDefaultOptions);
   }
 
-  public async sendRequest<ResponsePayloadType extends ResponsePayload>(options: {
+  public async sendRequest<ResponsePayloadType extends object = ResponsePayload>(options: {
     request: HttpRequest;
     requestSchema: Schema;
     responseSchema: Schema;
@@ -50,7 +50,7 @@ export class ApiClient extends BaseClient {
     const { payload } = response;
 
     // Throwing error in case if request failed
-    if (payload.ErrorCode !== '0') {
+    if ((payload as ResponsePayload).ErrorCode !== '0') {
       throw new SdkError({ payload });
     }
 

diff --git a/src/api-client/clients/base-client.ts b/src/api-client/clients/base-client.ts
@@ -23,7 +23,7 @@ export abstract class BaseClient extends Loggable {
     this.options = Object.assign({}, defaultOptions, options);
   }
 
-  public abstract sendRequest<ResponsePayloadType extends BaseResponsePayload>(options: {
+  public abstract sendRequest<ResponsePayloadType extends object = BaseResponsePayload>(options: {
     request: HttpRequest;
     requestSchema: Schema;
     responseSchema: Schema;

diff --git a/src/api-client/clients/merchant-client.ts b/src/api-client/clients/merchant-client.ts
@@ -25,7 +25,7 @@ export class MerchantClient extends BaseClient {
     this.signProvider = signProvider;
   }
 
-  public async sendRequest<ResponsePayloadType extends ResponsePayload>(options: {
+  public async sendRequest<ResponsePayloadType extends object = ResponsePayload>(options: {
     request: HttpRequest;
     requestSchema: Schema;
     responseSchema: Schema;
@@ -67,7 +67,7 @@ export class MerchantClient extends BaseClient {
     const { payload } = response;
 
     // Throwing error in case if request failed
-    if (payload.ErrorCode !== '0') {
+    if ((payload as ResponsePayload).ErrorCode !== '0') {
       throw new SdkError({ payload });
     }
 

diff --git a/src/api-client/clients/safedeal-client.ts b/src/api-client/clients/safedeal-client.ts
@@ -20,7 +20,7 @@ export class SafeDealClient extends BaseClient {
     super(options, safedealMerchantClientDefaultOptions);
   }
 
-  public async sendRequest<ResponsePayloadType extends ResponsePayload>(options: {
+  public async sendRequest<ResponsePayloadType extends object = ResponsePayload>(options: {
     request: HttpRequest;
     requestSchema: Schema;
     responseSchema: Schema;
@@ -53,7 +53,7 @@ export class SafeDealClient extends BaseClient {
     const { payload } = response;
 
     // Throwing error in case if request failed
-    if (payload.ErrorCode !== '0') {
+    if ((payload as ResponsePayload).ErrorCode !== '0') {
       throw new SdkError({ payload });
     }
 

diff --git a/src/api-client/requests/get-card-list.ts b/src/api-client/requests/get-card-list.ts
@@ -4,7 +4,6 @@ import { SdkError } from '../..';
 import { HttpRequestMethod } from '../../http-client/http-client';
 import { Schema } from '../../serialization/schema';
 import { BaseClient } from '../clients/base-client';
-import { ResponsePayload as BaseResponsePayload } from '../response-payload';
 
 export enum ECardStatus {
   ACTIVE = 'A',
@@ -55,7 +54,7 @@ const getCardListRequestSchema: Schema = [];
 // RESPONSE //
 //==========//
 
-export type GetCardListResponsePayload = BaseResponsePayload & ICardInfo[];
+export type GetCardListResponsePayload = ICardInfo[];
 
 /** TODO: Add verification to ICardInfo */
 const getCardListResponseSchema: Schema = [];
@@ -97,7 +96,5 @@ export async function getCardList(options: {
   if (typeof response.payload === 'string') {
     response.payload = JSON.parse(response.payload);
   }
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error incorrect typing
   return response.payload;
 }