nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/cli/builder/bundles/users-bundle/readme.md

@@ -282,10 +282,10 @@ curl -k -X POST  --data "refreshToken=refreshToken" https://localhost:5152/jwt/t
 ```bash
 $ nodefony -h
 
-users :                                                                                               
- users:show [user]                           nodefony users:show admin                                                                                               
- users:find [--json] username                nodefony --json users:find admin                                                                                        
- users:findAll [--json]                      nodefony --json users:findAll  
+users :
+ users:show [user]                           nodefony users:show admin
+ users:find [--json] username                nodefony --json users:find admin
+ users:findAll [--json]                      nodefony --json users:findAll
 
 $ nodefony users:show
 
@@ -319,7 +319,7 @@ Thu Dec 05 2019 10:45:22 INFO nodefony : END TABLE : 🏁
 
 $ nodefony unitest:list:all
 
-                 _   _                  _       _   _         _   
+                 _   _                  _       _   _         _
  _   _   _ __   (_) | |_    ___   ___  | |_    | | (_)  ___  | |_
 | | | | | '_ \  | | | __|  / _ \ / __| | __|   | | | | / __| | __|
 | |_| | | | | | | | | |_  |  __/ \__ \ | |_    | | | | \__ \ | |_
@@ -333,8 +333,8 @@ Thu Dec 05 2019 10:55:21 INFO COMMAND unitest TASK list :        ‣ usersTest.j
 
 $ nodefony unitest:launch:bundle users
 
-                            _   _                  _       _                                  _     
-            _   _   _ __   (_) | |_    ___   ___  | |_    | |   __ _   _   _   _ __     ___  | |__  
+                            _   _                  _       _                                  _
+            _   _   _ __   (_) | |_    ___   ___  | |_    | |   __ _   _   _   _ __     ___  | |__
            | | | | | '_ \  | | | __|  / _ \ / __| | __|   | |  / _` | | | | | | '_ \   / __| | '_ \
            | |_| | | | | | | | | |_  |  __/ \__ \ | |_    | | | (_| | | |_| | | | | | | (__  | | | |
             \__,_| |_| |_| |_|  \__|  \___| |___/  \__|   |_|  \__,_|  \__,_| |_| |_|  \___| |_| |_|

package/cli/builder/bundles/users-bundle/services/usersService.js

@@ -1,6 +1,5 @@
 module.exports = class users extends nodefony.Service {
-
-  constructor(container) {
+  constructor (container) {
     super("users", container);
     this.orm = this.kernel.getORM();
     this.ormName = this.orm.name;
@@ -13,11 +12,11 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  initialize() {
+  initialize () {
     this.entity = this.orm.getEntity("user");
   }
 
-  getSchemaAttributes() {
+  getSchemaAttributes () {
     switch (this.ormName) {
     case "sequelize":
       return this.entity.rawAttributes;
@@ -26,11 +25,11 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  checkSchema(query) {
+  checkSchema (query) {
     try {
       if (query) {
         const attr = this.getSchemaAttributes();
-        for (let ele in query) {
+        for (const ele in query) {
           if (ele in attr) {
             continue;
           }
@@ -42,7 +41,7 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  async sanitizeError(error, transaction = null) {
+  async sanitizeError (error, transaction = null) {
     this.log(error, "ERROR");
     if (transaction && !transaction.finished) {
       switch (this.ormName) {
@@ -62,31 +61,31 @@ module.exports = class users extends nodefony.Service {
     return error;
   }
 
-  checkAuthorisation(action, user = null, query = null) {
+  checkAuthorisation (action, user = null, query = null) {
     if (!user) {
-      throw new nodefony.authorizationError('User not authorized', 403)
+      throw new nodefony.authorizationError("User not authorized", 403);
     }
-    let obj = {
+    const obj = {
       isAdmin: user.hasRole("ROLE_ADMIN"),
       isUser: user.hasRole("ROLE_USER"),
-      query: query
-    }
+      query
+    };
     switch (action) {
     case "update":
-    if (!obj.isAdmin) {
-      if( query.where ){
-        if( user.username !== query.where.username ){
-          throw new nodefony.authorizationError('User not authorized', 403)
+      if (!obj.isAdmin) {
+        if (query.where) {
+          if (user.username !== query.where.username) {
+            throw new nodefony.authorizationError("User not authorized", 403);
+          }
+        } else {
+          throw new nodefony.authorizationError("User not authorized", 403);
         }
-      }else{
-        throw new nodefony.authorizationError('User not authorized', 403)
       }
-    }
-    break;
+      break;
     case "insert":
     case "delete":
       if (!obj.isAdmin) {
-        throw new nodefony.authorizationError('User not authorized', 403)
+        throw new nodefony.authorizationError("User not authorized", 403);
       }
       break;
     case "search":
@@ -95,7 +94,7 @@ module.exports = class users extends nodefony.Service {
         if (obj.isUser) {
 
         } else {
-          throw new nodefony.authorizationError('User not authorized', 403)
+          throw new nodefony.authorizationError("User not authorized", 403);
         }
       } else {
 
@@ -106,29 +105,29 @@ module.exports = class users extends nodefony.Service {
     case "findOne":
       if (!obj.isAdmin) {
         if (!obj.isUser) {
-          throw new nodefony.authorizationError('User not authorized', 403)
+          throw new nodefony.authorizationError("User not authorized", 403);
         }
       }
       break;
     default:
-      throw new nodefony.authorizationError('Action not authorized', 403)
+      throw new nodefony.authorizationError("Action not authorized", 403);
     }
-    return obj
+    return obj;
   }
 
-  async find(query = {}, options = {}, user) {
+  async find (query = {}, options = {}, user) {
     try {
-      const auth = this.checkAuthorisation("find", user, query)
+      const auth = this.checkAuthorisation("find", user, query);
       switch (this.ormName) {
       case "mongoose":
         if (options.limit || options.offset || options.page) {
           return this.entity.paginate(auth.query, {
-              page: options.page,
-              limit: options.limit,
-              offset: options.offset
-            })
+            page: options.page,
+            limit: options.limit,
+            offset: options.offset
+          })
             .then((res) => {
-              let tab = [];
+              const tab = [];
               if (!res) {
                 return {
                   page: options.page,
@@ -136,7 +135,7 @@ module.exports = class users extends nodefony.Service {
                   offset: options.offset,
                   total: tab.length,
                   rows: tab
-                }
+                };
               }
               return {
                 page: res.page,
@@ -150,15 +149,15 @@ module.exports = class users extends nodefony.Service {
                 prevPage: res.prevPage,
                 nextPage: res.nextPage,
                 rows: res.docs
-              }
+              };
             })
-            .catch(async e => {
+            .catch(async (e) => {
               throw await this.sanitizeError(e);
             });
         }
         return this.entity.find(auth.query, options)
           .then((res) => {
-            let tab = [];
+            const tab = [];
             if (!res) {
               return {
                 total: tab.length,
@@ -170,15 +169,15 @@ module.exports = class users extends nodefony.Service {
               rows: res
             };
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e);
           });
       case "sequelize":
-        //query = nodefony.extend(query, options);
+        // query = nodefony.extend(query, options);
         if (query.limit || query.offset) {
           return this.entity.findAndCountAll(auth.query)
             .then((res) => {
-              let tab = [];
+              const tab = [];
               if (!res) {
                 return {
                   page: query.page,
@@ -189,7 +188,7 @@ module.exports = class users extends nodefony.Service {
                 };
               }
               res.rows.map((el) => {
-                let userS = el.get({
+                const userS = el.get({
                   plain: true
                 });
                 tab.push(userS);
@@ -202,13 +201,13 @@ module.exports = class users extends nodefony.Service {
                 rows: tab
               };
             })
-            .catch(async e => {
+            .catch(async (e) => {
               throw await this.sanitizeError(e);
             });
         }
         return this.entity.findAll(auth.query)
           .then((res) => {
-            let tab = [];
+            const tab = [];
             if (!res) {
               return {
                 total: tab.length,
@@ -216,7 +215,7 @@ module.exports = class users extends nodefony.Service {
               };
             }
             res.map((el) => {
-              let userS = el.get({
+              const userS = el.get({
                 plain: true
               });
               tab.push(userS);
@@ -226,7 +225,7 @@ module.exports = class users extends nodefony.Service {
               rows: tab
             };
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e);
           });
       }
@@ -235,29 +234,29 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  async findOne(username, user) {
+  async findOne (username, user) {
     try {
       switch (this.ormName) {
       case "mongoose":
         return this.entity.findOne({
-            username: username
-          })
-          .catch(async e => {
+          username
+        })
+          .catch(async (e) => {
             throw await this.sanitizeError(e);
           });
       case "sequelize":
         return this.entity.findOne({
-            where: {
-              username: username
-            }
-          })
+          where: {
+            username
+          }
+        })
           .then((user) => {
             if (!user) {
               throw new nodefony.Error(`Username ${username} not found`, 404);
             }
             return user;
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e);
           });
       }
@@ -266,8 +265,8 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  async update(userentity, value, user, transac = null) {
-    let transaction = transac
+  async update (userentity, value, user, transac = null) {
+    let transaction = transac;
     if (!transac) {
       transaction = await this.orm.startTransaction("user");
     }
@@ -276,12 +275,11 @@ module.exports = class users extends nodefony.Service {
       try {
         return userentity.updateOne(value, {
           //  session: transaction
-          })
-          .then(async (user) => {
-            //await transaction.commitTransaction();
-            return user;
-          })
-          .catch(async e => {
+        })
+          .then(async (user) =>
+          // await transaction.commitTransaction();
+            user)
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -294,17 +292,16 @@ module.exports = class users extends nodefony.Service {
           username
         } = userentity;
         return this.entity.update(value, {
-            where: {
-              username: username
-            }
-          }, {
-            transaction: transaction
-          })
+          where: {
+            username
+          },
+          transaction
+        })
           .then(async (user) => {
             await transaction.commit();
             return user;
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -313,8 +310,8 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  async create(query, user, transac = null) {
-    let transaction = transac
+  async create (query, user, transac = null) {
+    let transaction = transac;
     if (!transac) {
       transaction = await this.orm.startTransaction("user");
     }
@@ -322,13 +319,13 @@ module.exports = class users extends nodefony.Service {
     case "sequelize":
       try {
         return this.entity.create(query, {
-            transaction: transaction
-          })
+          transaction
+        })
           .then(async (user) => {
             await transaction.commit();
             return user;
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -338,13 +335,12 @@ module.exports = class users extends nodefony.Service {
     case "mongoose":
       try {
         return this.entity.create([query], {
-            //session: transaction
-          })
-          .then(async (myuser) => {
-            //await transaction.commitTransaction();
-            return myuser[0] || myuser;
-          })
-          .catch(async e => {
+          // session: transaction
+        })
+          .then(async (myuser) =>
+          // await transaction.commitTransaction();
+            myuser[0] || myuser)
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -353,8 +349,8 @@ module.exports = class users extends nodefony.Service {
     }
   }
 
-  async delete(username, user, transac = null) {
-    let transaction = transac
+  async delete (username, user, transac = null) {
+    let transaction = transac;
     if (!transac) {
       transaction = await this.orm.startTransaction("user");
     }
@@ -362,25 +358,24 @@ module.exports = class users extends nodefony.Service {
     case "mongoose":
       try {
         return this.entity.findOne({
-            username: username
-          })
+          username
+        })
           .then((user) => {
             if (!user) {
               throw new nodefony.Error(`User ${username} not found`);
             }
             return user.remove({
-                force: true,
-                //session: transaction
-              })
-              .then(async (user) => {
-                //await transaction.commitTransaction();
-                return user;
-              })
-              .catch(async e => {
+              force: true
+              // session: transaction
+            })
+              .then(async (user) =>
+              // await transaction.commitTransaction();
+                user)
+              .catch(async (e) => {
                 throw await this.sanitizeError(e, transaction);
               });
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -390,26 +385,26 @@ module.exports = class users extends nodefony.Service {
     case "sequelize":
       try {
         return this.entity.findOne({
-            where: {
-              username: username
-            }
-          })
+          where: {
+            username
+          }
+        })
           .then((user) => {
             if (!user) {
               throw new nodefony.Error(`User ${username} not found`);
             }
             return user.destroy({
-                transaction: transaction
-              })
+              transaction
+            })
               .then(async (user) => {
                 await transaction.commit();
                 return user;
               })
-              .catch(async e => {
+              .catch(async (e) => {
                 throw await this.sanitizeError(e, transaction);
               });
           })
-          .catch(async e => {
+          .catch(async (e) => {
             throw await this.sanitizeError(e, transaction);
           });
       } catch (e) {
@@ -417,4 +412,4 @@ module.exports = class users extends nodefony.Service {
       }
     }
   }
-}
+};

package/cli/builder/bundles/users-bundle/src/providers/mongoose/userProvider.js

@@ -1,30 +1,29 @@
 module.exports = nodefony.registerProvider("userProvider", () => {
-
   const Provider = class userProvider extends nodefony.userEntityProvider {
-
-    constructor(name, manager, config) {
+    constructor (name, manager, config) {
       super(name, manager, config);
       this.property = {};
     }
 
-    loadUserByUsername(username) {
+    loadUserByUsername (username) {
       this.property[this.userProperty] = username;
       if (!this.userEntity) {
         this.userEntity = this.getEntity();
       }
       return this.userEntity.findOne(this.property)
         .then((user) => {
-          //throw user;
+          // throw user;
           if (user) {
             return this.refreshUser(user);
           }
           throw new nodefony.Error(`User : ${username} not Found`, 404);
-        }).catch((error) => {
+        })
+        .catch((error) => {
           throw error;
         });
     }
 
-    async refreshUser(user) {
+    async refreshUser (user) {
       const serialize = await user.populate();
       return new nodefony.User(
         serialize.username,
@@ -43,7 +42,6 @@ module.exports = nodefony.registerProvider("userProvider", () => {
         serialize.image
       );
     }
-
   };
   return Provider;
 });

package/cli/builder/bundles/users-bundle/src/providers/sequelize/userProvider.js

@@ -1,13 +1,11 @@
 module.exports = nodefony.registerProvider("userProvider", () => {
-
   const Provider = class userProvider extends nodefony.userEntityProvider {
-
-    constructor(name, manager, config) {
+    constructor (name, manager, config) {
       super(name, manager, config);
       this.property = {};
     }
 
-    loadUserByUsername(username) {
+    loadUserByUsername (username) {
       this.property[this.userProperty] = username;
       if (!this.userEntity) {
         this.userEntity = this.getEntity();
@@ -19,13 +17,14 @@ module.exports = nodefony.registerProvider("userProvider", () => {
           return this.refreshUser(user);
         }
         throw new nodefony.Error(`User : ${username} not Found`, 404);
-      }).catch((error) => {
-        throw error;
-      });
+      })
+        .catch((error) => {
+          throw error;
+        });
     }
 
-    refreshUser(user) {
-      let serialize = user.get();
+    refreshUser (user) {
+      const serialize = user.get();
       return new nodefony.User(
         serialize.username,
         serialize.password,
@@ -46,4 +45,4 @@ module.exports = nodefony.registerProvider("userProvider", () => {
   };
 
   return Provider;
-});
+});