update from main

Author: e11sy

src/billing/cloudpayments.ts

@@ -205,36 +205,6 @@ export default class CloudPaymentsWebhooks {
     return `${workspace.name} ${now.getDate()}/${now.getMonth() + 1} ${tariffPlan.name}`;
   }
 
-  /**
-   * Confirms the correctness of a user's payment for card linking
-   * @param req - express request
-   * @param res - express response
-   * @param data - payment data receinved from checksum and request payload
-   */
-  private async checkCardLinkOperation(req: express.Request, res: express.Response, data: PaymentData): Promise<void> {
-    if (data.isCardLinkOperation && (!data.userId || !data.workspaceId)) {
-      this.sendError(res, CheckCodes.PAYMENT_COULD_NOT_BE_ACCEPTED, '[Billing / Check] Card linking – invalid data', req.body);
-
-      return;
-    }
-
-    try {
-      const workspace = await this.getWorkspace(req, data.workspaceId);
-
-      telegram
-        .sendMessage(`✅ [Billing / Check] Card linked for subscription workspace «${workspace.name}»`, TelegramBotURLs.Money)
-        .catch(e => console.error('Error while sending message to Telegram: ' + e));
-
-      res.json({
-        code: CheckCodes.SUCCESS,
-      } as CheckResponse);
-    } catch (e) {
-      const error = e as Error;
-
-      this.sendError(res, CheckCodes.PAYMENT_COULD_NOT_BE_ACCEPTED, `[Billing / Check] ${error.toString()}`, req.body);
-    }
-  }
-
   /**
    * Route to confirm the correctness of a user's payment
    * https://developers.cloudpayments.ru/#check
@@ -257,28 +227,33 @@ export default class CloudPaymentsWebhooks {
       return;
     }
 
+    /** Data validation */
     if (data.isCardLinkOperation) {
-      this.checkCardLinkOperation(req, res, data);
+      if (!data.userId || !data.workspaceId) {
+        this.sendError(res, CheckCodes.PAYMENT_COULD_NOT_BE_ACCEPTED, '[Billing / Check] There is no necessary data in the card linking request', req.body);
 
-      return;
+        return;
+      }
+    } else {
+      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;
+      }
     }
 
     let workspace: WorkspaceModel;
     let member: ConfirmedMemberDBScheme;
     let plan: PlanDBScheme;
-
-    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;
-    }
+    let planId: string;
 
     const { workspaceId, userId, tariffPlanId } = data;
 
     try {
       workspace = await this.getWorkspace(req, workspaceId);
       member = await this.getMember(userId, workspace);
-      plan = await this.getPlan(req, tariffPlanId);
+      planId = data.isCardLinkOperation ? workspace.tariffPlanId.toString() : tariffPlanId;
+      plan = await this.getPlan(req, planId);
     } catch (e) {
       const error = e as Error;
 
@@ -307,7 +282,7 @@ export default class CloudPaymentsWebhooks {
     try {
       await context.factories.businessOperationsFactory.create<PayloadOfWorkspacePlanPurchase>({
         transactionId: body.TransactionId.toString(),
-        type: BusinessOperationType.WorkspacePlanPurchase,
+        type: data.isCardLinkOperation ? BusinessOperationType.CardLinkCharge : BusinessOperationType.WorkspacePlanPurchase,
         status: BusinessOperationStatus.Pending,
         payload: {
           workspaceId: workspace._id,
@@ -361,16 +336,19 @@ export default class CloudPaymentsWebhooks {
       return;
     }
 
-    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;
-    }
+    /** Data validation */
+    if (data.isCardLinkOperation) {
+      if (!data.userId || !data.workspaceId) {
+        this.sendError(res, PayCodes.SUCCESS, '[Billing / Pay] No workspace or user id in request body', req.body);
 
-    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;
+      }
+    } else {
+      if (!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;
+        return;
+      }
     }
 
     let businessOperation;
@@ -384,7 +362,6 @@ export default class CloudPaymentsWebhooks {
       workspace = await this.getWorkspace(req, data.workspaceId);
       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;

yarn.lock

@@ -451,6 +451,13 @@
     axios "^0.21.1"
     stack-trace "^0.0.10"
 
+"@hawk.so/[email protected]":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.23.tgz#45dae057fd29d4735a51baa5f00d8e0d245075f4"
+  integrity sha512-b9W8TZJj6kBh3rVS4tKCmVbM44XJ/Ya8kwXY12QNf5/U4O2iuegIIEcFwr6N10SJI1VbuPLYFrckxt/8ymQScw==
+  dependencies:
+    "@types/mongodb" "^3.5.34"
+
 "@hawk.so/types@^0.1.15":
   version "0.1.18"
   resolved "https://registry.yarnpkg.com/@hawk.so/types/-/types-0.1.18.tgz#746537634756825f066182737429d11ea124d5c5"