@hapiboo/module-auth 1.1.3 → 1.2.1

package/dist/service/authentication.js

@@ -217,6 +217,7 @@ var authenticationService;
                         core_1.promise.checkVoid(authorization_1.authorizationService.general.initializeSecurityModel(), reject)
                             .then(() => {
                             //create first admin
+                            console.info('creating first admin user: ' + settings_1.authSettings.firstAdmin.email);
                             core_1.promise.resolve(admin.invite(settings_1.authSettings.firstAdmin.email, settings_1.authSettings.firstAdmin.email, settings_1.authSettings.firstAdmin.name, baseURL), resolve, reject);
                         });
                     }

package/dist/service/security.d.ts

@@ -36,10 +36,10 @@ export declare namespace securityService {
         function client(request: Request, response: Response, next: NextFunction): void;
         function refresh(request: IFluxTokenRequest, response: Response, next: NextFunction): void;
         function simple(request: IFluxRequest, response: Response, next: NextFunction): void;
+        function account(request: IFluxRequest, response: Response, next: NextFunction): void;
         function full<TData>(request: IFluxDataRequest<TData>, response: Response, next: NextFunction): void;
-        function admin(request: IFluxRequest, response: Response, next: NextFunction): void;
-        function data<TData>(request: IFluxDataRequest<TData>, response: Response, next: NextFunction): void;
         function checkAdmin(request: IFluxRequest, response: Response, next: NextFunction): void;
+        function checkAccount(request: IFluxRequest, response: Response, next: NextFunction): void;
         function checkData<TData>(request: IFluxDataRequest<TData>, response: Response, next: NextFunction): void;
     }
 }

package/dist/service/security.js

@@ -141,6 +141,27 @@ var securityService;
             }
         }
         middleware.simple = simple;
+        function account(request, response, next) {
+            request.payload = undefined;
+            try {
+                const payload = helpers.__validateTokenAndGetPayload(helpers.__retractRequestToken(request));
+                request.payload = { user_id: payload.user_id, account_id: payload.account_id, admin: payload.admin };
+                next();
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    response.status(401);
+                    response.json({ error: error.message });
+                    return;
+                }
+                else {
+                    response.status(401);
+                    response.json({ error: 'auth token validation error' });
+                    return;
+                }
+            }
+        }
+        middleware.account = account;
         function full(request, response, next) {
             request.payload = undefined;
             try {
@@ -162,7 +183,7 @@ var securityService;
             }
         }
         middleware.full = full;
-        function admin(request, response, next) {
+        function _admin(request, response, next) {
             if (request.payload && request.payload.admin) {
                 next();
             }
@@ -171,8 +192,16 @@ var securityService;
                 response.json({ error: 'insufficient priviledges' });
             }
         }
-        middleware.admin = admin;
-        function data(request, response, next) {
+        function _account(request, response, next) {
+            if (request.payload && request.payload.account_id && request.payload.account_id != undefined) {
+                next();
+            }
+            else {
+                response.status(400);
+                response.json({ error: 'malformed payload' });
+            }
+        }
+        function _data(request, response, next) {
             if (request.payload && request.payload.data && request.payload.data != undefined) {
                 next();
             }
@@ -181,16 +210,21 @@ var securityService;
                 response.json({ error: 'malformed payload data' });
             }
         }
-        middleware.data = data;
         function checkAdmin(request, response, next) {
             simple(request, response, () => {
-                admin(request, response, next);
+                _admin(request, response, next);
             });
         }
         middleware.checkAdmin = checkAdmin;
+        function checkAccount(request, response, next) {
+            account(request, response, () => {
+                _account(request, response, next);
+            });
+        }
+        middleware.checkAccount = checkAccount;
         function checkData(request, response, next) {
             full(request, response, () => {
-                data(request, response, next);
+                _data(request, response, next);
             });
         }
         middleware.checkData = checkData;

package/dist/service/settings.js

@@ -17,6 +17,7 @@ var authSettings;
     };
     let _performers = undefined;
     function init(settings, performers) {
+        console.log('authSettings.init()');
         _settings = settings;
         _performers = performers;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapiboo/module-auth",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "MK13 Studio Hapiboo - Auth Module",
   "author": "MK13 Studio",
   "license": "ISC",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@hapiboo/core": "^3.0.6",
     "@hapiboo/crypto": "^3.0.1",
-    "@hapiboo/date": "^3.0.3",
+    "@hapiboo/date": "^3.0.4",
     "@hapiboo/flux": "^1.1.4",
     "@hapiboo/server": "^3.0.2",
     "express": "^5.2.1",