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

package/cli/builder/bundles/users-bundle/controller/api/openapi/restUserController.js

@@ -2,8 +2,7 @@
  *    @Route ("/api/users")
  */
 class restController extends nodefony.Controller {
-
-  constructor(container, context) {
+  constructor (container, context) {
     super(container, context);
     // service entity
     this.usersService = this.get("users");
@@ -16,10 +15,10 @@ class restController extends nodefony.Controller {
     }, this.context);
   }
 
-  checkAuthorisation(username, query) {
-    let granted = this.is_granted("ROLE_ADMIN");
+  checkAuthorisation (username, query) {
+    const granted = this.is_granted("ROLE_ADMIN");
     if (username) {
-      let user = this.getUser();
+      const user = this.getUser();
       if (!user) {
         throw new nodefony.authorizationError("Unauthorized", 401, this.context);
       }
@@ -28,13 +27,11 @@ class restController extends nodefony.Controller {
           throw new nodefony.authorizationError("Unauthorized Role", 401, this.context);
         }
       }
-    } else {
-      if (!granted) {
-        throw new nodefony.authorizationError("Unauthorized", 401, this.context);
-      }
+    } else if (!granted) {
+      throw new nodefony.authorizationError("Unauthorized", 401, this.context);
     }
     if (query && query.roles && query.roles.length) {
-      if (query.roles.indexOf("ROLE_ADMIN") >= 0 && (!granted)) {
+      if (query.roles.indexOf("ROLE_ADMIN") >= 0 && !granted) {
         throw new nodefony.authorizationError("Unauthorized Role", 401, this.context);
       }
     }
@@ -48,7 +45,7 @@ class restController extends nodefony.Controller {
    *    )
    *    @Firewall ({bypass:true})
    */
-  swaggerAction() {
+  swaggerAction () {
     return this.optionsAction();
   }
 
@@ -56,9 +53,9 @@ class restController extends nodefony.Controller {
    *    @Method ({"OPTIONS"})
    *    @Route ( "",name="api-users-options")
    */
-  optionsAction() {
+  optionsAction () {
     try {
-      let openApiConfig = require(path.resolve(this.bundle.path, "Resources", "swagger", "openapi", "users.js"));
+      const openApiConfig = require(path.resolve(this.bundle.path, "Resources", "swagger", "openapi", "users.js"));
       return this.api.renderSchema(openApiConfig, this.usersService.entity);
     } catch (e) {
       return this.api.renderError(e, 400);
@@ -69,7 +66,7 @@ class restController extends nodefony.Controller {
    *    @Method ({"GET"})
    *    @Route ( "/{username}",name="api-user",defaults={"username" = ""})
    */
-  async getAction(username) {
+  async getAction (username) {
     let result = null;
     const user = this.getUser();
     try {
@@ -94,7 +91,7 @@ class restController extends nodefony.Controller {
    *    @Method ({"HEAD"})
    *    @Route ( "",name="api-users-head",)
    */
-  headAction() {
+  headAction () {
     return this.renderResponse("");
   }
 
@@ -102,14 +99,14 @@ class restController extends nodefony.Controller {
    *    @Method ({"POST"})
    *    @Route ( "",name="api-users-post")
    */
-  async postAction() {
+  async postAction () {
     let myuser = null;
     let error = null;
     if (!this.query.password || !this.query.confirm) {
-      error = new Error(`Password can't be empty`);
+      error = new Error("Password can't be empty");
     }
     if (this.query.password !== this.query.confirm) {
-      error = new Error(`Bad confirm password`);
+      error = new Error("Bad confirm password");
     }
     if (error) {
       this.logger(error, "ERROR");
@@ -117,12 +114,12 @@ class restController extends nodefony.Controller {
     }
     try {
       this.checkAuthorisation(null, this.query);
-      const user = this.getUser()
+      const user = this.getUser();
       myuser = await this.usersService.create(this.query, user);
       if (myuser) {
         delete myuser.password;
         delete myuser["2fa-token"];
-        let res = {
+        const res = {
           query: this.query,
           user: myuser
         };
@@ -142,24 +139,24 @@ class restController extends nodefony.Controller {
    *    @Method ({"PUT"})
    *    @Route ( "/{username}",name="api-user-put")
    */
-  async putAction(username) {
+  async putAction (username) {
     this.checkAuthorisation(this.query.username, this.query);
-    const user = this.getUser()
+    const user = this.getUser();
     return this.usersService.findOne(username, user)
       .then(async (myuser) => {
         if (myuser) {
           if (this.query.password) {
-            let confirm = false
+            let confirm = false;
             if (this.query.confirm) {
               if (this.query.password !== this.query.confirm) {
-                throw new Error(`Bad confirm password`);
+                throw new Error("Bad confirm password");
               }
               delete this.query.confirm;
               confirm = true;
             }
             if (this.query["old-password"]) {
-              let encoder = this.getNodefonyEntity("user").getEncoder();
-              let check = await encoder.isPasswordValid(this.query["old-password"], myuser.password);
+              const encoder = this.getNodefonyEntity("user").getEncoder();
+              const check = await encoder.isPasswordValid(this.query["old-password"], myuser.password);
               if (!check) {
                 throw new Error(`User ${username} bad passport`);
               }
@@ -172,9 +169,9 @@ class restController extends nodefony.Controller {
           }
           return this.usersService.update(myuser, this.query, user)
             .then(async (res) => {
-              let message = `Update User ${this.query.username} OK`;
+              const message = `Update User ${this.query.username} OK`;
               this.log(message, "INFO");
-              let currentUser = this.getUser();
+              const currentUser = this.getUser();
               if (this.session && myuser.username === currentUser.username) {
                 if (this.query.username !== myuser.username) {
                   currentUser.username = this.query.username;
@@ -183,7 +180,7 @@ class restController extends nodefony.Controller {
                   this.session.set("lang", this.query.lang);
                 }
               }
-              let newUser = await this.usersService.findOne(this.query.username, user);
+              const newUser = await this.usersService.findOne(this.query.username, user);
               delete newUser.password;
               delete newUser["2fa-token"];
               return this.api.render({
@@ -204,8 +201,8 @@ class restController extends nodefony.Controller {
    *    @Method ({"PATCH"})
    *    @Route ( "/{username}",name="api-user-patch")
    */
-   // TODO
-  async patchAction(username) {
+  // TODO
+  async patchAction (username) {
     this.log(username);
   }
 
@@ -213,16 +210,16 @@ class restController extends nodefony.Controller {
    *    @Method ({"DELETE"})
    *    @Route ( "/{username}",name="api-user-delete")
    */
-  async deleteAction(username) {
+  async deleteAction (username) {
     try {
       this.checkAuthorisation(this.query.username, this.query);
-      const user = this.getUser()
+      const user = this.getUser();
       return this.usersService.delete(username, user)
         .then((user) => {
           delete user.password;
           delete user["2fa-token"];
           return this.api.render({
-            user: user
+            user
           });
         })
         .catch((error) => {
@@ -237,12 +234,11 @@ class restController extends nodefony.Controller {
    *    @Method ({"TRACE"})
    *
    */
-  traceAction() {
+  traceAction () {
     return this.renderResponse(JSON.stringify(this.request.request.headers, null, " "), 200, {
       "Content-Type": "message/http"
     });
   }
-
 }
 
 module.exports = restController;

package/cli/builder/bundles/users-bundle/controller/loginController.js

@@ -1,6 +1,5 @@
 class loginController extends nodefony.controller {
-
-  constructor(container, context) {
+  constructor (container, context) {
     super(container, context);
     this.startSession();
   }
@@ -12,7 +11,7 @@ class loginController extends nodefony.controller {
    *      name="secure-login"
    *    )
    */
-  secureAction() {
+  secureAction () {
     return this.loginCheckAction();
   }
 
@@ -23,8 +22,8 @@ class loginController extends nodefony.controller {
    *      name="login"
    *    )
    */
-  loginAction() {
-    let token = this.getToken();
+  loginAction () {
+    const token = this.getToken();
     if (this.session && token) {
       return this.redirectToRoute("home");
     }
@@ -38,39 +37,38 @@ class loginController extends nodefony.controller {
    *      name="login-check"
    *    )
    */
-  loginCheckAction(lastUrl) {
-    //console.log(lastUrl)
+  loginCheckAction (lastUrl) {
+    // console.log(lastUrl)
     try {
-      let token = this.getToken();
+      const token = this.getToken();
       if (token.user && token.user.enabled) {
         if (lastUrl) {
           return this.redirect(lastUrl);
         }
         return this.redirectToRoute("home");
-      } else {
-        this.session.invalidate();
-        let error = null;
-        if (token && !token.user.enabled) {
-          error = new nodefony.securityError(
-            `User ${token.user.username} Disabled `,
-            401,
-            this.context.security,
-            this.context
-          );
-          this.log(error, "ERROR");
-          this.setFlashBag("error", error.message);
-        } else {
-          error = new nodefony.securityError(
-            `No Auth Token`,
-            401,
-            this.context.security,
-            this.context
-          );
-        }
+      }
+      this.session.invalidate();
+      let error = null;
+      if (token && !token.user.enabled) {
+        error = new nodefony.securityError(
+          `User ${token.user.username} Disabled `,
+          401,
+          this.context.security,
+          this.context
+        );
         this.log(error, "ERROR");
         this.setFlashBag("error", error.message);
-        return this.redirectToRoute("login");
+      } else {
+        error = new nodefony.securityError(
+          "No Auth Token",
+          401,
+          this.context.security,
+          this.context
+        );
       }
+      this.log(error, "ERROR");
+      this.setFlashBag("error", error.message);
+      return this.redirectToRoute("login");
     } catch (e) {
       throw e;
     }
@@ -80,16 +78,14 @@ class loginController extends nodefony.controller {
    *    @Method ({ "GET"})
    *    @Route ("/logout", name="logout")
    */
-  logoutAction() {
+  logoutAction () {
     return this.logout()
-      .then(() => {
-        return this.redirectToRoute("login");
-      }).catch((e) => {
+      .then(() => this.redirectToRoute("login"))
+      .catch((e) => {
         this.log(e, "ERROR");
         return this.redirectToRoute("login");
       });
   }
-
 }
 
 module.exports = loginController;

package/cli/builder/bundles/users-bundle/controller/usersController.js

@@ -2,8 +2,7 @@
  *    @Route ("/users")
  */
 class usersController extends nodefony.Controller {
-
-  constructor(container, context) {
+  constructor (container, context) {
     super(container, context);
     // start session
     this.startSession();
@@ -15,12 +14,10 @@ class usersController extends nodefony.Controller {
     this.translation = this.get("translation");
     this.usersService = this.get("users");
 
-    this.on("onError", (error, route, variables) => {
-      return this.onError(error, route, variables);
-    });
+    this.on("onError", (error, route, variables) => this.onError(error, route, variables));
   }
 
-  onError(e, route, variables) {
+  onError (e, route, variables) {
     try {
       if (e.errorType === "csrfError") {
         this.setFlashBag("error", e.message);
@@ -35,7 +32,7 @@ class usersController extends nodefony.Controller {
   /**
    *
    */
-  headerAction() {
+  headerAction () {
     return this.render("users::header.html.twig", {
       langs: this.get("translation").getLangs(),
       locale: this.getLocale(),
@@ -46,10 +43,10 @@ class usersController extends nodefony.Controller {
   /**
    *
    */
-  footerAction() {
-    let version = this.kernel.settings.version;
+  footerAction () {
+    const {version} = this.kernel.settings;
     return this.render("users::footer.html.twig", {
-      version: version,
+      version,
       year: new Date().getFullYear()
     });
   }
@@ -59,17 +56,17 @@ class usersController extends nodefony.Controller {
    *    @Method ({ "GET", "POST"})
    *    @Route ("/lang", name="lang")
    */
-  langAction() {
+  langAction () {
     if (this.query.language) {
       if (this.session) {
         this.session.set("lang", this.query.language);
-        let route = this.session.getMetaBag("lastRoute");
+        const route = this.session.getMetaBag("lastRoute");
         if (route) {
           return this.redirect(this.url(route));
         }
       }
     }
-    let referer = this.request.getHeader("referer");
+    const referer = this.request.getHeader("referer");
     if (referer) {
       return this.redirect(referer);
     }
@@ -81,11 +78,11 @@ class usersController extends nodefony.Controller {
    *    @Route ( "/create", name="nodefony-user-create")
    *
    */
-  createAction() {
+  createAction () {
     const user = this.getUser();
     switch (this.method) {
     case "GET":
-      let size = Object.keys(this.queryGet).length;
+      const size = Object.keys(this.queryGet).length;
       if (size) {
         if (this.queryGet.roles) {
           this.queryGet.roles = this.queryGet.roles.split(",");
@@ -102,10 +99,10 @@ class usersController extends nodefony.Controller {
       // FORM DATA
       let error = null;
       if (!this.query.password || !this.query.confirm) {
-        error = new Error(`Password can't be empty`);
+        error = new Error("Password can't be empty");
       }
       if (this.query.password !== this.query.confirm) {
-        error = new Error(`Bad confirm password`);
+        error = new Error("Bad confirm password");
       }
       if (error) {
         this.setFlashBag("error", error.message);
@@ -122,13 +119,13 @@ class usersController extends nodefony.Controller {
       this.checkAuthorisation(null, this.query);
       return this.usersService.create(this.query, user)
         .then((user) => {
-          let message = `${this.translate("added", "users")} ${user.username}`;
+          const message = `${this.translate("added", "users")} ${user.username}`;
           this.setFlashBag("info", message);
           this.log(message, "INFO");
           return this.redirectToRoute("home");
         })
         .catch((error) => {
-          //console.log(error)
+          // console.log(error)
           this.log(error, "ERROR");
           this.setFlashBag("error", error.message);
           delete this.query.password;
@@ -146,8 +143,8 @@ class usersController extends nodefony.Controller {
    *    @Method ({"GET","POST"})
    *    @Route ( "/update/{username}", name="nodefony-user-update")
    */
-  updateAction(username) {
-    let user = this.getUser()
+  updateAction (username) {
+    const user = this.getUser();
     this.checkAuthorisation(username, this.query);
     switch (this.method) {
     case "GET":
@@ -161,7 +158,8 @@ class usersController extends nodefony.Controller {
             });
           }
           throw new Error(`User ${username} not found`);
-        }).catch(e => {
+        })
+        .catch((e) => {
           throw e;
         });
     case "POST":
@@ -171,7 +169,7 @@ class usersController extends nodefony.Controller {
             if (nodefony.typeOf(this.query.roles) === "string") {
               this.query.roles = [this.query.roles];
             }
-            let value = {
+            const value = {
               username: this.query.username || null,
               email: this.query.email,
               name: this.query.name,
@@ -184,29 +182,27 @@ class usersController extends nodefony.Controller {
             if (this.query.password && this.isGranted("ROLE_ADMIN")) {
               let error = null;
               if (this.query.password && this.query.password !== this.query.confirm) {
-                error = new Error(`Bad confirm password`);
+                error = new Error("Bad confirm password");
               }
               if (error) {
                 throw error;
               }
               value.password = this.query.password;
-            } else {
-              if (this.query.password && this.query["old-passwd"]) {
-                let encoder = this.getNodefonyEntity("user").getEncoder();
-                let check = await encoder.isPasswordValid(this.query["old-passwd"], myuser.password);
-                if (check) {
-                  value.password = this.query.password;
-                } else {
-                  throw new Error(`User ${username} bad passport`);
-                }
+            } else if (this.query.password && this.query["old-passwd"]) {
+              const encoder = this.getNodefonyEntity("user").getEncoder();
+              const check = await encoder.isPasswordValid(this.query["old-passwd"], myuser.password);
+              if (check) {
+                value.password = this.query.password;
+              } else {
+                throw new Error(`User ${username} bad passport`);
               }
             }
             return this.usersService.update(myuser, value, user)
               .then(() => {
-                let message = `Update User ${this.query.username} OK`;
+                const message = `Update User ${this.query.username} OK`;
                 this.setFlashBag("info", message);
                 this.log(message, "INFO");
-                let currentUser = this.getUser();
+                const currentUser = this.getUser();
                 if (myuser.username === currentUser.username) {
                   if (this.query.username !== myuser.username) {
                     currentUser.username = this.query.username;
@@ -214,11 +210,9 @@ class usersController extends nodefony.Controller {
                   if (this.getLocale() !== this.query.lang) {
                     this.session.set("lang", this.query.lang);
                   }
-                  let token = this.getToken();
+                  const token = this.getToken();
                   return token.refreshToken(this.context)
-                    .then(() => {
-                      return this.redirectToRoute("home");
-                    })
+                    .then(() => this.redirectToRoute("home"))
                     .catch((error) => {
                       throw error;
                     });
@@ -232,7 +226,7 @@ class usersController extends nodefony.Controller {
           this.setFlashBag("error", error.message);
           this.log(error, "ERROR");
           return this.redirectToRoute("nodefony-user-update", {
-            username: username
+            username
           });
         });
     default:
@@ -245,25 +239,26 @@ class usersController extends nodefony.Controller {
    *    @Route ("/delete/{username}", name="nodefony-user-delete")
    *
    */
-  deleteAction(username) {
-    let user = this.getUser();
+  deleteAction (username) {
+    const user = this.getUser();
     this.checkAuthorisation(username);
     if (username) {
       return this.usersService.delete(username, user)
         .then((result) => {
-          let message = `Delete User ${result.username} OK`;
+          const message = `Delete User ${result.username} OK`;
           this.setFlashBag("info", message);
           if (this.getUser().username === username) {
             this.session.invalidate();
           }
           return this.redirectToRoute("nodefony-user");
-        }).catch(e => {
+        })
+        .catch((e) => {
           this.log(e, "ERROR");
           this.setFlashBag("error", e.message);
           return this.redirectToRoute("nodefony-user");
         });
     }
-    let error = new nodefony.Error(`User ${username} not found`, this.context);
+    const error = new nodefony.Error(`User ${username} not found`, this.context);
     this.setFlashBag("error", error.message);
     this.log(error, "ERROR");
     return this.redirectToRoute("nodefony-user");
@@ -274,8 +269,8 @@ class usersController extends nodefony.Controller {
    *    @Route ( "/{username}",name="nodefony-user",defaults={"username" = ""})
    *
    */
-  userAction(username) {
-    let user = this.getUser();
+  userAction (username) {
+    const user = this.getUser();
     if (username) {
       switch (this.method) {
       case "PUT":
@@ -283,7 +278,7 @@ class usersController extends nodefony.Controller {
       case "DELETE":
         return this.deleteAction(username);
       case "GET":
-        //const user = new User(this);
+        // const user = new User(this);
         return this.usersService.findOne(username, user)
           .then((result) => {
             if (result) {
@@ -292,7 +287,8 @@ class usersController extends nodefony.Controller {
               });
             }
             return this.render("users:users:readUsers.html.twig");
-          }).catch(e => {
+          })
+          .catch((e) => {
             throw e;
           });
       }
@@ -301,21 +297,20 @@ class usersController extends nodefony.Controller {
     case "POST":
       return this.createAction();
     default:
-      return this.usersService.find(this.query,{}, user)
-        .then((result) => {
-          return this.render("users:users:readUsers.html.twig", {
-            users: result.rows
-          });
-        }).catch(e => {
+      return this.usersService.find(this.query, {}, user)
+        .then((result) => this.render("users:users:readUsers.html.twig", {
+          users: result.rows
+        }))
+        .catch((e) => {
           throw e;
         });
     }
   }
 
-  checkAuthorisation(username, query) {
-    let granted = this.is_granted("ROLE_ADMIN");
+  checkAuthorisation (username, query) {
+    const granted = this.is_granted("ROLE_ADMIN");
     if (username) {
-      let user = this.getUser();
+      const user = this.getUser();
       if (!user) {
         throw new nodefony.authorizationError("Unauthorized", 401, this.context);
       }
@@ -326,13 +321,12 @@ class usersController extends nodefony.Controller {
       }
     }
     if (query && query.role && query.role.length) {
-      if (query.role.indexOf("ROLE_ADMIN") >= 0 && (!granted)) {
+      if (query.role.indexOf("ROLE_ADMIN") >= 0 && !granted) {
         throw new nodefony.authorizationError("Unauthorized Role", 401, this.context);
       }
     }
     return true;
   }
-
 }
 
 module.exports = usersController;