fix(payments): card linking error

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {

src/billing/cloudpayments.ts

@@ -46,7 +46,7 @@
 import { ComposePaymentPayload } from './types/composePaymentPayload';
 
 interface ComposePaymentRequest extends express.Request {
   query: ComposePaymentPayload & { [key: string]: any };
   context: import('../types/graphql').ResolverContextBase;
 };
 
@@ -173,7 +173,7 @@
     });
   }
 
   /**
    * Returns true if workspace's plan is expired
    * @param workspace - workspace to check
    */
@@ -193,7 +193,7 @@
     return isPlanExpired;
   }
 
   /**
    * Generates invoice id for payment
    *
    * @param tariffPlan - tariff plan to generate invoice id
@@ -267,8 +267,7 @@
     let member: ConfirmedMemberDBScheme;
     let plan: PlanDBScheme;
 
-
-    if (!data.isCardLinkOperation && (!data.userId || !data.workspaceId || !data.tariffPlanId)) {
+    if (!data.userId || !data.workspaceId || !data.tariffPlanId) {
       this.sendError(res, CheckCodes.PAYMENT_COULD_NOT_BE_ACCEPTED, '[Billing / Check] There is no necessary data in the request', body);
 
       return;
@@ -334,7 +333,7 @@
     telegram.sendMessage(`✅ [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
       .catch(e => console.error('Error while sending message to Telegram: ' + e));
 
     HawkCatcher.send(new Error('[Billing / Check] All checks passed successfully'), body as any);
 
     res.json({
       code: CheckCodes.SUCCESS,
@@ -362,7 +361,13 @@
       return;
     }
 
-    if (!data.workspaceId || !data.tariffPlanId || !data.userId) {
+    if (data.isCardLinkOperation && (!data.userId || !data.workspaceId)) {
+      this.sendError(res, PayCodes.SUCCESS, '[Billing / Pay] No workspace or user id in request body', req.body);
+
+      return;
+    }
+
+    if (!data.isCardLinkOperation && (!data.workspaceId || !data.tariffPlanId || !data.userId)) {
       this.sendError(res, PayCodes.SUCCESS, `[Billing / Pay] No workspace, tariff plan or user id in request body`, body);
 
       return;
@@ -372,12 +377,15 @@
     let workspace;
     let tariffPlan;
     let user;
+    let planId;
 
     try {
       businessOperation = await this.getBusinessOperation(req, body.TransactionId.toString());
       workspace = await this.getWorkspace(req, data.workspaceId);
-      tariffPlan = await this.getPlan(req, data.tariffPlanId);
       user = await this.getUser(req, data.userId);
+      planId = data.isCardLinkOperation ? workspace.tariffPlanId.toString() : data.tariffPlanId;
+
+      tariffPlan = await this.getPlan(req, planId);
     } catch (e) {
       const error = e as Error;
 
@@ -475,7 +483,7 @@
         type: SenderWorkerTaskType.PaymentSuccess,
         payload: {
           workspaceId: data.workspaceId,
-          tariffPlanId: data.tariffPlanId,
+          tariffPlanId: planId,
           userId: data.userId,
         },
       };
@@ -612,7 +620,7 @@
 
     this.handleSendingToTelegramError(telegram.sendMessage(`✅ [Billing / Fail] Transaction failed for «${workspace.name}»`, TelegramBotURLs.Money));
 
     HawkCatcher.send(new Error('[Billing / Fail] Transaction failed'), body as any);
 
     res.json({
       code: FailCodes.SUCCESS,
@@ -773,7 +781,7 @@
    * @param errorText - error description
    * @param backtrace - request data and error data
    */
   private sendError(res: express.Response, errorCode: CheckCodes | PayCodes | FailCodes | RecurrentCodes, errorText: string, backtrace: { [key: string]: any }): void {
     res.json({
       code: errorCode,
     });
@@ -835,7 +843,7 @@
     promise.catch(e => console.error('Error while sending message to Telegram: ' + e));
   }
 
   /**
    * Parses body and returns card data
    * @param request - request body to parse
    */