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

package/cli/builder/bundles/users-bundle/Resources/swagger/openapi/users.js

@@ -84,21 +84,21 @@ const openApi = {
           required: true
         }],
         responses: {
-          '200': {
+          "200": {
             description: "User Description",
             content: {
               "application/json": {
                 schema: {
                   allOf: [{
                     $ref: "#/components/schemas/users-api"
-                }, {
+                  }, {
                     type: "object",
                     properties: {
                       result: {
                         $ref: "#/components/schemas/user"
-                      },
+                      }
                     }
-                }]
+                  }]
                 }
               }
             }
@@ -114,7 +114,7 @@ const openApi = {
         summary: "Get OpenAPI (OAS 3.0) configuration",
         tags: ["users"],
         responses: {
-          '200': {
+          "200": {
             description: "OpenAPI (OAS 3.0) configuration",
             content: {
               "application/json": {}
@@ -140,7 +140,7 @@ const openApi = {
           required: false
         }],
         responses: {
-          '200': {
+          "200": {
             description: "List or filter Users",
             content: {
               "application/json": {
@@ -164,7 +164,7 @@ const openApi = {
                             }
                           }
                         }
-                      },
+                      }
                     }
                   }]
                 }
@@ -179,24 +179,24 @@ const openApi = {
       post: {
         summary: "Create user",
         requestBody: {
-          description: `Parameters **users** schema`,
+          description: "Parameters **users** schema",
           required: true,
           content: {
             "application/json": {
               schema: {
-                $ref: '#/components/schemas/user'
+                $ref: "#/components/schemas/user"
               }
             },
             "application/x-www-form-urlencoded": {
               schema: {
-                $ref: '#/components/schemas/user'
+                $ref: "#/components/schemas/user"
               }
             }
-          },
+          }
         },
         tags: ["users"],
         responses: {
-          '200': {
+          "200": {
             description: "get headers request"
           },
           default: {
@@ -211,7 +211,7 @@ const openApi = {
           jwtAuth: ""
         }],
         responses: {
-          '200': {
+          "200": {
             description: "get headers request"
           },
           default: {
@@ -219,7 +219,7 @@ const openApi = {
           }
         }
       }
-    },
+    }
   },
 
   tags: [{

package/cli/builder/bundles/users-bundle/controller/api/graphql/graphqlController.js

@@ -2,12 +2,11 @@
  *    @Route ("/api/graphql/users")
  *
  */
-const userType = require(path.resolve(__dirname, "userType.js"));
+const userType = require(path.resolve(__dirname, "usertype.js"));
 const userResolver = require(path.resolve(__dirname, "userResolver.js"));
 
 module.exports = class graphqlController extends nodefony.Controller {
-
-  constructor(container, context) {
+  constructor (container, context) {
     super(container, context);
     // service entity
     this.usersService = this.get("users");
@@ -26,13 +25,12 @@ module.exports = class graphqlController extends nodefony.Controller {
    *    @Method ({"GET", "POST","OPTIONS"})
    *    @Route ( "*",name="api-user-graphql")
    */
-  graphqlAction() {
+  graphqlAction () {
     try {
       return this.api.query(this.query.query, this.query.variables, this.query.operationName)
-        .then((data) => {
-          return this.api.render(data);
-        }).catch((e) => {
-          this.api.logger(this.query.query, "WARNING")
+        .then((data) => this.api.render(data))
+        .catch((e) => {
+          this.api.logger(this.query.query, "WARNING");
           this.api.logger(e, "ERROR");
           return this.api.renderError(e, 400);
         });
@@ -41,18 +39,18 @@ module.exports = class graphqlController extends nodefony.Controller {
     }
   }
 
-  static schema(context) {
-    return  nodefony.api.Graphql.makeExecutableSchema({
+  static schema (context) {
+    return nodefony.api.Graphql.makeExecutableSchema({
       typeDefs: graphqlController.types(context),
       resolvers: graphqlController.resolvers(context)
     });
   }
 
-  static types(context) {
+  static types (context) {
     return [userType];
   }
-  static resolvers(context) {
-    return [userResolver]
-  }
 
-}
+  static resolvers (context) {
+    return [userResolver];
+  }
+};

package/cli/builder/bundles/users-bundle/controller/api/graphql/userResolver.js

@@ -1,33 +1,33 @@
 module.exports = {
   Query: {
     //  provides all functions for each API endpoint
-    async user(obj, field, context, info) {
-      const user = context.getUser()
+    async user (obj, field, context, info) {
+      const user = context.getUser();
       const usersService = context.get("users");
       return await usersService.findOne(field.username, user);
     },
 
-    async users(obj, field, context, info) {
-      const user = context.getUser()
+    async users (obj, field, context, info) {
+      const user = context.getUser();
       const usersService = context.get("users");
-      let res = await usersService.find({}, {}, user);
+      const res = await usersService.find({}, {}, user);
       return res.rows;
     }
   },
   Mutation: {
-    async addUser(obj, field, context, info) {
+    async addUser (obj, field, context, info) {
       const {
         input
       } = field;
-      const user = context.getUser()
+      const user = context.getUser();
       const usersService = context.get("users");
       let myuser = null;
       let error = null;
       if (!input.password || !input.confirm) {
-        error = new Error(`Password can't be empty`);
+        error = new Error("Password can't be empty");
       }
       if (input.password !== input.confirm) {
-        error = new Error(`Bad confirm password`);
+        error = new Error("Bad confirm password");
       }
       if (error) {
         context.logger(error, "ERROR");
@@ -38,38 +38,38 @@ module.exports = {
         if (myuser) {
           delete myuser.password;
           delete myuser["2fa-token"];
-          return myuser
+          return myuser;
         }
-        throw new nodefony.Error("user not create",400)
+        throw new nodefony.Error("user not create", 400);
       } catch (e) {
         context.logger(e, "ERROR");
-        throw new nodefony.Error(e,400)
+        throw new nodefony.Error(e, 400);
       }
     },
 
-    async updateUser(obj, field, context, info) {
-      const user = context.getUser()
+    async updateUser (obj, field, context, info) {
+      const user = context.getUser();
       const usersService = context.get("users");
       const orm = context.kernel.getORM();
       const {
         input
       } = field;
-      const username = input.username
+      const {username} = input;
       return usersService.findOne(username, user)
         .then(async (myuser) => {
           if (myuser) {
             if (input.password) {
-              let confirm = false
+              let confirm = false;
               if (input.confirm) {
                 if (input.password !== input.confirm) {
-                  throw new Error(`Bad confirm password`);
+                  throw new Error("Bad confirm password");
                 }
                 delete input.confirm;
                 confirm = true;
               }
               if (input["old-password"]) {
-                let encoder = orm.getNodefonyEntity("user").getEncoder();
-                let check = await encoder.isPasswordValid(input["old-password"], myuser.password);
+                const encoder = orm.getNodefonyEntity("user").getEncoder();
+                const check = await encoder.isPasswordValid(input["old-password"], myuser.password);
                 if (!check) {
                   throw new Error(`User ${username} bad passport`);
                 }
@@ -82,7 +82,7 @@ module.exports = {
             }
             return usersService.update(myuser, input, user)
               .then(async (res) => {
-                let message = `Update User ${input.username} OK`;
+                const message = `Update User ${input.username} OK`;
                 context.log(message, "INFO");
                 if (context.session && myuser.username === user.username) {
                   if (input.username !== myuser.username) {
@@ -92,30 +92,30 @@ module.exports = {
                     context.session.set("lang", input.lang);
                   }
                 }
-                let newUser = await usersService.findOne(input.username, user);
+                const newUser = await usersService.findOne(input.username, user);
                 delete newUser.password;
                 delete newUser["2fa-token"];
-                return newUser
+                return newUser;
               });
           }
           throw new Error(`User ${username} not found`);
-        })
+        });
     },
 
-    async deleteUser(obj, field, context, info){
+    async deleteUser (obj, field, context, info) {
       const {
         username
       } = field;
-      const user = context.getUser()
+      const user = context.getUser();
       const usersService = context.get("users");
-      return usersService.delete(username, user)
+      return usersService.delete(username, user);
     },
 
-    async deleteUsers(obj, field, context, info){
+    async deleteUsers (obj, field, context, info) {
       const {
         users
       } = field;
-      return []
+      return [];
     }
   }
-}
+};

package/cli/builder/bundles/users-bundle/controller/api/graphql/usertype.js

@@ -53,6 +53,6 @@ const type = `
     deleteUser(username:String!): User!
     deleteUsers(users:Array!): [User]!
   }
-`
+`;
 
-module.exports = type
+module.exports = type;

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

@@ -2,8 +2,7 @@
  *    @Route ("/api/jwt")
  */
 class loginApiController extends nodefony.Controller {
-
-  constructor(container, context) {
+  constructor (container, context) {
     super(container, context);
     this.security = this.get("security");
     this.jwtFactory = this.security.getFactory("jwt");
@@ -26,7 +25,7 @@ class loginApiController extends nodefony.Controller {
    *    )
    *    @Firewall ({bypass:true})
    */
-  swaggerAction() {
+  swaggerAction () {
     return this.optionsAction();
   }
 
@@ -34,9 +33,9 @@ class loginApiController extends nodefony.Controller {
    *    @Method ({"OPTIONS"})
    *    @Route ( "",name="api-login-options",)
    */
-  optionsAction() {
+  optionsAction () {
     try {
-      let openApiConfig = require(path.resolve(this.bundle.path, "Resources", "swagger", "openapi", "login.js"));
+      const openApiConfig = require(path.resolve(this.bundle.path, "Resources", "swagger", "openapi", "login.js"));
       return this.api.renderSchema(openApiConfig, this.usersService.entity);
     } catch (e) {
       return this.api.renderError(e, 400);
@@ -50,7 +49,7 @@ class loginApiController extends nodefony.Controller {
    *      name="api-login-jwt"
    *    )
    */
-  async loginAction() {
+  async loginAction () {
     if (!this.context.token) {
       return this.createException("No Auth Token", 401);
     }
@@ -61,15 +60,17 @@ class loginApiController extends nodefony.Controller {
       }
       const token = this.jwtFactory.generateJwtToken(
         this.context.token.serialize(),
-        this.jwtSettings.token);
+        this.jwtSettings.token
+      );
       const refreshToken = await this.jwtFactory.generateJwtRefreshToken(
         this.context.token.user.username,
         token,
-        this.jwtSettings.refreshToken);
+        this.jwtSettings.refreshToken
+      );
       return this.api.render({
         decodedToken: this.jwtFactory.decodeJwtToken(token),
-        token: token,
-        refreshToken: refreshToken
+        token,
+        refreshToken
       });
     } catch (e) {
       throw this.createException(e, 401);
@@ -84,7 +85,7 @@ class loginApiController extends nodefony.Controller {
    *    )
    *    @Firewall ({bypass:true})
    */
-  async tokenAction() {
+  async tokenAction () {
     try {
       // get refreshToken from request
       let sessionToken = null;
@@ -98,13 +99,13 @@ class loginApiController extends nodefony.Controller {
         throw this.createSecurityException("refreshToken parameter Not found");
       }
       // verify refreshToken expired
-      let refresh = await this.jwtFactory.verifyRefreshToken(refreshToken)
+      const refresh = await this.jwtFactory.verifyRefreshToken(refreshToken)
         .catch((e) => {
           throw this.createSecurityException(e);
         });
-      const username = refresh.data.username;
+      const {username} = refresh.data;
       if (!username) {
-        throw this.createSecurityException(`username not valid`);
+        throw this.createSecurityException("username not valid");
       }
       const dtuser = await this.usersService.findOne(username);
       // controll user enabled
@@ -116,10 +117,10 @@ class loginApiController extends nodefony.Controller {
         await this.jwtFactory.updateJwtRefreshToken(dtuser.username, token, refreshToken);
         return this.api.render({
           decodedToken: this.jwtFactory.decodeJwtToken(token),
-          token: token
+          token
         });
       }
-      throw this.createSecurityException(`User not valid`);
+      throw this.createSecurityException("User not valid");
     } catch (e) {
       throw this.createException(e);
     }
@@ -131,9 +132,8 @@ class loginApiController extends nodefony.Controller {
    *      "/refresh",
    *      name="api-login-jwt-refresh"
    *    )
-   *    @Firewall ({bypass:true})
    */
-  async refreshAction() {
+  async refreshAction () {
     // get refreshToken from request
     let sessionToken = null;
     let sessionRefreshToken = null;
@@ -150,29 +150,30 @@ class loginApiController extends nodefony.Controller {
       throw this.createSecurityException("refreshToken or token parameter Not found");
     }
     // verify refreshToken expired
-    let refresh = await this.jwtFactory.verifyRefreshToken(refreshToken)
+    const refresh = await this.jwtFactory.verifyRefreshToken(refreshToken)
       .catch((e) => {
         throw this.createSecurityException(e);
       });
-    const username = refresh.data.username;
+    const {username} = refresh.data;
     if (!username) {
-      throw this.createSecurityException(`username not valid`);
+      throw this.createSecurityException("username not valid");
     }
     const dtuser = await this.usersService.findOne(username);
     // controll user enabled
     if (dtuser && dtuser.enabled) {
-      await this.jwtFactory.truncateJwtToken(this.context.token.user.username)
+      await this.jwtFactory.truncateJwtToken(this.context.token.user.username);
       const refreshToken = await this.jwtFactory.generateJwtRefreshToken(
         this.context.token.user.username,
         token,
-        this.jwtSettings.refreshToken);
+        this.jwtSettings.refreshToken
+      );
       return this.api.render({
         decodedToken: this.jwtFactory.decodeJwtToken(token),
-        token: token,
-        refreshToken: refreshToken
+        token,
+        refreshToken
       });
     }
-    throw this.createSecurityException(`User not valid`);
+    throw this.createSecurityException("User not valid");
   }
 
   /**
@@ -182,9 +183,9 @@ class loginApiController extends nodefony.Controller {
    *      name="api-login-jwt-truncate"
    *    )
    */
-  async truncateAction() {
+  async truncateAction () {
     try {
-      let res = await this.jwtFactory.truncateJwtToken(this.query.username);
+      const res = await this.jwtFactory.truncateJwtToken(this.query.username);
       return this.api.render({
         nbDeleted: res
       });
@@ -197,15 +198,12 @@ class loginApiController extends nodefony.Controller {
    *    @Method ({"POST"})
    *    @Route ("/logout", name="api-login-jwt-logout")
    */
-  logoutAction() {
+  logoutAction () {
     return this.logout()
-      .then(() => {
-        return this.api.render({
-          logout: "ok"
-        });
-      }).catch((e) => {
-        return this.api.render(e, 500);
-      });
+      .then(() => this.api.render({
+        logout: "ok"
+      }))
+      .catch((e) => this.api.render(e, 500));
   }
 }