Merge pull request #632 from codex-team/master

Update prod

Author: quangtuanitmo18

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.4.7",
+  "version": "1.4.9",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {

src/resolvers/billingNew.ts

@@ -86,6 +86,7 @@ export default {
       currency: string;
       checksum: string;
       nextPaymentDate: Date;
+      cloudPaymentsPublicId: string;
     }> {
       const { workspaceId, tariffPlanId, shouldSaveCard } = input;
 
@@ -178,6 +179,7 @@ debug: ${Boolean(workspace.isDebug)}`
         currency: 'RUB',
         checksum,
         nextPaymentDate,
+        cloudPaymentsPublicId: process.env.CLOUDPAYMENTS_PUBLIC_ID || '',
       };
     },
   },

src/resolvers/workspace.js

@@ -436,7 +436,8 @@ module.exports = {
 
       const defaultPlan = await factories.plansFactory.getDefaultPlan();
 
-      if (workspaceModel.tariffPlanId === defaultPlan.id) {
+      // Prevent re-applying the free plan if workspace is already on it.
+      if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) {
         throw new UserInputError('You already use default plan');
       }
 

src/typeDefs/billing.ts

@@ -270,6 +270,11 @@ type ComposePaymentResponse {
   Next payment date (recurrent start)
   """
   nextPaymentDate: DateTime!
+
+  """
+  CloudPayments public id (merchant identifier for payment widget)
+  """
+  cloudPaymentsPublicId: String!
 }