@xuda.io/account_module 1.2.101 → 1.2.102

package/index.js

@@ -182,7 +182,7 @@ exports.increment_account_usage = async function (req) {
       }
 
       if (Date.now() - doc.ts >= interval) {
-        const plan = _conf.PLAN_OBJ[account_data.plan];
+        const plan = _conf.PLAN_OBJ[account_data.membership_plan];
         const drive_size_total = account_data.user_drive_size + account_data.studio_drive_size + account_data.workspace_drive_size + account_data.builds_drive_size + account_data.plugins_drive_size;
         if (bytesToGB(drive_size_total) > plan.features.drive) {
           var price_per_hour = (bytesToGB(drive_size_total) * _conf.PRICE_OBJ.price_per_gb_drive) / _conf.PRICE_OBJ.avg_hours_in_month;
@@ -389,7 +389,7 @@ exports.get_account_data = async function (req) {
       _id: acc_obj._id,
       account_info: acc_obj.account_info,
       usage: acc_obj.activity_usage,
-      plan: acc_obj.plan,
+      plan: acc_obj.membership_plan,
       plan_changed: acc_obj.plan_changed,
       plan_info: acc_obj.plan_info,
       support_plan: acc_obj.support_plan,
@@ -572,7 +572,7 @@ exports.validate_user_plan = async function (req) {
   if (ret.code < 0) {
     return ret;
   }
-  var plan = _conf.PLAN_OBJ[ret.data.plan];
+  var plan = _conf.PLAN_OBJ[ret.data.membership_plan];
   // get plan from user
 
   if (!plan) {
@@ -583,7 +583,7 @@ exports.validate_user_plan = async function (req) {
   if (app_obj.app_type === 'master' && ret_obj.master >= plan.features.projects) {
     return {
       code: -8,
-      data: `Number of projects (${ret.data.plan}) exceeds to the ${plan.features.projects} plan limits`,
+      data: `Number of projects (${ret.data.membership_plan}) exceeds to the ${plan.features.projects} plan limits`,
     };
   }
 
@@ -602,21 +602,6 @@ exports.validate_user_plan = async function (req) {
     };
   }
 
-  // if (!app_obj.access_type) {
-  //   return {
-  //     code: -10,
-  //     data: `error - access_type missing`,
-  //   };
-  // }
-  // }
-
-  // if (app_obj.app_type === "backup" && ret.data.plan === "free") {
-  //   return {
-  //     code: -10,
-  //     data: `The free plan does not include the ability to perform backups. To access backup capabilities, please consider upgrading your plan. You can do so by visiting https://xuda.io/dashboard/settings/billing.`,
-  //   };
-  // }
-
   return { code: 1, data: ret.data };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.101",
+  "version": "1.2.102",
   "description": "Xuda Account Server Module",
   "main": "index.js",
   "dependencies": {