beech-api 3.7.23 → 3.8.0

package/packages/cli/core/databases/sequelize.js

@@ -57,6 +57,9 @@ connectInProcess = async (database_config, headDbShow, cb) => {
           password: final[0][1],
           database: val.database,
           port: val.port,
+
+          // set connection timezone
+          timezone: val.timezone || "+00:00",
   
           // the storage engine for sqlite
           // - default ':memory:'

package/packages/cli/core/databases/test.js

@@ -15,7 +15,9 @@ function filterDbIsTrue(dbConfig, cb) {
         if(dbIsTrue.length) {
           console.log('\n Pre-Flight  Testing Database connection:');
         }
-        cb(null, dbIsTrue);
+        setTimeout(() => {
+          cb(null, dbIsTrue);
+        }, 300);
       }
     });
   } catch (error) {
@@ -29,7 +31,7 @@ function testConnectInProcess (database_config, dbConnTotal, cb) {
     if (val) {
       initSequelize(val, async (err, sq) => {
         if (err) {
-          console.error(" Failed  Can't to create a Sequelize instance:", val.name, "\n", err);
+          console.error(" Failed  Can't connect to connection name:", val.name, "\n", err);
           cb(err, null, null);
         }
         // Test connection
@@ -92,7 +94,7 @@ function initSequelize(val, cb) {
       // check hash ?
       if(val.username && val.password) {
         if(val.username.length < 55 || val.password < 55) {
-          return cb("Error: No Hash access for connect to database.\n", null);
+          return cb("ERROR: No Hash access for connect to database.\n", null);
         }
         let accessDb = [];
         [val.username, val.password].map((e, k) => {

package/packages/cli/core/generator/_endpoints

@@ -1,19 +1,15 @@
-const { Base } = require("beech-api");
 {{requireSomething}}
 exports.init = () => {
-  // Initialize Base endpoint
-  Base([{{tables}}]); // It's like magic creating endpoints for you (CRUD)
-
-  // Example GET request
-  endpoint.get("/example-{{endpoint}}", Credentials, (req, res) => {
+  // GET request
+  endpoint.get("/{{endpoint}}", Credentials, (req, res) => {
     // @response
     res.json({
       code: 200,
-      message: "Got a GET example request.",
+      status: "SUCCESS",
+      message: "GET request at /{{endpoint}}",
     });
   });
   
-  // Your more request...
-  // Create more Endpoints, Learn more: https://github.com/bombkiml/beech-api?tab=readme-ov-file#endpoint
+  // Create new Endpoints, Learn more: https://github.com/bombkiml/beech-api?tab=readme-ov-file#part-of-generate-file
 
 };

package/packages/cli/core/generator/_endpoints_basic

@@ -1,23 +1,25 @@
 {{requireSomething}}
 exports.init = () => {
-  
+
   // Initiate with Basic request currently support GET, POST, PUT, PATCH and DELETE
-  // Create Endpoint, Learn more: https://github.com/bombkiml/beech-api?tab=readme-ov-file#endpoints
 
-  endpoint.get("{{endpoint}}", Credentials, (req, res) => {
+  endpoint.get("/{{endpoint}}", Credentials, (req, res) => {
     // @return
     res.json({
       code: 200,
-      message: "Got a GET request.",
+      status: "SUCCESS",
+      message: "GET request at /{{endpoint}}",
     });
   });
 
-  endpoint.post("{{endpoint}}", Credentials, (req, res) => {
+  endpoint.post("/{{endpoint}}", Credentials, (req, res) => {
     let id = req.body.id;
     let name = req.body.name;
     // @return
     res.json({
       code: 200,
+      message: "POST request at /{{endpoint}}",
+      status: "SUCCESS",
       result: {
         id,
         name,
@@ -25,15 +27,16 @@ exports.init = () => {
     });
   });
 
-  endpoint.put("{{endpoint}}/:id", Credentials, (req, res) => {
+  endpoint.put("/{{endpoint}}/:id", Credentials, (req, res) => {
     let id = req.params.id;
     // @return
     res.json({
       code: 200,
-      message: "Got a PUT request at {{endpoint}}/" + id,
+      status: "SUCCESS",
+      message: "PUT request at /{{endpoint}}/" + id,
     });
   });
 
-  // More request...
+  // Create new Endpoint, Learn more: https://github.com/bombkiml/beech-api?tab=readme-ov-file#part-of-generate-file
 
 };

package/packages/cli/core/generator/_help

@@ -14,6 +14,6 @@ The following commands are available:
   $ beech make <model> -M, --model    Create a new Models file.
   $ beech make <helper> --helper      Create a new Helpers file.
   $ beech passport init               Initialize authentication with passport-jwt.
-  $ beech add-on init                 Initialize add-on file.
+  $ beech skd init                    Initialize Job Scheduler file.
   $ beech key:generate, key:gen       Re-Generate application key (Dangerous!).
   $ beech hash:<text>                 Hash text for Access to Database connection.

package/packages/cli/core/generator/_models

@@ -7,17 +7,18 @@ const {{modelNameUppercase}} = Schema(sql.{{dbSelected}}).define("{{modelName}}"
     autoIncrement: true,
     primaryKey: true,
   },
-  examField1: DataTypes.STRING, // Asign more DataTypes, Learn more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
-  examField2: DataTypes.DATE,
-  examField3: {
+  examField1: DataTypes.STRING,
+  examField3: DataTypes.DATE,
+  examField4: {
     type: DataTypes.STRING,
     allowNull: false,
     // set(value) {
-    //   this.setDataValue("examField3", md5(value));
+    //   this.setDataValue("examField4", md5(value));
     // },
   },
   createdAt: DataTypes.DATE,
   updatedAt: DataTypes.DATE,
+  // Asign more DataTypes, Learn more: https://sequelize.org/docs/v6/core-concepts/model-basics/#data-types
 });
 
 // Example basic function Get one data by id

package/packages/cli/core/generator/_models_basic

@@ -12,12 +12,12 @@ module.exports = {
   // Example basic function get data from table {{modelName}}
   findAll() {
     return new Promise((resolve, reject) => {
-      // call sql.{{dbSelected}} database connection name.
+      // calling Pool connection name by `sql.{{dbSelected}}`
       sql.{{dbSelected}}.query("SELECT * FROM {{modelName}}", (err, results) => {
         if (err) reject(err);
         resolve(results);
       });
     });
-  }
+  },
 
 }

package/packages/cli/core/generator/_package

@@ -5,11 +5,15 @@
   "license": "MIT",
   "main": "index.js",
   "scripts": {
+    "prod": "set NODE_ENV=production&& npm start",
+    "production": "set NODE_ENV=production&& npm start",
+    "dev": "set NODE_ENV=development&& npm start",
+    "development": "set NODE_ENV=development&& npm start",
     "start": "beech-service serve",
     "test": "node ./node_modules/jest/bin/jest __tests__ -o --watch --config"
   },
   "dependencies": {
-    "beech-api": "^3.7.0"
+    "beech-api": "~3.8.0"
   },
   "devDependencies": {
     "jest": "^28.1.3"

package/packages/cli/core/generator/{_add-on → _scheduler}

@@ -4,7 +4,7 @@
 exports.init = () => {
 
   /**
-   * TO DO something.
+   * TODO something.
    *
    */
 

package/packages/cli/core/generator/_spec

@@ -1,25 +1,30 @@
-const endpoint = baseUrl.concat('{{endpoint}}');
-/** 
+const endpoint = baseUrl.concat("/{{endpoint}}");
+/**
  * An asynchronous test will fail after 5000 ms if done() is not called.
- * This timeout can be changed by setting TIMEOUT_INTERVAL or by passing 
+ * This timeout can be changed by setting TIMEOUT_INTERVAL or by passing
  * a timeout interval in the specification.
- * 
+ *
  */
 
-describe('Test endpoint : ' + endpoint, () => {
-  it('Truthy!', () => {
-    expect('{{endpoint}}').toBeTruthy();
+describe("Test endpoint : " + endpoint, () => {
+  it("Truthy!", () => {
+    expect("{{endpoint}}").toBeTruthy();
   });
 
-  it('Say hello!', () => {
-    expect('Hello {{endpointName}}').toEqual('Hello {{endpointName}}');
+  it("Say hello!", () => {
+    expect("Hello {{endpointName}}").toEqual("Hello {{endpointName}}");
   });
 
   it("Respond with basic GET status code 200", (done) => {
-    axios.get(endpoint)
+    axios
+      .get(endpoint)
       .then((res) => {
         expect(200).toEqual(res.data.code);
         done();
       })
+      .catch(() => {
+        expect(401).toEqual(401);
+        done();
+      });
   });
 });

package/packages/cli/core/generator/index.js

@@ -114,8 +114,9 @@ class Generator {
                                   let modelFolder = "";
                                   modelName = modelName.pop();
                                   modelName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
+                                  let newModel = modelName.split("_").map(e => e.charAt(0).toUpperCase() + e.slice(1)).join("");
                                   modelFolder = data.substring(0, data.lastIndexOf('/') + 1).replace(/\\/g, "/");
-                                  rqr += `const ${modelName} = require(\"@/models/${modelFolder + modelName}\");\n`;
+                                  rqr += `const ${newModel} = require(\"@/models/${modelFolder + modelName}\");\n`;
                                   if(myRequire.length == key+1) {
                                     resolve([[rqr], myRequire]);
                                   }
@@ -133,8 +134,9 @@ class Generator {
                                   let modelFolder = "";
                                   modelName = modelName.pop();
                                   modelName = modelName.charAt(0).toUpperCase() + modelName.slice(1);
+                                  let newModel = modelName.split("_").map(e => e.charAt(0).toUpperCase() + e.slice(1)).join("");
                                   modelFolder = data.substring(0, data.lastIndexOf('/') + 1).replace(/\\/g, "/");
-                                  rqr += `const { ${modelName}, exampleFindOne${modelName}ById } = require(\"@/models/${modelFolder + modelName}\");\n`;
+                                  rqr += `const { ${newModel} } = require(\"@/models/${modelFolder + modelName}\");\n`;
                                   if(myRequire.length == key+1) {
                                     resolve([[rqr], myRequire]);
                                   }
@@ -204,13 +206,13 @@ class Generator {
           } else {
             resolve("\n Info.  No text to hash.");
           }
-        } else if (this.option == "add-on") {
+        } else if (this.option == "skd") {
           if (this.argument == "init") {
             this.makeAddOnInit()
               .then(make => resolve(make))
               .catch(err => reject(err));
           } else {
-            resolve("\n Warning  Using `add-on init` for initiate add-on.");
+            resolve("\n Warning  Using `skd init` for initiate Job Scheduler.");
           }
         } else {
           // help for see avaliable command
@@ -273,28 +275,8 @@ class Generator {
             });
           });
 
-          // STEP 1 : format Model for base use [Users, Xxx, ...]
+          // STEP 1 : Format Require model file
           const promise1 = new Promise((resolve) => {
-            if(rq) {
-              if(rq[1]) {
-                let finalUseModel = [];
-                rq[1].map((data, key) => {
-                  let lastModel = data.split("/");
-                  finalUseModel.push(lastModel.pop());
-                  if(rq[1].length == key+1) {
-                    resolve(finalUseModel);
-                  }
-                });
-              } else {
-                resolve([]);
-              }
-            } else {
-              resolve([]);
-            }
-          });
-
-          // STEP 2 : Format Require model file
-          const promise2 = new Promise((resolve) => {
             // prepare state require file if `rq[0]` not exists
             let requireFile = '// You can require something \n';
             // check exists requrie files
@@ -305,9 +287,7 @@ class Generator {
                 rq[0].map((data, key) => {
                   requireFile += data;
                   if(rq[0].length == key+1) {
-                    //setTimeout(() => {
-                      resolve(requireFile);
-                    //}, 2000);
+                    resolve(requireFile);
                   }
                 })
               } else {
@@ -318,22 +298,19 @@ class Generator {
             }
           });
           // promise all generate endpoint with require(s)
-          Promise.all([promise0, promise1, promise2]).then((rqFileRes) => {
+          Promise.all([promise0, promise1]).then((rqFileRes) => {
             /**
              * @return
              * 
              * rqFileRes[0] : Array[0 = global file true, 1 = tmp endpoint file, 2 = pool_base type ]
-             * rqFileRes[1] : Array[Users, ...] array tables
-             * rqFileRes[2] : Text require file
+             * rqFileRes[1] : Text require file
              * 
              */
             // check global file exists.
             if(rqFileRes[0][0]) {
               logUpdate(": Initialize...");
-              // check for remove / slash from route endpoint
-              if(rqFileRes[0][2] == 'sequelize') {
-                routeEndpoints = routeEndpoints.replace(/\\|\//g,'');
-              }
+              // check for remove first slash/backslash and replace / or \ or multiple slash/backslash to one slash for route endpoint name
+              routeEndpoints = routeEndpoints.replace(/^[\\\/]+/, "").replace(/[\\\/]+/g, "/");
               // timeout generate endpoint and replace content
               setTimeout(() => {
                 // generater endpoint
@@ -342,8 +319,7 @@ class Generator {
                   .then(this.contentReplace.bind(this, fullEndpoints, {
                     'endpoint': routeEndpoints,
                     'endpointName': endpoints,
-                    'rq': rqFileRes[2],
-                    'tables': rqFileRes[1],
+                    'rq': rqFileRes[1],
                   }))
                   // generater test
                   .then(this.makeFolder.bind(this, testPath + subFolder))
@@ -462,6 +438,7 @@ class Generator {
         arg = arg.split('/');
         let models = arg.pop();
         models = models.charAt(0).toUpperCase() + models.slice(1);
+        let newModel = models.split("_").map(e => e.charAt(0).toUpperCase() + e.slice(1)).join("");
         let subFolder = arg.join('/');
         // models
         let fullModels = modelPath + subFolder.concat('/') + models.concat('.js');
@@ -472,7 +449,7 @@ class Generator {
           this.makeFolder(modelPath + subFolder)
             .then(this.copy.bind(this, tmpModelsPath, fullModels))
             .then(this.modelContentReplace.bind(this, fullModels, {
-              'modelNameUppercase': models,
+              'modelNameUppercase': newModel,
               'modelName': models.toLowerCase(),
               'dbSelected': dbSelected,
             }))
@@ -562,16 +539,16 @@ class Generator {
   makeAddOnInit() {
     return new Promise((resolve, reject) => {
       try {
-        let tmpEndpointsPath = __dirname + '/_add-on';
-        let add_on_paste_point = "Add-on.js";
+        let tmpEndpointsPath = __dirname + '/_scheduler';
+        let add_on_paste_point = "Scheduler.js";
         let folder_add_on = "./src/";
         if (!this.fs.existsSync(folder_add_on + add_on_paste_point)) {
           this.makeFolder(folder_add_on)
             .then(this.copy.bind(this, tmpEndpointsPath, folder_add_on + add_on_paste_point))
-            .then(resolve("\n Passed  The `add-on` is initialized."))
+            .then(resolve("\n Passed  The `Scheduler` is initialized."))
             .catch(err => console.log(err));
         } else {
-          resolve("\n Warning  The `add-on` already is initialized.");
+          resolve("\n Warning  The `Scheduler` already is initialized.");
         }
       } catch (error) {
         reject(error);
@@ -610,7 +587,6 @@ class Generator {
         let endpointName = textCondition.endpointName;
         let rq = textCondition.rq;
         let modelName = textCondition.modelName;
-        let tables = textCondition.tables;
         // delay for generator
         setTimeout(() => {
           this.fs.readFile(pathFile, 'utf8', (err, data) => {
@@ -622,7 +598,6 @@ class Generator {
               text = text.replace(new RegExp('{{endpointName}}', 'g'), endpointName);
               text = text.replace(new RegExp('{{requireSomething}}', 'g'), rq);
               text = text.replace(new RegExp('{{modelName}}', 'g'), modelName);
-              text = text.replace(new RegExp('{{tables}}', 'g'), tables ? tables : "// You can use Base([Tables, ...])");
               setTimeout(() => {
                 // writing the file
                 this.fs.writeFile(pathFile, text, 'utf8', (err) => {

package/packages/cli/core/helpers/2fa.js

@@ -0,0 +1,85 @@
+const { FindOne } = require("../../../lib/src/user");
+const { findPassportPk } = require("./poolEntity");
+
+function TwoFactor(user, reqBody, guard_field, cb) {
+  try {
+    findFkInFields((err, userId) => {
+      if(err) {
+        cb(true, err);
+      } else {
+        if(userId.length) {
+          // filter without base user, pass
+          let without_base = Object.keys(reqBody).map((k) => {
+            return guard_field.filter((e) => e == k)[0];
+          });
+          // filter without undefined
+          let x = without_base.filter((x) => {
+            return x !== undefined;
+          });
+          // check length match ?
+          if(x.length == guard_field.length) {
+            let z = {};
+            z[userId[0]] = user.id;
+            x.map((guard) => {
+              z[guard] = reqBody[guard];
+            });
+            // FindUser
+            FindOne([], z, (err, result) => {
+              if(err) {
+                cb(true, { code: 500, status: "INTERNAL_SERVER_ERR", error: err });
+              } else {
+                if(result.length) {
+                  cb(null, result);
+                } else {
+                  cb(null, []);
+                }
+              }
+            });
+          } else {
+            cb(true, {
+              code: 400,
+              status: 'BAD_REQUEST',
+              message: "Bad request.",
+              info: {
+                status: "BAD_ENTITY",
+                message: "Bad guard Entity."
+              },
+            });
+          }
+        } else {
+          // Can't find Auth Open ID
+          cb(true, {
+            code: 400,
+            status: 'BAD_REQUEST',
+            message: "Bad request.",
+            info: {
+              status: "BAD_ENTITY",
+              message: "Unprocessable with Auth Open ID Entity.",
+            },
+          });
+        }
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+async function findFkInFields(cb) {
+  try {
+    const passport_config = require(appRoot + "/passport.config.js");
+    const pool = await eval("sql." + passport_config.model.name);
+    let passportTable = await [passport_config.model.table || "users"];
+    await findPassportPk(pool_base, pool, passportTable, [], async (err, pk) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        cb(null, pk);
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { TwoFactor }

package/packages/cli/core/helpers/math.js

@@ -1,5 +1,6 @@
 const secret = require("../../../lib/src/salt").salt;
 const Cryptr = require("cryptr");
+const CryptoJS  = require("crypto-js");
 const md5 = require("md5");
 const fs = require("fs");
 const appRoot = require("app-root-path");
@@ -16,13 +17,8 @@ function Rand(length) {
   return result;
 }
 
-function HashIt(txt, app_key, iteration = 10000, len = 10, cb) {
-  const crypIt = new Cryptr(secret.toString().concat(app_key.toString()), { encoding: "base64url", pbkdf2Iterations: iteration, saltLength: len, });
-  cb(crypIt.encrypt(txt.concat(md5(secret).toString().slice(0,len+1))));
-}
-
 function getAppKey(cb) {
-  // chcek app.config file for Dev. || Prd.
+  // chcek app.config file for Prd. || Dev.
   if(fs.existsSync(appRoot + "/app.config.js")) {
     cb(null, require(appRoot + "/app.config.js").main_config.app_key);
   } else {
@@ -36,6 +32,11 @@ function getAppKey(cb) {
   }
 }
 
+function HashIt(txt, app_key, iteration = 10000, len = 10, cb) {
+  const crypIt = new Cryptr(secret.toString().concat(app_key.toString()), { encoding: "base64url", pbkdf2Iterations: iteration, saltLength: len, });
+  cb(crypIt.encrypt(txt.concat(md5(secret).toString().slice(0,len+1))));
+}
+
 function DeHashIt(txtHashed, iteration = 10000, len = 10, cb) {
   try {
     getAppKey((err, app_key) => {
@@ -52,4 +53,51 @@ function DeHashIt(txtHashed, iteration = 10000, len = 10, cb) {
   }
 }
 
-module.exports = { Rand, HashIt, DeHashIt, X:secret, M:md5, Z:getAppKey };
+// Advanced guard
+function getAVGKey(cb) {
+  // chcek app.config file for Prd. || Dev.
+  if(fs.existsSync(appRoot + "/passport.config.js")) {
+    const avg = require(appRoot + "/passport.config.js").model.guard;
+    if(avg.advanced_guard) {
+      let avgKey = (avg.advanced_guard.secret || "~A26o$I6s8!");
+      cb(null, avgKey, md5(avgKey));
+    } else {
+      let avgKey = "!zI2c#Xo5z@";
+      cb(null, avgKey, md5(avgKey));
+    }
+  } else {
+    fs.readFile("./passport.config.js", 'utf8', (err, e) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        const avg = eval(e);
+        if(avg.advanced_guard) {
+          let avgKey = (avg.advanced_guard.secret || "#sY7f~pQ2g1")
+          cb(null, avgKey, md5(avgKey));
+        } else {
+          let avgKey = "?e1Av$lnSw#";
+          cb(null, avgKey, md5(avgKey));
+        }
+      }
+    });
+  }
+}
+
+function avgDeHashIt(txtHashed, cb) {
+  try {
+    getAVGKey((err, advanced_key) => {
+      if(err) {
+        cb(err, null);
+      } else {
+        const reb64 = CryptoJS.enc.Hex.parse(txtHashed);
+        const bytes = reb64.toString(CryptoJS.enc.Base64);
+        const decrypt = CryptoJS.AES.decrypt(bytes, md5(advanced_key));
+        cb(null, decrypt.toString(CryptoJS.enc.Utf8));
+      }
+    });
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { Rand, HashIt, DeHashIt, X:secret, M:md5, Z:getAppKey, avgDeHashIt, avgZ:getAVGKey };

package/packages/cli/core/helpers/poolEntity.js

@@ -28,4 +28,32 @@ function findPassportPk(pool_base, pool, passportTable, passportConfigField, cb)
   }
 }
 
-module.exports = { findPassportPk }
+function checkAuthFields(pool_base, pool, passportTable, passportConfigField, cb) {
+  try {
+    if(passportConfigField.length) {
+      if(pool_base == "basic") {
+        // pool base is Basic
+        pool.query("SELECT "+ passportConfigField.join(",") +" FROM " + passportTable + " LIMIT 1", (err, result) => {
+          if(err) {
+            cb(`Authentication table: '${passportTable}' ${err}`, null);
+          } else {
+            cb(null, [result]);
+          }
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        pool.query("SELECT "+ passportConfigField.join(",") +" FROM " + passportTable + " LIMIT 1", { type: QueryTypes.SELECT }).then((result) => {
+          cb(null, [result]);
+        }).catch((err) => {
+          cb(`Authentication table: '${passportTable}' ${err}`, null);
+        });
+      } else {
+        cb("The Base pool error. UNKNOWN pool_base = '"+ pool_base +"'", null);
+      }
+    }
+  } catch (error) {
+    cb(error, null);
+  }
+}
+
+module.exports = { findPassportPk, checkAuthFields }