beech-api 3.4.12 → 3.5.12

package/packages/cli/core/auth/Passport.js

@@ -3,18 +3,19 @@ const fs = require("fs");
 const passport_config_file = appRoot + "/passport.config.js";
 const md5 = require("md5");
 const secret = require("../../../lib/salt").salt;
+const { QueryTypes } = require("sequelize");
 
 module.exports = {
   init() {
     try {
       if (fs.existsSync(passport_config_file)) {
         var passport = require("passport"),
-            LocalStrategy = require("passport-local").Strategy,
-            GoogleStrategy = require("passport-google-oauth").OAuth2Strategy,
-            FacebookStrategy = require('passport-facebook').Strategy;
+          LocalStrategy = require("passport-local").Strategy,
+          GoogleStrategy = require("passport-google-oauth").OAuth2Strategy,
+          FacebookStrategy = require('passport-facebook').Strategy;
         var passportJWT = require("passport-jwt"),
-            JWTStrategy = passportJWT.Strategy,
-            ExtractJWT = passportJWT.ExtractJwt;
+          JWTStrategy = passportJWT.Strategy,
+          ExtractJWT = passportJWT.ExtractJwt;
         const auth = require("./Credentials");
         var passport_config = require(passport_config_file);
         if (passport_config.jwt_allow) {
@@ -31,27 +32,47 @@ module.exports = {
       let passportUsernameField = passport_config.model.username_field || "username";
       let passportPasswordField = passport_config.model.password_field || "password";
       let passportTable = passport_config.model.table || "users";
-      let passportFields = (passport_config.model.fields.length) ? passport_config.model.fields : ["id", "name", "email"];
+      let passportFields = (passport_config.model.fields.length) ? passport_config.model.fields : [ "id", "name", "email" ];
       // passport initial with token (encoder)
       passport.use(new LocalStrategy({
         usernameField: passportUsernameField,
         passwordField: passportPasswordField
-      }, (username, password, done) => {
-        let pool = eval("mysql." + passport_config.model.name);
+      }, async (username, password, done) => {
+        let pool = eval("sql." + passport_config.model.name);
         if (pool) {
-          pool.query("SELECT " + passportFields + " FROM ?? WHERE ?? = ? AND ?? = ?", [
-            passportTable,
-            passportUsernameField,
-            username,
-            passportPasswordField,
-            md5(password + secret)
-          ], (err, result) => {
-            if (err) {
-              return done(err);
-            } else {
-              return done(null, JSON.parse(JSON.stringify(result[0] || null)));
+          if (pool_base == "basic") {
+            // pool base is MySQL
+            pool.query("SELECT " + passportFields + " FROM ?? WHERE ?? = ? AND ?? = ?", [
+              passportTable,
+              passportUsernameField,
+              username,
+              passportPasswordField,
+              md5(password + secret)
+            ], (err, result) => {
+              if (err) {
+                return done(err, null);
+              } else {
+                return done(null, JSON.parse(JSON.stringify(result[ 0 ] || null)));
+              }
+            });
+          } else if (pool_base == "sequelize") {
+            // pool base is Sequelize
+            try {
+              let result = await pool.query("SELECT " + passportFields + " FROM " + passportTable + " WHERE " + passportUsernameField + " = :username AND " + passportPasswordField + " = :password", {
+                replacements: {
+                  fields: passportFields,
+                  username: username,
+                  password: md5(password + secret)
+                },
+                type: QueryTypes.SELECT
+              });
+              return done(null, JSON.parse(JSON.stringify(result[ 0 ] || null)));
+            } catch (error) {
+              return done(error, null);
             }
-          });
+          } else {
+            return done({ error: "Base pool SQL error." }, null);
+          }
         } else {
           return done(null, null, true);
         }
@@ -60,36 +81,54 @@ module.exports = {
       passport.use(new JWTStrategy({
         jwtFromRequest: ExtractJWT.fromAuthHeaderAsBearerToken(),
         secretOrKey: passport_config.secret
-      }, (jwtPayload, done) => {
-        let pool = eval("mysql." + passport_config.model.name);
+      }, async (jwtPayload, done) => {
+        let pool = eval("sql." + passport_config.model.name);
         if (pool) {
-          pool.query("SELECT " + passportFields + " FROM ?? WHERE id = ?", [
-            passportTable,
-            jwtPayload.id
-          ], (err, result) => {
-            if (err) {
-              return done(err);
-            } else {
-              return done(null, JSON.parse(JSON.stringify(result[0] || null)));
+          if (pool_base == "basic") {
+            // pool base is MySQL
+            pool.query("SELECT " + passportFields + " FROM ?? WHERE id = ?", [
+              passportTable,
+              jwtPayload.id
+            ], (err, result) => {
+              if (err) {
+                return done(err, null);
+              } else {
+                return done(null, JSON.parse(JSON.stringify(result[ 0 ] || null)));
+              }
+            });
+          } else if (pool_base == "sequelize") {
+            // pool base is Sequelize
+            try {
+              let result = await pool.query("SELECT " + passportFields + " FROM " + passportTable + " WHERE id = :id", {
+                replacements: {
+                  id: jwtPayload.id
+                },
+                type: QueryTypes.SELECT
+              });
+              return done(null, JSON.parse(JSON.stringify(result[ 0 ] || null)));
+            } catch (error) {
+              return done(error, null);
             }
-          });
+          } else {
+            return done({ error: "Base pool SQL error." }, null);
+          }
         } else {
           return done(null, null, true);
         }
       }));
-      
+
       // declare head authentication enpoint for all strategy
-      let auth_endpoint = (passport_config.auth_endpoint) ? (passport_config.auth_endpoint[0] === "/" ? passport_config.auth_endpoint : "/" + passport_config.auth_endpoint) : "/authentication";      
-      
+      let auth_endpoint = (passport_config.auth_endpoint) ? (passport_config.auth_endpoint[ 0 ] === "/" ? passport_config.auth_endpoint : "/" + passport_config.auth_endpoint) : "/authentication";
+
       /**
        * Passport Google Strategy
        * 
        */
-      let google_callbackURL = (passport_config.strategy.google.callbackURL) ? (passport_config.strategy.google.callbackURL[0] === "/" ? passport_config.strategy.google.callbackURL : "/" + passport_config.strategy.google.callbackURL) : "/google/callback";
+      let google_callbackURL = (passport_config.strategy.google.callbackURL) ? (passport_config.strategy.google.callbackURL[ 0 ] === "/" ? passport_config.strategy.google.callbackURL : "/" + passport_config.strategy.google.callbackURL) : "/google/callback";
       passport.use(new GoogleStrategy({
         clientID: passport_config.strategy.google.client_id,
         clientSecret: passport_config.strategy.google.client_secret,
-        callbackURL:  auth_endpoint + google_callbackURL
+        callbackURL: auth_endpoint + google_callbackURL
       }, (accessToken, refreshToken, profile, done) => {
         // find google user
         let googleIdField = (passport_config.strategy.google.local_profile_fields.google_id) ? passport_config.strategy.google.local_profile_fields.google_id : "google_id";
@@ -101,20 +140,24 @@ module.exports = {
           }
         });
       }));
-      
+
       /**
        * Passport Facebook Strategy
        * 
        */
-       let facebook_callbackURL = (passport_config.strategy.facebook.callbackURL) ? (passport_config.strategy.facebook.callbackURL[0] === "/" ? passport_config.strategy.facebook.callbackURL : "/" + passport_config.strategy.facebook.callbackURL) : "/facebook/callback";
-       // merge fields permisions
-       let allow_permisions_fields = [...new Set([...['id', 'email'] ,...passport_config.strategy.facebook.profileFieldsAllow])];
-       passport.use(new FacebookStrategy({
+      let facebook_callbackURL = (passport_config.strategy.facebook.callbackURL) ? (passport_config.strategy.facebook.callbackURL[ 0 ] === "/" ? passport_config.strategy.facebook.callbackURL : "/" + passport_config.strategy.facebook.callbackURL) : "/facebook/callback";
+      // merge fields permisions
+      let allow_permisions_fields = [ ...new Set([ ...[ 'id', 'email' ], ...passport_config.strategy.facebook.profileFieldsAllow ]) ];
+      passport.use(new FacebookStrategy({
         clientID: passport_config.strategy.facebook.app_id,
         clientSecret: passport_config.strategy.facebook.app_secret,
         callbackURL: auth_endpoint + facebook_callbackURL,
         profileFields: allow_permisions_fields
-      }, (accessToken, refreshToken, profile, done) => {        
+      }, (accessToken, refreshToken, profile, done) => {
+        // Check if the email permission is granted
+        if (!profile.emails || profile.emails.length === 0) {
+          return done(new Error('Email permission not granted.'));
+        }
         // find facebook user
         let faecbookIdField = (passport_config.strategy.facebook.local_profile_fields.facebook_id) ? passport_config.strategy.facebook.local_profile_fields.facebook_id : "facebook_id";
         this.findOrCreate(passport_config, "facebook", passportFields, passportTable, accessToken, refreshToken, profile, faecbookIdField, (err, res, dbFailed) => {
@@ -125,27 +168,28 @@ module.exports = {
           }
         });
       }
-    ));
+      ));
     } catch (error) {
       throw error;
     }
   },
   findOrCreate(passport_config, strategy_name, passportFields, passportTable, accessToken, refreshToken, profile, idField, cb) {
-    let pool = eval("mysql." + passport_config.model.name);
+    let pool = eval("sql." + passport_config.model.name);
     if (pool) {
-      pool.query("SELECT " + passportFields + " FROM ?? WHERE ?? = ?", [
-        passportTable,
-        idField,
-        profile.id
-      ], (err, result) => {
+      this.query_one_where(pool, "SELECT " + passportFields + " FROM " + passportTable, idField, profile.id, async (err, result) => {
         if (err) {
           cb(err);
         } else {
           // declare data response
           let data = {};
+          // prepare data for store
+          let usr = passport_config.model.username_field || "username";
+          let psw = passport_config.model.password_field || "password";
+          let profileEmail = profile.emails[ 0 ].value.split("@")[ 0 ];
+          let md5Psw = md5(profile.id + secret);
           // check strategy name for store
           if (strategy_name == "google") {
-            if (!result[0]) { // find not found and create
+            if (!result[ 0 ]) { // find not found and create
               // filter fields
               let fields = [].concat.apply([], [
                 (passport_config.strategy.google.local_profile_fields.name) ? passport_config.strategy.google.local_profile_fields.name : null,
@@ -156,36 +200,62 @@ module.exports = {
               // fileter values
               let values = [].concat.apply([], [
                 (passport_config.strategy.google.local_profile_fields.name) ? profile.displayName : null,
-                (passport_config.strategy.google.local_profile_fields.email) ? profile.emails[0].value : null,
-                (passport_config.strategy.google.local_profile_fields.photos) ? profile.photos[0].value : null,
+                (passport_config.strategy.google.local_profile_fields.email) ? profile.emails[ 0 ].value : null,
+                (passport_config.strategy.google.local_profile_fields.photos) ? profile.photos[ 0 ].value : null,
                 (passport_config.strategy.google.local_profile_fields.locate) ? profile._json.locale : null
               ].filter((el) => el != null));
               // Store google profile
-              pool.query("INSERT INTO ??(??,??,??,??) VALUES(?,?,?,?)", [
-                passportTable,
-                passport_config.model.username_field || "username",
-                passport_config.model.password_field || "password",
-                idField,
-                fields,
-                profile.emails[0].value.split("@")[0],
-                md5(profile.id + secret),
-                profile.id,
-                values
-              ], (err, result) => {
-                data.result = result;
-                data.google = profile;
-                cb(err, data);
-              });
+              if (pool_base == "basic") {
+                // pool base is MySQL
+                pool.query("INSERT INTO ??(??,??,??,??) VALUES(?,?,?,?)", [
+                  passportTable,
+                  usr,
+                  psw,
+                  idField,
+                  fields,
+                  profileEmail,
+                  md5Psw,
+                  profile.id,
+                  values
+                ], (err, result) => {
+                  data.result = result;
+                  data.google = profile;
+                  cb(err, data);
+                });
+              } else if (pool_base == "sequelize") {
+                // pool base is Sequelize
+                try {
+                  let result = await pool.query(`INSERT INTO ${passportTable}(${usr},${psw},${idField},${fields}) VALUES(:profileEmail,:md5Psw,:profileId,:values)`, {
+                    replacements: {
+                      usr: usr,
+                      psw: psw,
+                      idField: idField,
+                      profileEmail: profileEmail,
+                      md5Psw: md5Psw,
+                      profileId: profile.id,
+                      values: values
+                    },
+                    type: QueryTypes.INSERT
+                  });
+                  data.result = result;
+                  data.google = profile;
+                  cb(err, data);
+                } catch (error) {
+                  cb(error, null);
+                }
+              } else {
+                cb({ error: "Base pool SQL error." }, null);
+              }
             } else { // find found
               let users = {};
               users.google = profile;
               users.google.accessToken = accessToken;
               users.google.refreshToken = refreshToken;
-              users.user = result[0];
+              users.user = result[ 0 ];
               cb(err, users);
             }
           } else if (strategy_name == "facebook") {
-            if (!result[0]) { // find not found and create
+            if (!result[ 0 ]) { // find not found and create
               // filter fields
               let fields = [].concat.apply([], [
                 (passport_config.strategy.facebook.local_profile_fields.name) ? passport_config.strategy.facebook.local_profile_fields.name : null,
@@ -196,40 +266,97 @@ module.exports = {
               // fileter values
               let values = [].concat.apply([], [
                 (passport_config.strategy.facebook.local_profile_fields.name) ? profile.displayName : null,
-                (passport_config.strategy.facebook.local_profile_fields.email) ? profile.emails[0].value : null,
-                (passport_config.strategy.facebook.local_profile_fields.photos) ? profile.photos[0].value : null,
+                (passport_config.strategy.facebook.local_profile_fields.email) ? profile.emails[ 0 ].value : null,
+                (passport_config.strategy.facebook.local_profile_fields.photos) ? profile.photos[ 0 ].value : null,
                 (passport_config.strategy.facebook.local_profile_fields.locate) ? profile._json.location.name : null
               ].filter((el) => el != null));
               // Store facebook profile
-              pool.query("INSERT INTO ??(??,??,??,??) VALUES(?,?,?,?)", [
-                passportTable,
-                passport_config.model.username_field || "username",
-                passport_config.model.password_field || "password",
-                idField,
-                fields,
-                profile.emails[0].value.split("@")[0],
-                md5(profile.id + secret),
-                profile.id,
-                values
-              ], (err, result) => {
-                data.result = result;
-                data.facebook = profile;
-                cb(err, data);
-              });
+              if (pool_base == "basic") {
+                // pool base is MySQL
+                pool.query("INSERT INTO ??(??,??,??,??) VALUES(?,?,?,?)", [
+                  passportTable,
+                  usr,
+                  psw,
+                  idField,
+                  fields,
+                  profileEmail,
+                  md5Psw,
+                  profile.id,
+                  values
+                ], (err, result) => {
+                  data.result = result;
+                  data.facebook = profile;
+                  cb(err, data);
+                });
+              } else if (pool_base == "sequelize") {
+                // pool base is Sequelize
+                try {
+                  let result = await pool.query(`INSERT INTO ${passportTable}(${usr},${psw},${idField},${fields}) VALUES(:profileEmail,:md5Psw,:profileId,:values)`, {
+                    replacements: {
+                      usr: usr,
+                      psw: psw,
+                      idField: idField,
+                      profileEmail: profileEmail,
+                      md5Psw: md5Psw,
+                      profileId: profile.id,
+                      values: values
+                    },
+                    type: QueryTypes.INSERT
+                  });
+                  data.result = result;
+                  data.facebook = profile;
+                  cb(err, data);
+                } catch (error) {
+                  cb(error, null);
+                }
+              } else {
+                cb({ error: "Base pool SQL error." }, null);
+              }
             } else { // find found
               let users = {};
               users.facebook = profile;
               users.facebook.accessToken = accessToken;
               users.facebook.refreshToken = refreshToken;
-              users.user = result[0];
+              users.user = result[ 0 ];
               cb(err, users);
             }
           }
         }
-      });          
+      });
     } else {
       cb(null, null, true);
     }
+  },
+  async query_one_where(pool, sql, field, id, cb) {
+    try {
+      if (pool_base == "basic") {
+        // pool base is MySQL
+        pool.query(sql + " WHERE ?? = ?", [ field, id ], (err, result) => {
+          if (err) {
+            return cb(err, null);
+          } else {
+            return cb(null, JSON.parse(JSON.stringify(result || null)));
+          }
+        });
+      } else if (pool_base == "sequelize") {
+        // pool base is Sequelize
+        try {
+          let result = await pool.query(`${sql} WHERE ${field} = :id`, {
+            replacements: {
+              id: id
+            },
+            type: QueryTypes.SELECT
+          });
+          return cb(null, JSON.parse(JSON.stringify(result || null)));
+        } catch (error) {
+          return cb(error, null);
+        }
+      } else {
+        return done({ error: "Base pool SQL error." }, null);
+      }
+    } catch (error) {
+      cb(error, null);
+    }
   }
 
 }

package/packages/cli/core/configure/{app.config.js → app.config-basic.js}

@@ -12,7 +12,7 @@ module.exports = {
     app_port: 9000,
     app_host: "localhost",
     client_host: "http://0.0.0.0:9000",
-    app_secret: ["2cc118cd91b52ff99e3c005ddced76fb"]
+    app_secret: [ "2cc118cd91b52ff99e3c005ddced76fb" ]
   },
 
   // Add-on it's work when enabled. You can enable add-on by run CMD `$ beech add-on init`.
@@ -31,7 +31,7 @@ module.exports = {
    * @exports is_connect : The sql connection flag (boolean)
    * 
    */
-  mysql_config: [
+  database_config: [
     {
       name: "default_db",
       host: "127.0.0.1",
@@ -40,7 +40,7 @@ module.exports = {
       database: "example1_db",
       port: "3306",
       charset: "utf8",
-      is_connect: false
+      is_connect: false,
     },
     {
       name: "second_db",
@@ -50,7 +50,7 @@ module.exports = {
       database: "example2_db",
       port: "3306",
       charset: "utf8",
-      is_connect: false
+      is_connect: false,
     }
   ]
 };

package/packages/cli/core/configure/app.config-sequelize.js

@@ -0,0 +1,89 @@
+module.exports = {
+  /**
+   * Service configuration
+   * 
+   * @exports app_port : Listening for start service
+   * @exports app_host : Server http localhost
+   * @exports client_host : Production http client host
+   * @exports app_secret : App secret key for request with endpoints
+   * 
+   */
+  main_config: {
+    app_port: 9000,
+    app_host: "localhost",
+    client_host: "http://0.0.0.0:9000",
+    app_secret: [ "2cc118cd91b52ff99e3c005ddced76fb" ]
+  },
+
+  // Add-on it's work when enabled. You can enable add-on by run CMD `$ beech add-on init`.
+  addOn: true,
+
+  /**
+   * The Database configuration (mutiple connection) currenty support for MySQL, SQLite, MariaDB, PostgreSQL and Microsoft SQL Server
+   * 
+   * Basic parameter following:
+   * @exports dialect The engine SQL connection one of 'mysql' | 'sqlite' | 'mariadb' | 'postgres' | 'mssql'
+   * The Dialect need of the following:
+   * - $ npm install --save  pg pg-hstore # Postgres
+   * - $ npm install --save  mysql2
+   * - $ npm install --save  mariadb
+   * - $ npm install --save  sqlite3 (Need NodeJS v12.x)
+   * - $ npm install --save  tedious # Microsoft SQL Server (Need NodeJS v14.x)
+   * @exports name The Connection name
+   * @exports host The Host address
+   * @exports username The Host username connection
+   * @exports password Host The password connection
+   * @exports database  The database name
+   * @exports port The sql port (default port by dialect mysql:3306, marialdb:3306, postgres:5432 and mssql:1433)
+   * @exports define The character encoding and optional. See more: https://sequelize.org/docs/v6/other-topics/dialect-specific-things/
+   * @exports is_connect The sql connection flag (boolean)
+   * 
+   * learn more of parameter: 
+   * 
+   */
+  database_config: [
+    {
+      dialect: "mysql",
+      name: "default_db",
+      host: "127.0.0.1",
+      username: "root",
+      password: "",
+      database: "example1_db",
+      port: "3306",
+      define: {
+        charset: "utf8",
+        dialectOptions: {
+          collate: "utf8_general_ci"
+        },
+      },
+      is_connect: false,
+    },
+    {
+      dialect: "sqlite",
+      name: "second_db",
+      storage: "usr/sqliteDB/mydatabase.sqlite", // or ":memory:"
+      is_connect: false,
+    },
+    {
+      dialect: "mssql",
+      name: "thirdth_db",
+      host: "127.0.0.1",
+      username: "root",
+      password: "",
+      database: "example3_db",
+      port: "1433",
+      define: {
+        charset: "utf8",
+        dialectOptions: {
+          collate: "utf8_general_ci"
+        },
+      },
+      dialectOptions: { // ssl
+        options: {
+          encrypt: false,
+        }
+      },
+      is_connect: false,
+    },
+  ]
+};

package/packages/cli/core/configure/global.config-basic.js

@@ -0,0 +1,9 @@
+module.exports.init = () => {
+  // pool base config
+  global.pool_base = "basic"; // one of "basic" | "sequelize"
+
+  // example declare global varables library, config and anything
+  global.app_secret = require("./app.config.js").main_config.app_secret;
+  
+  // anything config for up to you ...
+}

package/packages/cli/core/configure/global.config-sequelize.js

@@ -0,0 +1,9 @@
+module.exports.init = () => {
+  // pool base config
+  global.pool_base = "sequelize"; // one of "basic" | "sequelize"
+
+  // example declare global varables library, config and anything
+  global.app_secret = require("./app.config.js").main_config.app_secret;
+  
+  // anything config for up to you ...
+}

package/packages/cli/core/configure/passport.config.js

@@ -12,18 +12,18 @@ module.exports = {
   token_expired: 86400,
 
   model: {
-    // Main mysql connection same name inside `app.config.js` file
+    // Main sql connection name. You must make sure connection name like inside `app.config.js` file and choose one connection name.
     name: "default_db",
-    // The user table name for store your authenticate, default table `users`
+    // The user table name for store your authenticate, (default table `users`)
     table: "",
-    // The fields for authenticate, default fields: `username` and `password`
+    // The fields for authenticate, default fields: (`username` and `password`)
     username_field: "",
     password_field: "",
     // Show JWT fields, default show fields: ["id", "name", "email"]
     fields: []
   },
 
-  // Allow using with app_secret requset (Every request need app_secret parameter)
+  // Allow using with app_secret request (Every request must be using the app_secret parameter)
   app_secret_allow: false,
 
   // Official strategy

package/packages/cli/core/databases/{mysql.connection.js → mysql.js}

@@ -1,9 +1,10 @@
-global.mysql = {};
+const mysql = require("mysql");
+global.sql = {};
 
-exports.mySqlConnection = () => {
+exports.connect = () => {
   return new Promise((resolve, reject) => {
     try {
-      mysqlInProcess(_config_.mysql_config, true, (err, result) => {
+      mysqlInProcess(_config_.database_config, true, (err, result) => {
         if (!err) {
           resolve(result);
         } else {
@@ -16,13 +17,13 @@ exports.mySqlConnection = () => {
   })
 }
 
-mysqlInProcess = (mysql_config, headDbShow, cb) => {
+mysqlInProcess = (database_config, headDbShow, cb) => {
   try {
-    let val = mysql_config.shift();
+    let val = database_config.shift();
     // checking turn on db connect
     if (val.is_connect) {
       // db connection config
-      let connection = _mysql_.createConnection({
+      let connection = mysql.createConnection({
         host: val.host,
         user: val.username,
         password: val.password,
@@ -39,11 +40,11 @@ mysqlInProcess = (mysql_config, headDbShow, cb) => {
             headDbShow = false;
           }
           // declare to global mysql variable
-          mysql[ val.name ] = connection;
+          sql[ val.name ] = connection;
           console.log(' -  ' + val.name + ' -> ' + connection.config.database + ':' + connection.config.port + '');
           // checking recursive database connection
-          if (mysql_config.length > 0) {
-            mysqlInProcess(mysql_config, headDbShow, e => {
+          if (database_config.length > 0) {
+            mysqlInProcess(database_config, headDbShow, e => {
               cb(e, true);
             });
           } else {
@@ -56,8 +57,8 @@ mysqlInProcess = (mysql_config, headDbShow, cb) => {
         }
       });
     } else {
-      if (mysql_config.length > 0) {
-        mysqlInProcess(mysql_config, headDbShow, e => {
+      if (database_config.length > 0) {
+        mysqlInProcess(database_config, headDbShow, e => {
           cb(e, true);
         });
       } else {