@common_ch/common 1.0.111 → 1.0.113

package/build/events/app/buy/buy-plan-event.d.ts

@@ -6,6 +6,6 @@ export interface PlanBuyEvent {
         userId: string;
         price: string;
         versionPlan: number;
-        versionUser: number;
+        versionUserPlanMessage: number;
     };
 }

package/build/models/app/user.d.ts

@@ -10,6 +10,7 @@ export interface UserAttrs {
     planName?: string;
     startTimePlan?: string;
     exTimePlan?: string;
+    versionPlanMessage?: string;
     amountApiExistPlan?: number;
     amountUploadExistPlan?: number;
     email?: string;
@@ -37,6 +38,7 @@ export interface UserDoc extends mongoose.Document {
     planName?: string;
     startTimePlan?: string;
     exTimePlan: string;
+    versionPlanMessage: string;
     amountApiExistPlan: number;
     amountUploadExistPlan: number;
     email?: string;

package/build/models/app/user.js

@@ -14,7 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = exports.userStatusEnum = void 0;
 const mongoose_1 = __importDefault(require("mongoose"));
-const mongoose_update_if_current_1 = require("mongoose-update-if-current");
+// import { updateIfCurrentPlugin } from 'mongoose-update-if-current';
+const password_1 = require("../../services/password");
 var userStatusEnum;
 (function (userStatusEnum) {
     userStatusEnum["active"] = "active";
@@ -38,6 +39,11 @@ const userSchema = new mongoose_1.default.Schema({
         ref: 'Plan',
         required: false,
     },
+    versionPlanMessage: {
+        type: Number,
+        required: true,
+        default: 0,
+    },
     username: {
         type: String,
         required: false,
@@ -123,10 +129,31 @@ const userSchema = new mongoose_1.default.Schema({
     },
 });
 userSchema.set('versionKey', 'version');
-userSchema.plugin(mongoose_update_if_current_1.updateIfCurrentPlugin);
+// userSchema.plugin(updateIfCurrentPlugin);
 userSchema.statics.build = (attrs) => {
     return new User(attrs);
 };
+userSchema.pre('save', function (done) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (this.isModified('password')) {
+            if (this.get('password')) {
+                const hashed = yield password_1.Password.toHash(this.get('password'));
+                this.set('password', hashed);
+            }
+        }
+        if (this.isModified('versionPlanMessage')) {
+            this.$where = {
+                versionPlanMessage: this.get('versionPlanMessage'),
+            };
+        }
+        else {
+            this.$where = {
+                version: this.get('version'),
+            };
+        }
+        done();
+    });
+});
 userSchema.methods.updateWalletBalance = function (amount) {
     return __awaiter(this, void 0, void 0, function* () {
         const currentBalance = parseFloat(this.walletBalance.toString());

package/build/services/password.d.ts

@@ -0,0 +1,4 @@
+export declare class Password {
+    static toHash(password: string): Promise<string>;
+    static compare(storedPassword: string, suppliedPassword: string): Promise<boolean>;
+}

package/build/services/password.js

@@ -0,0 +1,32 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Password = void 0;
+const crypto_1 = require("crypto");
+const util_1 = require("util");
+const scryptAsync = (0, util_1.promisify)(crypto_1.scrypt);
+class Password {
+    static toHash(password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const salt = (0, crypto_1.randomBytes)(8).toString('hex');
+            const buf = (yield scryptAsync(password, salt, 64));
+            return `${buf.toString('hex')}.${salt}`;
+        });
+    }
+    static compare(storedPassword, suppliedPassword) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [hashedPassword, salt] = storedPassword.split('.');
+            const buf = (yield scryptAsync(suppliedPassword, salt, 64));
+            return buf.toString('hex') === hashedPassword;
+        });
+    }
+}
+exports.Password = Password;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@common_ch/common",
-  "version": "1.0.111",
+  "version": "1.0.113",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [
@@ -25,6 +25,7 @@
     "@types/express": "^5.0.0",
     "@types/jsonwebtoken": "^9.0.7",
     "cookie-session": "^2.1.0",
+    "crypto": "^1.0.1",
     "express": "^4.21.2",
     "joi": "^17.13.3",
     "jsonwebtoken": "^9.0.2",