@modular-rest/server 1.15.0 → 1.16.1

package/dist/class/user.d.ts

@@ -37,7 +37,7 @@ export declare class User {
      *
      * @hidden
      */
-    constructor(id: string, permissionGroup: string, phone: string, email: string, password: string, type: string, model: any);
+    constructor(id: string, permissionGroup: string, phone: string, email: string, password: string, type: 'user' | 'anonymous', model: any);
     /**
      * Get brief user information
      * @returns Brief user info object

package/dist/services/user_manager/db.js

@@ -9,11 +9,11 @@ const security_1 = require("../../class/security");
 const config_1 = require("../../config");
 const trigger_operator_1 = __importDefault(require("../../class/trigger_operator"));
 const authSchema = new mongoose_1.Schema({
-    permissionGroup: String,
-    email: String,
-    phone: String,
-    password: String,
-    type: { type: String, default: 'user', enum: ['user', 'anonymous'] },
+    permissionGroup: { type: String, required: true },
+    email: { type: String, required: false },
+    phone: { type: String, required: false },
+    password: { type: String, required: true },
+    type: { type: String, required: true, default: 'user', enum: ['user', 'anonymous'] },
 }, { timestamps: true });
 authSchema.index({ email: 1 }, { unique: true });
 authSchema.pre(['save', 'updateOne'], function (next) {

package/dist/services/user_manager/service.js

@@ -451,7 +451,7 @@ class UserManager {
             // Load user
             const user = await user_1.User.loadFromModel(gottenFromDB);
             // Update password
-            user.password = Buffer.from(password).toString('base64');
+            user.password = password;
             // Save to database
             await user.save();
             // Get token payload
@@ -513,7 +513,7 @@ class UserManager {
             // Load user
             const user = await user_1.User.loadFromModel(gottenFromDB);
             // Update password
-            user.password = Buffer.from(password).toString('base64');
+            user.password = password;
             // Save to database
             await user.save();
             // Get token payload
@@ -562,9 +562,9 @@ class UserManager {
                     ...detail,
                     type: detail.type || 'user',
                     permissionGroup: detail.permissionGroup || (0, permissionManager_1.getDefaultPermissionGroups)().title,
-                    phone: detail.phone || '',
-                    email: detail.email || '',
-                    password: detail.password ? Buffer.from(detail.password).toString('base64') : '',
+                    phone: detail.phone || undefined,
+                    email: detail.email || undefined,
+                    password: detail.password || undefined,
                 });
                 // Load user from document
                 const user = await user_1.User.loadFromModel(userDoc);
@@ -610,7 +610,7 @@ class UserManager {
             throw new Error('User not found');
         }
         const user = await user_1.User.loadFromModel(userDoc);
-        user.password = Buffer.from(newPass).toString('base64');
+        user.password = newPass;
         await user.save();
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@modular-rest/server",
-	"version": "1.15.0",
+	"version": "1.16.1",
 	"description": "TypeScript version of a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
 	"bugs": {
 		"url": "https://github.com/modular-rest/modular-rest/issues"
 	},
-	"homepage": "https://github.com/modular-rest/modular-rest#readme",
+	"homepage": "https://modular-rest.github.io/modular-rest",
 	"dependencies": {
 		"@koa/cors": "^3.1.0",
 		"colog": "^1.0.4",

package/src/class/user.ts

@@ -48,7 +48,7 @@ export class User {
     phone: string,
     email: string,
     password: string,
-    type: string,
+    type: 'user' | 'anonymous',
     model: any
   ) {
     this.id = id;

package/src/services/user_manager/db.ts

@@ -12,11 +12,11 @@ interface AuthDocument extends mongoose.Document {
 
 const authSchema = new Schema(
   {
-    permissionGroup: String,
-    email: String,
-    phone: String,
-    password: String,
-    type: { type: String, default: 'user', enum: ['user', 'anonymous'] },
+    permissionGroup: { type: String, required: true },
+    email: { type: String, required: false },
+    phone: { type: String, required: false },
+    password: { type: String, required: true },
+    type: { type: String, required: true, default: 'user', enum: ['user', 'anonymous'] },
   },
   { timestamps: true }
 );

package/src/services/user_manager/service.ts

@@ -495,7 +495,7 @@ class UserManager {
       const user = await User.loadFromModel(gottenFromDB);
 
       // Update password
-      user.password = Buffer.from(password).toString('base64');
+      user.password = password;
 
       // Save to database
       await user.save();
@@ -568,7 +568,7 @@ class UserManager {
       const user = await User.loadFromModel(gottenFromDB);
 
       // Update password
-      user.password = Buffer.from(password).toString('base64');
+      user.password = password;
 
       // Save to database
       await user.save();
@@ -624,9 +624,9 @@ class UserManager {
           ...detail,
           type: detail.type || 'user',
           permissionGroup: detail.permissionGroup || getDefaultPermissionGroups().title,
-          phone: detail.phone || '',
-          email: detail.email || '',
-          password: detail.password ? Buffer.from(detail.password).toString('base64') : '',
+          phone: detail.phone || undefined,
+          email: detail.email || undefined,
+          password: detail.password || undefined,
         });
 
         // Load user from document
@@ -679,7 +679,7 @@ class UserManager {
     }
 
     const user = await User.loadFromModel(userDoc);
-    user.password = Buffer.from(newPass).toString('base64');
+    user.password = newPass;
     await user.save();
   }