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

package/cli/builder/bundles/users-bundle/tests/loginTest.js

@@ -9,59 +9,79 @@
  *	kernel :   instance of kernel who launch the test
  *
  */
-const assert = require('assert');
+const assert = require("assert");
+const http = require("node:http");
+const https = require("node:https");
 
 describe("BUNDLE users", () => {
-
   before(() => {
-    //for example
+    // for example
     assert.equal(typeof nodefony, "object");
     // check instance kernel
     assert.equal(typeof kernel, "object");
-    //assert.equal(kernel instanceof nodefony.kernel, true);
-    // requests tools
-    const Request = kernel.get("requestClient");
     const serviceHttps = kernel.get("httpsServer");
     const openssl = serviceHttps.getCertificats();
-    // cookies container
-    global.jar = Request.engine.jar();
-    const requestOptions = {
-      method: 'GET',
-      timeout: 1500,
-      "User-Agent": `${nodefony.projectName}@${nodefony.projectVersion}`,
-      jar: global.jar,
-      headers: [{
-        name: 'Accept',
-        value: 'application/json'
-			}],
-      agentOptions: {
-        key: openssl.key,
-        cert: openssl.cert,
-        ca: openssl.ca,
+    global.baseUrl = `https://${kernel.settings.system.domain}:${kernel.settings.system.httpsPort}/api/jwt`;
+    const request = kernel.get("fetch");
+    global.fetch = request.fetch;
+    global.formData = request.library.FormData;
+    global.Headers = request.library.Headers;
+    const httpAgent = new http.Agent({
+      keepAlive: true
+    });
+    const httpsAgent = new https.Agent({
+      keepAlive: true,
+      key: openssl.key,
+      cert: openssl.cert,
+      ca: openssl.ca
+    });
+    global.options = {
+      agent (_parsedURL) {
+        if (_parsedURL.protocol == "http:") {
+          return httpAgent;
+        }
+        return httpsAgent;
       }
     };
-    global.baseUrl = `https://${kernel.settings.system.domain}:${kernel.settings.system.httpsPort}/api/jwt`;
-    const request = Request.create(global.baseUrl, requestOptions);
-    global.http = request.http.bind(request);
-
   });
 
-  describe('API LOGIN', () => {
+  describe("API LOGIN", () => {
     beforeEach(() => {});
     before(() => {});
+
     it("LOGIN JWT", async () => {
-      const result = await global.http("/login", {
-          method: 'POST',
-          form: {
-            username: 'admin',
-            passwd: 'admin'
-          }
-        })
-        .catch(e => {
+      // const formData = new global.FormData()
+      // formData.set('username', 'admin')
+      // formData.set('passwd', 'admin')
+
+      const meta = {
+        // 'Content-Type': 'application/json',
+        // "Accept":"application/json"
+      };
+      const headers = new global.Headers(meta);
+      const params = new URLSearchParams();
+      params.append("username", "admin");
+      params.append("passwd", "admin");
+      // console.log(formData)
+      const options = nodefony.extend({
+        method: "POST",
+        headers,
+        body: params
+
+        /* body: JSON.stringify({
+          username: "admin",
+          passwd: "admin"
+        })*/
+      }, global.options);
+      // console.log(formData)
+      const url = `${global.baseUrl}/login`;
+      // let url = "https://127.0.0.1:5152/api/jwt/login"
+      const response = await global.fetch(url, options)
+        .catch((e) => {
+          console.log(e);
           throw e;
         });
-      assert.strictEqual(result.json.statusCode, 200);
-      const body = JSON.parse(result.json.body);
+      const body = await response.json();
       assert(body.result);
       assert(body.result.token);
       global.token = body.result.token;
@@ -73,60 +93,89 @@ describe("BUNDLE users", () => {
       assert(body.result.decodedToken.exp);
       assert.strictEqual(body.api, "login-api");
       assert.strictEqual(body.code, 200);
-      assert.strictEqual(body.message, 'OK');
+      assert.strictEqual(body.message, "OK");
       assert.strictEqual(body.messageId, null);
-      //assert.strictEqual(body.error, undefined);
-      //assert.strictEqual(body.errorCode, undefined);
+      // assert.strictEqual(body.error, undefined);
+      // assert.strictEqual(body.errorCode, undefined);
       assert.strictEqual(body.url, `${global.baseUrl}/login`);
-      assert.strictEqual(body.method, 'POST');
-      assert.strictEqual(body.scheme, 'https');
-      assert.strictEqual(body.severity, 'INFO');
+      assert.strictEqual(body.method, "POST");
+      assert.strictEqual(body.scheme, "https");
+      assert.strictEqual(body.severity, "INFO");
       assert.strictEqual(body.code, 200);
     });
 
     it("BAD PASSWD LOGIN  JWT ", async () => {
-      const result = await global.http("/login", {
-          method: 'POST',
-          form: {
-            username: 'admin',
-            passwd: 'testfalse'
-          }
+      const meta = {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+      };
+      const headers = new global.Headers(meta);
+      const url = `${global.baseUrl}/login`;
+      const options = nodefony.extend({
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+          username: "admin",
+          passwd: "testfalse"
         })
-        .catch(e => {
+      }, global.options);
+      const response = await global.fetch(url, options)
+        .catch((e) => {
+          console.log(e);
           throw e;
         });
-      assert.strictEqual(result.json.statusCode, 401);
-      //const body = JSON.parse(result.json.body);
+      const body = await response.json();
+      assert.strictEqual(body.code, 401);
+      assert(body.error);
     });
+
     it("BAD NAME LOGIN JWT ", async () => {
-      const result = await global.http("/login", {
-          method: 'POST',
-          form: {
-            username: 'badname',
-            passwd: 'admin'
-          }
+      const meta = {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+      };
+      const headers = new global.Headers(meta);
+      const url = `${global.baseUrl}/login`;
+      const options = nodefony.extend({
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+          username: "badname",
+          passwd: "admin"
         })
-        .catch(e => {
+      }, global.options);
+      const response = await global.fetch(url, options)
+        .catch((e) => {
+          console.log(e);
           throw e;
         });
-      assert.strictEqual(result.json.statusCode, 404);
-      const body = JSON.parse(result.json.body);
-      assert.strictEqual(body.message, "User : badname not Found");
+      const body = await response.json();
+      assert.strictEqual(body.code, 404);
+      assert.strictEqual(body.error.message, "User : badname not Found");
     });
 
     it("BAD LOGIN NO credentials ", async () => {
-      const result = await global.http("/login", {
-          method: 'POST',
-          form: {}
+      const meta = {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+      };
+      const headers = new global.Headers(meta);
+      const url = `${global.baseUrl}/login`;
+      const options = nodefony.extend({
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+
         })
-        .catch(e => {
+      }, global.options);
+      const response = await global.fetch(url, options)
+        .catch((e) => {
+          console.log(e);
           throw e;
         });
-      assert.strictEqual(result.json.statusCode, 400);
-      const body = JSON.parse(result.json.body);
-      assert.strictEqual(body.message, "Missing credentials");
+      const body = await response.json();
+      assert.strictEqual(body.code, 400);
+      assert.strictEqual(body.error.message, "Missing credentials");
     });
-
   });
-
 });

package/cli/builder/bundles/users-bundle/usersBundle.js

@@ -10,8 +10,7 @@
  *
  */
 module.exports = class usersBundle extends nodefony.Bundle {
-
-  constructor(name, kernel, container) {
+  constructor (name, kernel, container) {
     // Mother Class constructor
     super(name, kernel, container);
     // Load core bundle library
@@ -19,7 +18,7 @@ module.exports = class usersBundle extends nodefony.Bundle {
     case "sequelize":
       this.autoLoader.load(path.resolve(this.path, "src", "providers", "sequelize", "userProvider.js"));
       break;
-    case 'mongoose':
+    case "mongoose":
       this.autoLoader.load(path.resolve(this.path, "src", "providers", "mongoose", "userProvider.js"));
       break;
     }

package/cli/builder/microService/microService.js

@@ -1,6 +1,5 @@
 class microService extends nodefony.Builder {
-
-  constructor(cli, cmd, args) {
+  constructor (cli, cmd, args) {
     super(cli, cmd, args);
     this.name = null;
     this.pathSkeleton = path.resolve(__dirname, "skeletons");
@@ -23,7 +22,7 @@ class microService extends nodefony.Builder {
       authorMail: "admin@nodefony.com",
       domain: "localhost",
       year: new Date().getFullYear(),
-      npm: 'npm',
+      npm: "npm",
       version: nodefony.version,
       addons: {}
     });
@@ -34,12 +33,12 @@ class microService extends nodefony.Builder {
     this.setEnv();
   }
 
-  async interaction() {
-    let promtOptions = [{
-      type: 'input',
-      name: 'name',
+  async interaction () {
+    const promtOptions = [{
+      type: "input",
+      name: "name",
       default: this.response.name,
-      message: 'Enter Service Name',
+      message: "Enter Service Name",
       validate: (value) => {
         if (value) {
           this.name = value;
@@ -48,10 +47,10 @@ class microService extends nodefony.Builder {
         }
         return `${value} Unauthorised Please enter a valid project name`;
       }
-      }, {
-      type: 'input',
-      name: 'description',
-      message: 'Enter short description',
+    }, {
+      type: "input",
+      name: "description",
+      message: "Enter short description",
       default: this.response.description,
       validate: (value) => {
         if (!value) {
@@ -65,11 +64,11 @@ class microService extends nodefony.Builder {
         }
         return value;
       }
-      }, {
-      type: 'input',
-      name: 'path',
+    }, {
+      type: "input",
+      name: "path",
       default: this.location,
-      message: 'Project Path',
+      message: "Project Path",
       validate: (value) => {
         let myPath = null;
         try {
@@ -82,13 +81,13 @@ class microService extends nodefony.Builder {
           this.location = value;
           return true;
         }
-        return 'Please enter a valid Service Path';
+        return "Please enter a valid Service Path";
       }
-      }, {
-      type: 'input',
-      name: 'authorFullName',
+    }, {
+      type: "input",
+      name: "authorFullName",
       default: this.response.authorFullName,
-      message: 'Please Enter Author Full Name',
+      message: "Please Enter Author Full Name",
       filter: (value) => {
         if (!value) {
           this.response.authorName = this.response.authorFullName;
@@ -96,18 +95,18 @@ class microService extends nodefony.Builder {
         }
         return value;
       }
-      }, {
-      type: 'input',
-      name: 'authorMail',
+    }, {
+      type: "input",
+      name: "authorMail",
       default: this.response.authorMail,
-      message: 'Please Enter Email Author ',
+      message: "Please Enter Email Author ",
       filter: (value) => {
         if (!value) {
           return this.response.authorMail;
         }
         return value;
       }
-      }];
+    }];
 
     return this.cli.prompt(promtOptions)
       .then((response) => {
@@ -116,142 +115,141 @@ class microService extends nodefony.Builder {
       });
   }
 
-  createBuilder(response) {
+  createBuilder (response) {
     try {
       return {
         name: this.response.name,
         type: "directory",
         childs: [{
-            name: "tmp",
-            type: "directory"
-          }, {
-            name: "dist",
-            type: "directory"
-          }, {
-            name: "package.json",
+          name: "tmp",
+          type: "directory"
+        }, {
+          name: "dist",
+          type: "directory"
+        }, {
+          name: "package.json",
+          type: "file",
+          skeleton: path.resolve(this.pathSkeleton, "package.json"),
+          params: this.response
+        }, {
+          name: "README.md",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, "README.md")
+        }, {
+          name: ".env-cmdrc.js",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, ".env-cmdrc.js")
+        }, {
+          name: ".editorconfig",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, ".editorconfig")
+        }, {
+          name: ".gitignore",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, ".gitignore")
+        }, {
+          name: ".jshintrc",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, ".jshintrc")
+        }, {
+          name: "bin",
+          type: "directory",
+          childs: [{
+            name: "cli",
             type: "file",
-            skeleton: path.resolve(this.pathSkeleton, "package.json"),
+            chmod: 755,
+            skeleton: path.resolve(this.pathSkeleton, "bin", "cli"),
             params: this.response
           }, {
-            name: "README.md",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, "README.md")
-          }, {
-            name: ".env-cmdrc.js",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, ".env-cmdrc.js")
-          }, {
-            name: ".editorconfig",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, ".editorconfig")
+            name: "hello.sh",
+            type: "file",
+            chmod: 755,
+            skeleton: path.resolve(this.pathSkeleton, "bin", "bash", "hello.sh"),
+            params: this.response
           }, {
-            name: ".gitignore",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, ".gitignore")
+            name: "hello.py",
+            type: "file",
+            chmod: 755,
+            skeleton: path.resolve(this.pathSkeleton, "bin", "python", "hello.py"),
+            params: this.response
           }, {
-            name: ".jshintrc",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, ".jshintrc")
+            name: "generateCertificates.sh",
+            type: "file",
+            chmod: 755,
+            skeleton: path.resolve(this.projectSkeleton, "bin", "generateCertificates.sh.skeleton"),
+            params: this.response
+          }]
+        }, {
+          name: "src",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, "src"),
+          params: {
+            recurse: true
+          }
+        }, {
+          name: "tests",
+          type: "copy",
+          path: path.resolve(this.pathSkeleton, "tests"),
+          params: {
+            recurse: true
+          }
+        }, {
+          // name: "config",
+          // type: "copy",
+          // path: path.resolve(this.pathSkeleton, "config"),
+          // params:{recurse:true}
+        }, {
+          name: "config",
+          type: "directory",
+          childs: [{
+            name: "certificates",
+            type: "directory"
           }, {
-            name: "bin",
+            name: "openssl",
             type: "directory",
             childs: [{
-              name: "cli",
-              type: "file",
-              chmod: 755,
-              skeleton: path.resolve(this.pathSkeleton, "bin", "cli"),
-              params: this.response
-            }, {
-              name: "hello.sh",
-              type: "file",
-              chmod: 755,
-              skeleton: path.resolve(this.pathSkeleton, "bin", "bash", "hello.sh"),
-              params: this.response
-            }, {
-              name: "hello.py",
-              type: "file",
-              chmod: 755,
-              skeleton: path.resolve(this.pathSkeleton, "bin", "python", "hello.py"),
-              params: this.response
+              name: "ca",
+              type: "directory",
+              childs: [{
+                name: "openssl.cnf",
+                type: "file",
+                skeleton: path.resolve(this.projectSkeleton, "config", "openssl", "ca", "openssl.cnf.skeleton"),
+                params: this.response
+              }]
             }, {
-              name: "generateCertificates.sh",
-              type: "file",
-              chmod: 755,
-              skeleton: path.resolve(this.projectSkeleton, "bin", "generateCertificates.sh.skeleton"),
-              params: this.response
+              name: "ca_intermediate",
+              type: "directory",
+              childs: [{
+                name: "openssl.cnf",
+                type: "file",
+                skeleton: path.resolve(this.projectSkeleton, "config", "openssl", "ca_intermediate", "openssl.cnf.skeleton"),
+                params: this.response
+              }]
             }]
           }, {
-            name: "src",
-            type: "copy",
-            path: path.resolve(this.pathSkeleton, "src"),
-            params: {
-              recurse: true
-            }
+            name: "config.js",
+            type: "file",
+            skeleton: path.resolve(this.pathSkeleton, "config", "config.js"),
+            params: this.response
           }, {
-            name: "tests",
+            name: "pm2.config.js",
+            type: "file",
+            skeleton: path.resolve(this.pathSkeleton, "config", "pm2.config.js"),
+            params: this.response
+          }, {
+            name: "webpack.config.js",
+            type: "file",
+            skeleton: path.resolve(this.pathSkeleton, "config", "webpack.config.js"),
+            params: this.response
+          }, {
+            name: "webpack",
             type: "copy",
-            path: path.resolve(this.pathSkeleton, "tests"),
+            path: path.resolve(this.pathSkeleton, "config", "webpack"),
             params: {
               recurse: true
             }
-          }, {
-            //name: "config",
-            //type: "copy",
-            //path: path.resolve(this.pathSkeleton, "config"),
-            //params:{recurse:true}
-          }, {
-            name: "config",
-            type: "directory",
-            childs: [{
-              name: "certificates",
-              type: "directory"
-            }, {
-              name: "openssl",
-              type: "directory",
-              childs: [{
-                name: "ca",
-                type: "directory",
-                childs: [{
-                  name: "openssl.cnf",
-                  type: "file",
-                  skeleton: path.resolve(this.projectSkeleton, "config", "openssl", "ca", "openssl.cnf.skeleton"),
-                  params: this.response
-                }]
-              }, {
-                name: "ca_intermediate",
-                type: "directory",
-                childs: [{
-                  name: "openssl.cnf",
-                  type: "file",
-                  skeleton: path.resolve(this.projectSkeleton, "config", "openssl", "ca_intermediate", "openssl.cnf.skeleton"),
-                  params: this.response
-                }]
-              }]
-            }, {
-              name: "config.js",
-              type: "file",
-              skeleton: path.resolve(this.pathSkeleton, "config", "config.js"),
-              params: this.response
-            }, {
-              name: "pm2.config.js",
-              type: "file",
-              skeleton: path.resolve(this.pathSkeleton, "config", "pm2.config.js"),
-              params: this.response
-            }, {
-              name: "webpack.config.js",
-              type: "file",
-              skeleton: path.resolve(this.pathSkeleton, "config", "webpack.config.js"),
-              params: this.response
-            }, {
-              name: "webpack",
-              type: "copy",
-              path: path.resolve(this.pathSkeleton, "config", "webpack"),
-              params: {
-                recurse: true
-              }
-            }]
-          }
-        ]
+          }]
+        }]
       };
     } catch (e) {
       throw e;