nodefony 6.12.0 → 7.0.0-beta.2

package/README.md

@@ -416,7 +416,7 @@ You can find certificate authority (ca) here:
 #### Access to Secure App with URL : <https://localhost:5152>
 #### Access to App with URL : <http://localhost:5151>
 
-[![nodefony](https://raw.githubusercontent.com/nodefony/nodefony/master/src/nodefony/bundles/documentation-bundle/Resources/public/images/nodefony.png)](https://nodefony.net)
+[![nodefony](https://raw.githubusercontent.com/nodefony/nodefony/master/src/nodefony/bundles/monitoring-bundle/Resources/public/images/nodefony.png)](https://nodefony.net)
 
 ## <a name="configurations"></a>Framework Configurations
 
@@ -713,7 +713,7 @@ module.exports = webpackMerge(config, {
 
 Access to monitoring route with URL : <http://localhost:5151/nodefony>
 
-[![MONITORING](https://raw.githubusercontent.com/nodefony/nodefony/master/src/nodefony/doc/cluster.png)](https://nodefony.net/nodefony)
+[![MONITORING](https://raw.githubusercontent.com/nodefony/nodefony/master/src/nodefony/bundles/monitoring-bundle/Resources/public/images/monitor.png)](https://nodefony.net/nodefony)
 
 Monitoring in progress !!!
 

package/autoloader.es6

@@ -2,10 +2,11 @@ const vm = require("vm");
 const path = require("path");
 const Module = require("module");
 const fs = require('fs');
+const pm2 = require('pm2');
+//console.log(require.resolve("pm2"))
 const Nodefony = require(path.resolve(__dirname, "nodefony.es6"));
 
 module.exports = function () {
-
   // Create Context copy library in context  see load runInThisContext
   const context = vm.createContext(this);
 
@@ -25,17 +26,16 @@ module.exports = function () {
   //context.async = require('async');
   //context.nodedomain = require('domain');
   context.Promise = require('promise');
-  context.inquirer = require('inquirer');
+  //context.inquirer = require('inquirer');
   context.clc = require('cli-color');
   context.shell = require("shelljs");
   context.twig = require("twig");
   context.crypto = require("crypto");
   context.BlueBird = require("bluebird");
-  context.pm2 = require('pm2');
+  context.pm2 = pm2;
   //context.Rx = require("rxjs");
   const nodefony = new Nodefony(context);
 
-
   /**
    *  Nodefony autoloader
    *
@@ -173,7 +173,7 @@ module.exports = function () {
           delete Module._cache[filename];
         }
         console.error(e);
-        if(this.kernel){
+        if (this.kernel) {
           this.kernel.terminate(1);
         }
         throw e;
@@ -234,10 +234,12 @@ module.exports = function () {
     }
 
     autoloadEach(ele) {
-      let res = regJs.exec(ele.path)
-      if (res) {
-        this.load.call(this, ele.path);
-        this.log(ele.path, "DEBUG");
+      if (!ele.isDirectory()) {
+        let res = regJs.exec(ele.path)
+        if (res) {
+          this.load.call(this, ele.path);
+          this.log(ele.path, "DEBUG");
+        }
       }
     }
 

package/cli/builder/bundles/users-bundle/Resources/config/config.js

@@ -74,14 +74,10 @@ module.exports = {
   },
   jwt: {
     token: {
-      expiresIn: 900
+      expiresIn: 900 // seconds
     },
     refreshToken: {
-      expiresIn: 3600
+      expiresIn: 3600 // seconds
     }
-  },
-  swagger: require(path.resolve(__dirname, "..", "swagger", "config.js")),
-
-  graphiql: require(path.resolve(__dirname, "..", "graphiql", "config.js"))
-
+  }
 };

package/cli/builder/bundles/users-bundle/Resources/config/security.js

@@ -39,14 +39,7 @@ module.exports = {
     /**
      *  FIREWALL  Authorization
      */
-    access_control: [{
-      path: /^\/nodefony/,
-      roles: ["ROLE_MONITORING"],
-      requires_channel: "https",
-      /*allow_if: {
-        roles: ["ROLE_ADMIN", "ROLE_USER"]
-      }*/
-    }],
+    access_control: [],
 
     firewalls: {
       // SECURITY AREA  <passport-local>
@@ -74,7 +67,7 @@ module.exports = {
           usernameField: 'username',
           passwordField: 'passwd'
         },
-        stateless: true,
+        stateless: false,
         redirectHttps: true,
         crossDomain: cors
       },

package/cli/builder/bundles/users-bundle/Resources/config/webpack.config.js

@@ -29,9 +29,7 @@ module.exports = merge(config, {
   //context: context,
   target: "web",
   entry: {
-    users: ["./Resources/js/users.js"],
-    swagger: ["./Resources/swagger/swagger.js"],
-    graphiql: ["./Resources/graphiql/graphiql.jsx"]
+    users: ["./Resources/js/users.js"]
   },
   output: {
     path: public,

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

@@ -2,9 +2,10 @@
  *    @Route ("/api/graphql/users")
  *
  */
-const userSchema = require("./userSchema.js");
+const userType = require(path.resolve(__dirname, "userType.js"));
+const userResolver = require(path.resolve(__dirname, "userResolver.js"));
 
-class graphqlController extends nodefony.Controller {
+module.exports = class graphqlController extends nodefony.Controller {
 
   constructor(container, context) {
     super(container, context);
@@ -16,14 +17,14 @@ class graphqlController extends nodefony.Controller {
       version: this.bundle.version,
       description: "Nodefony Users graphql Api",
       basePath: "/api/graphql/users",
-      schema: userSchema
+      schema: graphqlController.schema(this.context),
+      rootValue: this
     }, this.context);
   }
 
   /**
    *    @Method ({"GET", "POST","OPTIONS"})
    *    @Route ( "*",name="api-user-graphql")
-   *    @Firewall ({bypass:true})
    */
   graphqlAction() {
     try {
@@ -31,6 +32,7 @@ class graphqlController extends nodefony.Controller {
         .then((data) => {
           return this.api.render(data);
         }).catch((e) => {
+          this.api.logger(this.query.query, "WARNING")
           this.api.logger(e, "ERROR");
           return this.api.renderError(e, 400);
         });
@@ -39,22 +41,18 @@ class graphqlController extends nodefony.Controller {
     }
   }
 
-  //  provides all functions for each API endpoint
-
-  async user(field) {
-    return await this.usersService.findOne(field.username);
+  static schema(context) {
+    return  nodefony.api.Graphql.makeExecutableSchema({
+      typeDefs: graphqlController.types(context),
+      resolvers: graphqlController.resolvers(context)
+    });
   }
 
-  async users() {
-    let res = await this.usersService.find();
-    return res.rows   ;
+  static types(context) {
+    return [userType];
   }
-
-  async addUser(field) {
-    let res = await this.usersService.create(field);
-    return res;
+  static resolvers(context) {
+    return [userResolver]
   }
 
 }
-
-module.exports = graphqlController;

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

@@ -0,0 +1,121 @@
+module.exports = {
+  Query: {
+    //  provides all functions for each API endpoint
+    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()
+      const usersService = context.get("users");
+      let res = await usersService.find({}, {}, user);
+      return res.rows;
+    }
+  },
+  Mutation: {
+    async addUser(obj, field, context, info) {
+      const {
+        input
+      } = field;
+      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`);
+      }
+      if (input.password !== input.confirm) {
+        error = new Error(`Bad confirm password`);
+      }
+      if (error) {
+        context.logger(error, "ERROR");
+        throw error;
+      }
+      try {
+        myuser = await usersService.create(input, user);
+        if (myuser) {
+          delete myuser.password;
+          delete myuser["2fa-token"];
+          return myuser
+        }
+        throw new nodefony.Error("user not create",400)
+      } catch (e) {
+        context.logger(e, "ERROR");
+        throw new nodefony.Error(e,400)
+      }
+    },
+
+    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
+      return usersService.findOne(username, user)
+        .then(async (myuser) => {
+          if (myuser) {
+            if (input.password) {
+              let confirm = false
+              if (input.confirm) {
+                if (input.password !== input.confirm) {
+                  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);
+                if (!check) {
+                  throw new Error(`User ${username} bad passport`);
+                }
+                delete input["old-password"];
+                confirm = true;
+              }
+              if (!confirm) {
+                throw new Error(`User ${username} no confirm passport`);
+              }
+            }
+            return usersService.update(myuser, input, user)
+              .then(async (res) => {
+                let message = `Update User ${input.username} OK`;
+                context.log(message, "INFO");
+                if (context.session && myuser.username === user.username) {
+                  if (input.username !== myuser.username) {
+                    user.username = input.username;
+                  }
+                  if (context.locale !== input.lang) {
+                    context.session.set("lang", input.lang);
+                  }
+                }
+                let newUser = await usersService.findOne(input.username, user);
+                delete newUser.password;
+                delete newUser["2fa-token"];
+                return newUser
+              });
+          }
+          throw new Error(`User ${username} not found`);
+        })
+    },
+
+    async deleteUser(obj, field, context, info){
+      const {
+        username
+      } = field;
+      const user = context.getUser()
+      const usersService = context.get("users");
+      return usersService.delete(username, user)
+    },
+
+    async deleteUsers(obj, field, context, info){
+      const {
+        users
+      } = field;
+      return []
+    }
+  }
+}

package/cli/builder/bundles/users-bundle/controller/api/graphql/{userSchema.js → usertype.js}

@@ -1,29 +1,5 @@
-/**
-*    query test {
-*      user(username: "admin") {
-*        username
-*        surname
-*        name
-*      }
-*      users {
-*        username
-*        name
-*        surname
-*        updatedAt
-*        roles
-*      }
-*    }
-*
-*    mutation addUser {
-*      addUser(username: "Jon", email: "Doe@foo.fr", password:"mypass") {
-*        username
-*        email
-*        name
-*        role  s
-*      }
-*    }
-*/
-const schema = `
+const type = `
+
   scalar Date
   scalar Url
   scalar Array
@@ -46,6 +22,24 @@ const schema = `
     roles : Array
   }
 
+  input UserInput {
+    username: String!
+    surname: String
+    name: String
+    enabled: Boolean
+    password: String
+    confirm: String
+    userNonExpired: Boolean
+    credentialsNonExpired : Boolean
+    accountNonLocked: Boolean
+    email : String!
+    lang : String
+    gender: String
+    url : Url
+    image: String
+    roles : Array
+  }
+
   # the schema allows the following query:
   type Query {
     user(username: String!): User
@@ -54,8 +48,11 @@ const schema = `
 
   # this schema allows the following mutation:
   type Mutation {
-    addUser(username: String!, email: String!, password: String!): User
+    addUser(input: UserInput!): User!
+    updateUser(username:String!, input: UserInput!): User!
+    deleteUser(username:String!): User!
+    deleteUsers(users:Array!): [User]!
   }
-`;
+`
 
-module.exports = nodefony.graphql.buildSchema(schema);
+module.exports = type

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

@@ -33,7 +33,6 @@ class loginApiController extends nodefony.Controller {
   /**
    *    @Method ({"OPTIONS"})
    *    @Route ( "",name="api-login-options",)
-   *    @Firewall ({bypass:true})
    */
   optionsAction() {
     try {
@@ -132,7 +131,7 @@ class loginApiController extends nodefony.Controller {
    *      "/refresh",
    *      name="api-login-jwt-refresh"
    *    )
-   *
+   *    @Firewall ({bypass:true})
    */
   async refreshAction() {
     // get refreshToken from request

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

@@ -71,13 +71,14 @@ class restController extends nodefony.Controller {
    */
   async getAction(username) {
     let result = null;
+    const user = this.getUser();
     try {
       if (username) {
-        result = await this.usersService.findOne(username, this.query);
+        result = await this.usersService.findOne(username, this.query, user);
         delete result.password;
         delete result["2fa-token"];
       } else {
-        result = await this.usersService.find(this.query.query, this.query);
+        result = await this.usersService.find(this.query.query, this.query, user);
         result.rows.map((user) => {
           delete user.password;
           delete user["2fa-token"];
@@ -102,7 +103,7 @@ class restController extends nodefony.Controller {
    *    @Route ( "",name="api-users-post")
    */
   async postAction() {
-    let user = null;
+    let myuser = null;
     let error = null;
     if (!this.query.password || !this.query.confirm) {
       error = new Error(`Password can't be empty`);
@@ -116,13 +117,14 @@ class restController extends nodefony.Controller {
     }
     try {
       this.checkAuthorisation(null, this.query);
-      user = await this.usersService.create(this.query);
-      if (user) {
-        delete user.password;
-        delete user["2fa-token"];
+      const user = this.getUser()
+      myuser = await this.usersService.create(this.query, user);
+      if (myuser) {
+        delete myuser.password;
+        delete myuser["2fa-token"];
         let res = {
           query: this.query,
-          user: user
+          user: myuser
         };
         return this.api.render(res);
       }
@@ -134,7 +136,6 @@ class restController extends nodefony.Controller {
       this.log(e, "ERROR");
       return this.api.renderError(e, 400);
     }
-
   }
 
   /**
@@ -143,7 +144,8 @@ class restController extends nodefony.Controller {
    */
   async putAction(username) {
     this.checkAuthorisation(this.query.username, this.query);
-    return this.usersService.findOne(username)
+    const user = this.getUser()
+    return this.usersService.findOne(username, user)
       .then(async (myuser) => {
         if (myuser) {
           if (this.query.password) {
@@ -168,8 +170,8 @@ class restController extends nodefony.Controller {
               throw new Error(`User ${username} no confirm passport`);
             }
           }
-          return this.usersService.update(myuser, this.query)
-            .then(async (user) => {
+          return this.usersService.update(myuser, this.query, user)
+            .then(async (res) => {
               let message = `Update User ${this.query.username} OK`;
               this.log(message, "INFO");
               let currentUser = this.getUser();
@@ -181,7 +183,7 @@ class restController extends nodefony.Controller {
                   this.session.set("lang", this.query.lang);
                 }
               }
-              let newUser = await this.usersService.findOne(this.query.username);
+              let newUser = await this.usersService.findOne(this.query.username, user);
               delete newUser.password;
               delete newUser["2fa-token"];
               return this.api.render({
@@ -202,9 +204,9 @@ class restController extends nodefony.Controller {
    *    @Method ({"PATCH"})
    *    @Route ( "/{username}",name="api-user-patch")
    */
+   // TODO
   async patchAction(username) {
     this.log(username);
-
   }
 
   /**
@@ -214,7 +216,8 @@ class restController extends nodefony.Controller {
   async deleteAction(username) {
     try {
       this.checkAuthorisation(this.query.username, this.query);
-      return this.usersService.delete(username)
+      const user = this.getUser()
+      return this.usersService.delete(username, user)
         .then((user) => {
           delete user.password;
           delete user["2fa-token"];

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

@@ -82,6 +82,7 @@ class usersController extends nodefony.Controller {
    *
    */
   createAction() {
+    const user = this.getUser();
     switch (this.method) {
     case "GET":
       let size = Object.keys(this.queryGet).length;
@@ -119,7 +120,7 @@ class usersController extends nodefony.Controller {
         this.query.roles = [this.query.roles];
       }
       this.checkAuthorisation(null, this.query);
-      return this.usersService.create(this.query)
+      return this.usersService.create(this.query, user)
         .then((user) => {
           let message = `${this.translate("added", "users")} ${user.username}`;
           this.setFlashBag("info", message);
@@ -146,10 +147,11 @@ class usersController extends nodefony.Controller {
    *    @Route ( "/update/{username}", name="nodefony-user-update")
    */
   updateAction(username) {
+    let user = this.getUser()
     this.checkAuthorisation(username, this.query);
     switch (this.method) {
     case "GET":
-      return this.usersService.findOne(username)
+      return this.usersService.findOne(username, user)
         .then((result) => {
           if (result) {
             return this.render("users:users:createUser.html.twig", {
@@ -163,7 +165,7 @@ class usersController extends nodefony.Controller {
           throw e;
         });
     case "POST":
-      return this.usersService.findOne(username)
+      return this.usersService.findOne(username, user)
         .then(async (myuser) => {
           if (myuser) {
             if (nodefony.typeOf(this.query.roles) === "string") {
@@ -199,7 +201,7 @@ class usersController extends nodefony.Controller {
                 }
               }
             }
-            return this.usersService.update(myuser, value)
+            return this.usersService.update(myuser, value, user)
               .then(() => {
                 let message = `Update User ${this.query.username} OK`;
                 this.setFlashBag("info", message);
@@ -244,9 +246,10 @@ class usersController extends nodefony.Controller {
    *
    */
   deleteAction(username) {
+    let user = this.getUser();
     this.checkAuthorisation(username);
     if (username) {
-      return this.usersService.delete(username)
+      return this.usersService.delete(username, user)
         .then((result) => {
           let message = `Delete User ${result.username} OK`;
           this.setFlashBag("info", message);
@@ -272,6 +275,7 @@ class usersController extends nodefony.Controller {
    *
    */
   userAction(username) {
+    let user = this.getUser();
     if (username) {
       switch (this.method) {
       case "PUT":
@@ -280,7 +284,7 @@ class usersController extends nodefony.Controller {
         return this.deleteAction(username);
       case "GET":
         //const user = new User(this);
-        return this.usersService.findOne(username)
+        return this.usersService.findOne(username, user)
           .then((result) => {
             if (result) {
               return this.render("users:users:readUsers.html.twig", {
@@ -297,7 +301,7 @@ class usersController extends nodefony.Controller {
     case "POST":
       return this.createAction();
     default:
-      return this.usersService.find()
+      return this.usersService.find(this.query,{}, user)
         .then((result) => {
           return this.render("users:users:readUsers.html.twig", {
             users: result.rows

package/cli/builder/bundles/users-bundle/package.json

@@ -16,44 +16,37 @@
   ],
   "repository": {},
   "dependencies": {
-    "@babel/core": "7.17.7",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/core": "7.19.0",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/preset-react": "^7.16.7",
-    "@popperjs/core": "2.11.4",
+    "@babel/preset-env": "7.19.0",
+    "@babel/preset-react": "7.18.6",
+    "@popperjs/core": "2.11.6",
     "@withshepherd/faker": "5.5.5",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "8.2.5",
     "babel-register": "^6.26.0",
-    "bootstrap": "^5.1.3",
+    "bootstrap": "5.2.1",
     "clean-webpack-plugin": "^4.0.0",
     "css-hot-loader": "^1.4.4",
     "css-loader": "6.7.1",
-    "expose-loader": "^3.1.0",
+    "expose-loader": "4.0.0",
     "font-awesome": "^4.7.0",
-    "graphiql": "1.7.1",
-    "graphql": "16.3.0",
-    "graphql-ws": "5.6.3",
     "html-webpack-plugin": "^5.5.0",
-    "imports-loader": "^3.1.1",
-    "jquery": "^3.6.0",
-    "mini-css-extract-plugin": "2.6.0",
-    "mongoose-paginate-v2": "1.6.3",
-    "node-sass": "^7.0.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "sass-loader": "12.6.0",
+    "imports-loader": "4.0.1",
+    "jquery": "3.6.1",
+    "mini-css-extract-plugin": "2.6.1",
+    "mongoose-paginate-v2": "1.7.1",
+    "sass": "1.54.9",
+    "sass-loader": "13.0.2",
     "style-loader": "^3.3.1",
     "svg-inline-loader": "^0.8.2",
-    "swagger-ui": "4.6.2",
-    "swagger-ui-dist": "4.6.2",
-    "terser-webpack-plugin": "5.3.1",
-    "webpack": "5.70.0",
+    "terser-webpack-plugin": "5.3.6",
+    "webpack": "5.74.0",
     "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.8",
-    "node-gyp": "9.0.0",
+    "@mapbox/node-pre-gyp": "1.0.10",
+    "node-gyp": "9.1.0",
     "sequelize-cli": "^6.4.1",
     "stream": "0.0.2"
   },