biz-email-builder-shared 1.6.24 → 1.6.26

package/dist/entity/organisation.entity.d.ts

@@ -4,7 +4,7 @@ export interface IOrganisation extends Document {
     user: Types.ObjectId;
     websiteURL: string;
     phoneNumber: string;
-    industry: string;
+    industryName: string;
     isDisable: boolean;
     deletedAt: Date | null;
     updatedBy: Types.ObjectId;

package/dist/entity/organisation.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"organisation.entity.d.ts","sourceRoot":"","sources":["../../src/entity/organisation.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAcD,eAAO,MAAM,iBAAiB;SAC49H,MAAO,QAAQ;;;OADh7H,CAAC"}
+{"version":3,"file":"organisation.entity.d.ts","sourceRoot":"","sources":["../../src/entity/organisation.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,UAAU,CAAC;AAEhD,MAAM,WAAW,aAAc,SAAQ,QAAQ;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1B,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAaD,eAAO,MAAM,iBAAiB;SACs9H,MAAO,QAAQ;;;OAD16H,CAAC"}

package/dist/entity/organisation.entity.js

@@ -7,7 +7,7 @@ const OrganisationSchema = new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: "user", required: true },
     websiteURL: { type: String, required: true },
     phoneNumber: { type: String, required: true },
-    industry: { type: String, required: true },
+    industryName: { type: String, required: true },
     isDisable: { type: Boolean, default: false },
     deletedAt: { type: Date, default: null },
     updatedBy: { type: mongoose_1.Schema.Types.ObjectId, ref: "user", required: true },

package/dist/entity/planHistory.entity.d.ts

@@ -11,7 +11,7 @@ export interface ISubscriptionQuota {
     publicTemplateCount: number;
     smtpConfigAllowed: boolean;
     canCreateOrganisation: boolean;
-    organisationUserLimit: number;
+    userLimit: number;
 }
 export interface IPlanHistory extends Document {
     user: Types.ObjectId;

package/dist/entity/planHistory.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"planHistory.entity.d.ts","sourceRoot":"","sources":["../../src/entity/planHistory.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;IACrB,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC;IACnC,YAAY,EAAE,IAAI,CAAC;IACnB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,IAAI,CAAC;IACrB,wBAAwB,EAAE,OAAO,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1B,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;IAC1C,iBAAiB,EAAE,kBAAkB,CAAC;CACvC;AAED,eAAO,MAAM,wBAAwB;SA+Bo1E,MAAO,QAAQ;;;;SAAf,MAAO,QAAQ;;;EA1Bt3E,CAAC;AAEnB,eAAO,MAAM,uBAAuB;SAwBq1E,MAAO,QAAQ;;;;SAAf,MAAO,QAAQ;;;EAjBt3E,CAAC;AAEnB,eAAO,MAAM,iBAAiB;;;;;;;;EAYN,CAAC;AAEzB,eAAO,MAAM,gBAAgB;;;;OAAyD,CAAC"}
+{"version":3,"file":"planHistory.entity.d.ts","sourceRoot":"","sources":["../../src/entity/planHistory.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;IACrB,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC;IACnC,YAAY,EAAE,IAAI,CAAC;IACnB,WAAW,EAAE,IAAI,GAAG,IAAI,CAAC;IACzB,iBAAiB,EAAE,IAAI,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,IAAI,CAAC;IACrB,wBAAwB,EAAE,OAAO,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1B,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;IAC1C,iBAAiB,EAAE,kBAAkB,CAAC;CACvC;AAED,eAAO,MAAM,wBAAwB;SA+Bg5E,MAAO,QAAQ;;;;SAAf,MAAO,QAAQ;;;EA1Bl7E,CAAC;AAEnB,eAAO,MAAM,uBAAuB;SAwBi5E,MAAO,QAAQ;;;;SAAf,MAAO,QAAQ;;;EAjBl7E,CAAC;AAEnB,eAAO,MAAM,iBAAiB;;;;;;;;EAYN,CAAC;AAEzB,eAAO,MAAM,gBAAgB;;;;OAAyD,CAAC"}

package/dist/entity/planHistory.entity.js

@@ -14,7 +14,7 @@ exports.SubscriptionQuotaSchema = new mongoose_1.Schema({
     privateTemplateCount: { type: Number, required: true },
     smtpConfigAllowed: { type: Boolean, default: false },
     canCreateOrganisation: { type: Boolean, default: false },
-    organisationUserLimit: { type: Number, default: null, }
+    userLimit: { type: Number, default: 0, }
 }, { _id: false });
 exports.PlanHistorySchema = new mongoose_1.Schema({
     user: { type: mongoose_1.Schema.Types.ObjectId, ref: "user", required: true },

package/dist/entity/subscriptionPlan.entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscriptionPlan.entity.d.ts","sourceRoot":"","sources":["../../src/entity/subscriptionPlan.entity.ts"],"names":[],"mappings":"AACA,OAAO,QAA2B,MAAM,UAAU,CAAC;AAEnD,MAAM,WAAW,iBAAkB,SAAQ,QAAQ;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;IACnC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAkBD,eAAO,MAAM,qBAAqB;;;;OAAwE,CAAC"}
+{"version":3,"file":"subscriptionPlan.entity.d.ts","sourceRoot":"","sources":["../../src/entity/subscriptionPlan.entity.ts"],"names":[],"mappings":"AAAA,OAAO,QAA2B,MAAM,UAAU,CAAC;AAEnD,MAAM,WAAW,iBAAkB,SAAQ,QAAQ;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,qBAAqB,EAAE,OAAO,CAAC;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;IACnC,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAkBD,eAAO,MAAM,qBAAqB;;;;OAAwE,CAAC"}

package/dist/entity/subscriptionPlan.entity.js

@@ -42,7 +42,7 @@ const SubscriptionPlanSchema = new mongoose_1.Schema({
     publicTemplateLimit: { type: Number, required: true },
     smtpConfigAllowed: { type: Boolean, required: true },
     canCreateOrganisation: { type: Boolean, default: false },
-    userLimit: { type: Number, default: null },
+    userLimit: { type: Number, default: 0 },
     isDeleted: { type: Boolean, default: false },
     updatedBy: { type: mongoose_1.default.Schema.Types.ObjectId, ref: "user", required: true },
     deletedAt: { type: Date, default: null },

package/dist/middleware/authentication.js

@@ -38,16 +38,15 @@ const authorize = () => {
                 if (user.role === undefined || user.role === null || !Object.values(email_builder_utils_1.ROLES).includes(user.role)) {
                     throw new resHandler_1.UnauthorizedRequestError(utilities_1.SERVER_MESSAGES.SE_NO_ROLE_ASSIGNED_ROLE_INVALID);
                 }
-                const { createdAt, updatedAt, deletedAt, password } = user, rest = __rest(user, ["createdAt", "updatedAt", "deletedAt", "password"]);
+                const { createdAt, updatedAt, deletedAt, password, verificationToken, __v, updateBy, isVerified } = user, rest = __rest(user, ["createdAt", "updatedAt", "deletedAt", "password", "verificationToken", "__v", "updateBy", "isVerified"]);
                 req.user = Object.assign({}, rest);
                 if (req.user && user.role === email_builder_utils_1.ROLES.ADMIN) {
                     req.user.isAdmin = true;
-                    req.user.groups.push({ name: "DEFAULT", features: Object.values(email_builder_utils_1.FEATURE_TYPE).map((value) => ({ name: value })) });
+                    req.user.groups.push({ name: "ADMIN_GROUP", features: Object.values(email_builder_utils_1.FEATURE_TYPE).map((value) => ({ name: value })) });
                 }
-                let currentPlanDetail = await entity_1.PlanHistoryModel.find({ user: user._id.toString() }).lean();
-                // req.subExpired
+                let currentPlanDetail = await entity_1.PlanHistoryModel.find({ user: user._id.toString(), isTransactionSuccessful: true }).lean().exec();
                 if (currentPlanDetail && currentPlanDetail.length && currentPlanDetail[0].renewalDate) {
-                    req.userSubscriptionQuota = currentPlanDetail[0].subscriptionQuota;
+                    req.userSubsciptionQuota = currentPlanDetail[0].subscriptionQuota;
                     req.isSubscriptionActive = !(currentPlanDetail[0].renewalDate < new Date());
                 }
                 next();

package/dist/types/IRequest.d.ts

@@ -20,8 +20,8 @@ export interface IRequestUser {
 }
 export interface IRequest extends Request {
     user?: IRequestUser;
-    userSubscriptionQuota?: ISubscriptionQuota;
     isSubscriptionActive?: boolean;
+    userSubsciptionQuota?: ISubscriptionQuota;
     file?: any;
 }
 //# sourceMappingURL=IRequest.d.ts.map

package/dist/types/IRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IRequest.d.ts","sourceRoot":"","sources":["../../src/types/IRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,cAAc,CAAC;IAC3B,MAAM,EAAE,KAAK,CAAC;QACV,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,YAAY,CAAA;SAAE,CAAC,CAAA;KAC1C,CAAC,CAAA;IACF,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,OAAO;IACrC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;CACd"}
+{"version":3,"file":"IRequest.d.ts","sourceRoot":"","sources":["../../src/types/IRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,KAAK,CAAC;IACZ,UAAU,EAAE,cAAc,CAAC;IAC3B,MAAM,EAAE,KAAK,CAAC;QACV,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,KAAK,CAAC;YAAE,IAAI,EAAE,YAAY,CAAA;SAAE,CAAC,CAAA;KAC1C,CAAC,CAAA;IACF,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAS,SAAQ,OAAO;IACrC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,kBAAkB,CAAC;IAC1C,IAAI,CAAC,EAAE,GAAG,CAAC;CACd"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz-email-builder-shared",
-  "version": "1.6.24",
+  "version": "1.6.26",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [