beech-api 3.4.12 → 3.5.12

package/packages/cli/bin/beech.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 const logUpdate = require("log-update");
+const clear = require("cli-clear");
+const inquirer = require('inquirer');
 
 class Beech {
   constructor() {
@@ -24,37 +26,61 @@ class Beech {
             .then(help => resolve(help))
             .catch(err => reject(err));
         } else if (this.option == "create") {
+          // declare temp file and paste file
+          let tmpPackageFile = __dirname + '/../core/generator/_package';
+          let pastePackageFile = this.argument + '/package.json';
+          let tmpConfigFile = __dirname + '/../core/configure/app.config-basic.js';
+          let pasteConfigFile = this.argument + '/app.config.js';
+          let tmpJestFile = __dirname + '/../core/configure/jest.config.js';
+          let pasteJestFile = this.argument + '/jest.config.js';
+          let tmpJsConfigFile = __dirname + '/../core/configure/jsconfig.json';
+          let pasteJsConfigFile = this.argument + '/jsconfig.json';
+          let tmpDotSequelizercFile = __dirname + '/../core/configure/_sequelizerc';
+          let pasteDotSequelizercFile = this.argument + '/.sequelizerc';
+          let tmpGloablConfigFile = __dirname + '/../core/configure/global.config-basic.js';
+          let pasteGloablConfigFile = this.argument + '/global.config.js';
+          let tmpGitignoreFile = __dirname + '/../core/configure/_gitignore';
+          let pasteGitignoreFile = this.argument + '/.gitignore';
+          // start log clear screen
+          clear();
+          logUpdate("Beech CLI v" + require(__dirname + "/../../../package.json").version);
+          // check argument project name
           if (this.argument) {
-            let tmpPackageFile = __dirname + '/../core/generator/package';
-            let pastePackageFile = this.argument + '/package.json';
-            let tmpConfigFile = __dirname + '/../core/configure/app.config.js';
-            let pasteConfigFile = this.argument + '/app.config.js';
-            let tmpJestFile = __dirname + '/../core/configure/jest.config.js';
-            let pasteJestFile = this.argument + '/jest.config.js';
-            let tmpJsConfigFile = __dirname + '/../core/configure/jsconfig.json';
-            let pasteJsConfigFile = this.argument + '/jsconfig.json';
-            let tmpDotSequelizercFile = __dirname + '/../core/configure/sequelizerc';
-            let pasteDotSequelizercFile = this.argument + '/.sequelizerc';
-            let tmpGloablConfigFile = __dirname + '/../core/configure/global.config.js';
-            let pasteGloablConfigFile = this.argument + '/global.config.js';
-            let tmpGitignoreFile = __dirname + '/../core/configure/gitignore';
-            let pasteGitignoreFile = this.argument + '/.gitignore';
             if (!this.fs.existsSync(this.argument)) {
-              this.makeFolder(this.argument)
-                .then(this.copy.bind(this, tmpPackageFile, pastePackageFile))
-                .then(this.contentReplace.bind(this, pastePackageFile, { 'application': this.argument }))
-                .then(this.copy.bind(this, tmpConfigFile, pasteConfigFile))
-                .then(this.copy.bind(this, tmpJestFile, pasteJestFile))
-                .then(this.copy.bind(this, tmpJsConfigFile, pasteJsConfigFile))
-                .then(this.copy.bind(this, tmpDotSequelizercFile, pasteDotSequelizercFile))
-                .then(this.copy.bind(this, tmpGloablConfigFile, pasteGloablConfigFile))
-                .then(this.copy.bind(this, tmpGitignoreFile, pasteGitignoreFile))
-                .then(this.generateKeyConfigFile.bind(this, this.argument))
-                .then(this.installPackage.bind(this, this.argument))
-                .then(logUpdate("\n Processing  The `" + this.argument + "` application is creating...\n"))
-                .catch((err) => {
-                  throw err;
-                })
+              inquirer.prompt([ {
+                type: "list",
+                name: "sql",
+                message: "Please pick a SQL structure base:",
+                choices: [ "Basic (mysql only)", "Sequelize (mysql, sqlite, mariadb, postgres, mssql)" ],
+              } ]).then(async resSql => {
+                if (resSql.sql.split(' ')[ 0 ] != "Basic") {
+                  tmpGloablConfigFile = await __dirname + '/../core/configure/global.config-sequelize.js';
+                  tmpConfigFile = await __dirname + '/../core/configure/app.config-sequelize.js';
+                }
+                inquirer.prompt([ {
+                  type: "checkbox",
+                  name: "freature",
+                  message: "Check the features needed for your project:",
+                  choices: [ "Add-Ons", "Basic Helper", "Passport / JWT / Official Strategy Google, Facebook" ],
+                } ]).then(resFreat => {
+                  // init project
+                  this.makeFolder(this.argument)
+                    .then(this.copy.bind(this, tmpPackageFile, pastePackageFile))
+                    .then(this.contentReplace.bind(this, pastePackageFile, { 'application': this.argument }))
+                    .then(this.copy.bind(this, tmpConfigFile, pasteConfigFile))
+                    .then(this.copy.bind(this, tmpJestFile, pasteJestFile))
+                    .then(this.copy.bind(this, tmpJsConfigFile, pasteJsConfigFile))
+                    .then(this.copy.bind(this, tmpDotSequelizercFile, pasteDotSequelizercFile))
+                    .then(this.copy.bind(this, tmpGloablConfigFile, pasteGloablConfigFile))
+                    .then(this.copy.bind(this, tmpGitignoreFile, pasteGitignoreFile))
+                    .then(this.generateKeyConfigFile.bind(this, this.argument))
+                    .then(this.installPackage.bind(this, this.argument, resFreat.freature))
+                    .then(console.log("\n Processing  The Application `" + this.argument + "` is creating...\n"))
+                    .catch((err) => {
+                      throw err;
+                    });
+                });
+              });
             } else {
               resolve("\n Warning  The project `" + this.argument + "` it's duplicated.");
             }
@@ -70,29 +96,72 @@ class Beech {
     });
   }
 
-  installPackage(argument) {
+  installPackage(argument, freatureArr) {
     return new Promise((resolve, reject) => {
       try {
-        let lineStdout = "";
-        let processYarn = this.cmd.get('cd ' + argument + ' && yarn install', (err, data) => {
-          if (err) {
-            this.cmd.get('cd ' + argument + ' && npm install', (err, data) => {
-              if (err) { throw err }
-              resolve(data);
-              this.successfully();
-            });
-          } else {
-            resolve(data);
-            this.successfully();
-          }
-        });
-        // yarn install line shoutout
-        processYarn.stdout.on('data', (yarnData) => {
-          lineStdout += yarnData;
-          if (lineStdout[lineStdout.length - 1] == '\n') {
-            logUpdate('\n' + lineStdout);
-          }
-        });
+        // install freature
+        this.installFreature(argument, freatureArr)
+          .then(res => {
+            if (res) {
+              let lineStdout = "";
+              let processYarn = this.cmd.get('cd ' + argument + ' && yarn install', (err, data) => {
+                if (err) {
+                  this.cmd.get('cd ' + argument + ' && npm install', (err, data) => {
+                    if (err) { throw err }
+                    resolve(data);
+                    this.successfully();
+                  });
+                } else {
+                  resolve(data);
+                  this.successfully();
+                }
+              });
+              // yarn install line shoutout
+              processYarn.stdout.on('data', (yarnData) => {
+                lineStdout += yarnData;
+                if (lineStdout[ lineStdout.length - 1 ] == '\n') {
+                  logUpdate('\n' + lineStdout);
+                }
+              });
+            } else {
+              logUpdate("\n Faltal  Can't install freature. Try again...");
+            }
+          })
+          .catch(err => reject(err));
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+
+  installFreature(argument, freatureArr) {
+    return new Promise((resolve, reject) => {
+      try {
+        let helperPath = argument + '/src/helpers/';
+        let tmpBasicHelperFile = __dirname + '/../core/generator/_basic-helpers';
+        let pasteBasicHelperFile = helperPath + '/Basic.js';
+        let freatureLength = freatureArr.length;
+        if (freatureLength) {
+          freatureArr.map((f, key) => {
+            if (f.split(' ')[ 0 ] == "Add-Ons") {
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js add-on init') : this.cmd.get('cd ' + argument + ' && beech add-on init');
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Add-Ons");
+            }
+            if (f.split(' ')[ 0 ] == "Basic") {
+              this.makeFolder(helperPath).then(this.copy.bind(this, tmpBasicHelperFile, pasteBasicHelperFile))
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Basic helper");
+            }
+            if (f.split(' ')[ 0 ] == "Passport") {
+              (process.env.NODE_ENV == "development") ? this.cmd.get('cd ' + argument + ' && node cli/bin/beech.js passport init') : this.cmd.get('cd ' + argument + ' && beech passport init');
+              console.log("[" + (key + 1) + "/" + freatureLength + "] Installing Passport JWT, Official strategy Google, Facebook");
+            }
+            if (freatureArr.length == (key + 1)) {
+              resolve(true);
+            }
+          });
+        } else {
+          resolve(true);
+        }
       } catch (error) {
         reject(error);
       }
@@ -100,7 +169,9 @@ class Beech {
   }
 
   successfully() {
-    logUpdate('\n Passed  The project has been successfully created.\n\n  $ cd ' + this.argument + '\n  $ npm start or yarn start');
+    clear();
+    console.log("Beech CLI v" + require(__dirname + "/../../../package.json").version);
+    console.log('\n Passed  The project has been successfully created.\n\n  $ cd ' + this.argument + '\n  $ npm start or yarn start');
   }
 
   async contentReplace(pathFile, textCondition) {
@@ -141,14 +212,10 @@ class Beech {
      */
     return new Promise((resolve, reject) => {
       try {
-        let mkdirp = require('mkdirp');
-        mkdirp(path, (err) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(path);
-          }
-        })
+        const mkdirp = require("mkdirp");
+        mkdirp(path)
+          .then(p => resolve(p))
+          .catch(err => reject(err));
       } catch (error) {
         reject(error);
       }
@@ -183,7 +250,7 @@ class Beech {
         let result = '';
         let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
         let charactersLength = characters.length;
-        for ( var i = 0; i < length; i++ ) {
+        for (var i = 0; i < length; i++) {
           result += characters.charAt(Math.floor(Math.random() * charactersLength));
         }
         resolve(md5(result + secret));
@@ -217,7 +284,7 @@ class Beech {
                 } else {
                   resolve("\n Passed  App secret it's new generated.");
                 }
-              });              
+              });
             });
           }
         });
@@ -230,7 +297,7 @@ class Beech {
   help() {
     return new Promise((resolve, reject) => {
       try {
-        this.fs.readFile(__dirname + "/../core/generator/create", "utf8", (err, data) => {
+        this.fs.readFile(__dirname + "/../core/generator/_create", "utf8", (err, data) => {
           if (err) {
             reject(err);
           } else {
@@ -249,10 +316,10 @@ class Beech {
         this.fs = require("fs");
         this.cmd = require('node-cmd');
         this.argv = argv;
-        this.option = argv[2];
-        this.argument = argv[3];
-        this.special = argv[4];
-        this.extra = argv[5];
+        this.option = argv[ 2 ];
+        this.argument = argv[ 3 ];
+        this.special = argv[ 4 ];
+        this.extra = argv[ 5 ];
         resolve(this);
       } catch (error) {
         reject(error);

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

@@ -4,15 +4,48 @@ module.exports = {
     return passport.authenticate("jwt", {
       session: false
     }, (err, user, info) => {
+      // error check
       if (err) {
         console.log(err, info);
         return next(err);
       }
+      // anything token check
       if (!user) {
+        if (info.name == 'TokenExpiredError') {
+          return res.status(401).json({
+            code: 401,
+            status: 'error',
+            error: 'TOKEN_EXPIRED',
+            message: info
+          });
+        }
+        if (info.name == 'Error') {
+          return res.status(401).json({
+            code: 401,
+            status: 'error',
+            error: 'NO_AUTH_TOKEN',
+            message: {
+              name: 'NoTokenError',
+              message: 'No auth token'
+            }
+          });
+        }
+        if (info.name == 'SyntaxError') {
+          return res.status(401).json({
+            code: 401,
+            status: 'error',
+            error: 'PAYLOAD_SYNTAX_ERROR',
+            message: {
+              name: 'SyntaxError',
+              message: 'Unexpected token < in JSON at position 0'
+            }
+          });
+        }
         return res.status(401).json({
           code: 401,
           status: 'error',
-          error: 'UNAUTHORIZED_USER'
+          error: 'UNAUTHORIZED_USER',
+          message: info
         });
       }
       // Forward user information to the next middleware