@azteam/express 1.2.177 → 1.2.180

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.177",
+    "version": "1.2.180",
     "main": "src/index.js",
     "engines": {
         "node": ">= 12.0.0",

package/src/AdminController.js

@@ -190,14 +190,14 @@ class AdminController extends Controller {
         };
     }
 
-    methodDPostImportSheet = async (req, res) => {
+    methodPostImportSheet = async (req, res) => {
         return res.success(true);
     };
     postImportSheet() {
         return {
             disabled: !this.roles.CREATE,
-            path: '/',
-            method: [adminRoleMiddleware([this.roles.CREATE]), verifyGoogleAppMiddleware(), this.methodDPostImportSheet],
+            path: '/import_sheet',
+            method: [adminRoleMiddleware([this.roles.CREATE]), verifyGoogleAppMiddleware(), this.methodPostImportSheet],
         };
     }
 
@@ -207,7 +207,7 @@ class AdminController extends Controller {
     postExportSheet() {
         return {
             disabled: !this.roles.READ,
-            path: '/',
+            path: '/export_sheet',
             method: [adminRoleMiddleware([this.roles.READ]), verifyGoogleAppMiddleware(), this.methodPostExportSheet],
         };
     }

package/src/Server.js

@@ -261,11 +261,10 @@ class Server {
                 const listPublicRouter = controller.publicRouter();
 
                 _.map(listPublicRouter, (method) => {
-                    const {name, type, disabled} = method;
-
-                    if (!disabled) {
-                        const router = controller[name]();
+                    const {name, type} = method;
 
+                    const router = controller[name]();
+                    if (!router.disabled) {
                         router.path = `/${method.path}/${router.path}`;
                         router.path = controller.pathName ? `/${controller.pathName}${router.path}` : router.path;
                         router.path = controllerVersion.startsWith('v') ? `/${controllerVersion}${router.path}` : router.path;
@@ -293,11 +292,11 @@ class Server {
                 throw new ErrorException(NOT_FOUND);
             });
 
-            app.use((e, req, res, next) => {
-                const error = errorCatch(e);
+            app.use((err, req, res, next) => {
+                const error = errorCatch(err);
 
                 if (error.errors[0].code === UNKNOWN) {
-                    console.error(req.originalUrl, e);
+                    console.error(req.originalUrl, err);
                 }
 
                 if (this.callbackError) {
@@ -318,7 +317,7 @@ class Server {
                     throw error;
                 }
 
-                let bind = typeof port === 'string' ? 'Pipe ' + port : 'Port ' + port;
+                const bind = typeof port === 'string' ? `Pipe ${port}` : `Port ${port}`;
 
                 switch (error.code) {
                     case 'EACCES':
@@ -337,18 +336,15 @@ class Server {
             server.listen(port);
 
             return server;
-        } else {
-            throw Error('No controllers in use API');
         }
-        return this;
+        throw Error('No controllers in use API');
     }
 
     startSocket(port) {
         if (!_.isEmpty(this.controllers)) {
-        } else {
-            throw Error('No controllers in use SOCKET');
+            return this;
         }
-        return this;
+        throw Error('No controllers in use SOCKET');
     }
 
     setAlertCallback(callback) {

package/src/middleware/verifyGoogleAppMiddleware.js

@@ -3,10 +3,10 @@ import {ErrorException, USER_NOT_VERIFIED} from '@azteam/error';
 
 export default function () {
     return async function (req, res, next) {
-        if (!req.user.googleCredential) {
+        if (!req.user.google_api_credential) {
             return next(new ErrorException(USER_NOT_VERIFIED));
         }
-        req.user.google_token = JSON.parse(decryptAES(req.user.googleCredential, process.env.SECRET_KEY));
+        req.user.google_api_credential = JSON.parse(decryptAES(req.user.google_api_credential, process.env.SECRET_KEY));
 
         return next();
     };