@lenne.tech/nest-server 9.0.14 → 9.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.14",
+  "version": "9.0.17",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",
@@ -16,6 +16,7 @@
   "scripts": {
     "build": "rimraf dist && tsc -p tsconfig.build.json",
     "build:pack": "npm pack && echo 'use file:/ROOT_PATH_TO_TGZ_FILE to integrate the package'",
+    "build:dev": "npm run build && yalc push --private",
     "docs": "npm run docs:ci && open ./public/index.html",
     "docs:bootstrap": "node extras/update-spectaql-version.mjs && npx -y spectaql ./spectaql.yml",
     "docs:ci": "ts-node ./scripts/init-server.ts && npm run docs:bootstrap",
@@ -45,7 +46,8 @@
     "prepack": "npm run prestart:prod",
     "prepare": "husky install",
     "prepublishOnly": "npm run format && npm run lint && npm run test:ci",
-    "preversion": "npm run lint"
+    "preversion": "npm run lint",
+    "watch": "npm-watch"
   },
   "repository": {
     "type": "git",
@@ -119,6 +121,7 @@
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
     "jest": "29.2.1",
+    "npm-watch": "0.11.0",
     "pm2": "5.2.2",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
@@ -127,7 +130,8 @@
     "ts-morph": "16.0.0",
     "ts-node": "10.9.1",
     "tsconfig-paths": "4.1.0",
-    "typescript": "4.8.4"
+    "typescript": "4.8.4",
+    "yalc": "^1.0.0-pre.53"
   },
   "jest": {
     "collectCoverage": true,
@@ -149,5 +153,8 @@
   "files": [
     "dist/**/*",
     "src/**/*"
-  ]
+  ],
+  "watch": {
+    "build:dev": "src"
+  }
 }

package/src/core/common/helpers/input.helper.ts

@@ -626,3 +626,35 @@ export function instanceofArray(arr: any[], strict = false): string {
   }
   return constructor;
 }
+
+/**
+ * Process data via function deep
+ * @param data
+ * @param func
+ * @param processedObjects
+ */
+export function processDeep(data: any, func: (data: any) => any, processedObjects = new WeakMap()): any {
+  // Prevent circular processing
+  if (typeof data === 'object') {
+    if (processedObjects.get(data)) {
+      return data;
+    }
+    processedObjects.set(data, true);
+  }
+
+  // Process array
+  if (Array.isArray(data)) {
+    return data.map((item) => processDeep(item, func));
+  }
+
+  // Process object
+  if (typeof data === 'object') {
+    for (const [key, value] of Object.entries(data)) {
+      data[key] = processDeep(value, func, processedObjects);
+    }
+    return data;
+  }
+
+  // Process others
+  return func(data);
+}

package/src/core/modules/user/core-user.model.ts

@@ -84,6 +84,13 @@ export abstract class CoreUserModel extends CorePersistenceModel {
   @Prop({ type: Boolean })
   verified: boolean = undefined;
 
+  /**
+   * Verification date
+   */
+  @Field({ description: 'Verified date', nullable: true })
+  @Prop()
+  verifiedAt: Date = undefined;
+
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================

package/src/core/modules/user/core-user.service.ts

@@ -98,22 +98,25 @@ export abstract class CoreUserService<
   /**
    * Verify user with token
    */
-  async verify(token: string, serviceOptions?: ServiceOptions): Promise<TUser> {
+  async verify(token: string, serviceOptions?: ServiceOptions): Promise<TUser | string> {
     // Get user
     const dbObject = await this.mainDbModel.findOne({ verificationToken: token }).exec();
     if (!dbObject) {
       throw new NotFoundException(`No user found with verify token: ${token}`);
     }
+
     if (!dbObject.verificationToken) {
       throw new Error('User has no token');
     }
+
     if (dbObject.verified) {
-      throw new Error('User already verified');
+      return 'User already verified';
     }
+
     return this.process(
       async () => {
         // Update and return user
-        return await assignPlain(dbObject, { verified: true, verificationToken: null }).save();
+        return await assignPlain(dbObject, { verified: true, verifiedAt: new Date() }).save();
       },
       { dbObject, serviceOptions }
     );