@spinajs/rbac-http 1.2.145 → 1.2.152

package/lib/augumentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"augumentation.js","sourceRoot":"","sources":["../src/augumentation.ts"],"names":[],"mappings":";;AAAA,yBAAuB"}

package/lib/config/rbac-http.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const middlewares_1 = require("../middlewares");
 const path_1 = require("path");
 function dir(path) {
     return (0, path_1.resolve)((0, path_1.normalize)((0, path_1.join)(__dirname, path)));
@@ -15,8 +14,7 @@ module.exports = {
     },
     http: {
         middlewares: [
-            // add global user from session middleware
-            (0, middlewares_1.UserFromSession)(),
+        // add global user from session middleware
         ],
     },
 };

package/lib/config/rbac-http.js.map

@@ -1 +1 @@
-{"version":3,"file":"rbac-http.js","sourceRoot":"","sources":["../../src/config/rbac-http.ts"],"names":[],"mappings":";;AAAA,gDAAiD;AACjD,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AACD,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC9B,KAAK,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC3B;KACF;IACD,IAAI,EAAE;QACJ,WAAW,EAAE;YACX,0CAA0C;YAC1C,IAAA,6BAAe,GAAE;SAClB;KACF;CACF,CAAC"}
+{"version":3,"file":"rbac-http.js","sourceRoot":"","sources":["../../src/config/rbac-http.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AACD,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAC9B,KAAK,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC3B;KACF;IACD,IAAI,EAAE;QACJ,WAAW,EAAE;QACX,0CAA0C;SAC3C;KACF;CACF,CAAC"}

package/lib/dto/login-dto.d.ts

@@ -17,4 +17,5 @@ export declare const LoginDtoSchema: {
 export declare class LoginDto {
     Login: string;
     Password: string;
+    constructor(data: any);
 }

package/lib/dto/login-dto.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoginDto = exports.LoginDtoSchema = void 0;
 const validation_1 = require("@spinajs/validation");
@@ -19,9 +22,13 @@ exports.LoginDtoSchema = {
     required: ['Login', 'Password'],
 };
 let LoginDto = class LoginDto {
+    constructor(data) {
+        Object.assign(this, data);
+    }
 };
 LoginDto = __decorate([
-    (0, validation_1.Schema)(exports.LoginDtoSchema)
+    (0, validation_1.Schema)(exports.LoginDtoSchema),
+    __metadata("design:paramtypes", [Object])
 ], LoginDto);
 exports.LoginDto = LoginDto;
 //# sourceMappingURL=login-dto.js.map

package/lib/dto/login-dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-dto.js","sourceRoot":"","sources":["../../src/dto/login-dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAA6C;AAEhC,QAAA,cAAc,GAAG;IAC5B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACxC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;CAChC,CAAC;AAGF,IAAa,QAAQ,GAArB,MAAa,QAAQ;CAIpB,CAAA;AAJY,QAAQ;IADpB,IAAA,mBAAM,EAAC,sBAAc,CAAC;GACV,QAAQ,CAIpB;AAJY,4BAAQ"}
+{"version":3,"file":"login-dto.js","sourceRoot":"","sources":["../../src/dto/login-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA6C;AAEhC,QAAA,cAAc,GAAG;IAC5B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,gBAAgB;IACvB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACxC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;CAChC,CAAC;AAGF,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAKnB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AARY,QAAQ;IADpB,IAAA,mBAAM,EAAC,sBAAc,CAAC;;GACV,QAAQ,CAQpB;AARY,4BAAQ"}

package/lib/dto/password-dto.d.ts

@@ -19,4 +19,5 @@ export declare const PasswordDtoSchema: {
 export declare class PasswordDto {
     Password: string;
     ConfirmPassword: string;
+    constructor(data: any);
 }

package/lib/dto/password-dto.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PasswordDto = exports.PasswordDtoSchema = void 0;
 const validation_1 = require("@spinajs/validation");
@@ -19,9 +22,13 @@ exports.PasswordDtoSchema = {
     required: ['Password', 'ConfirmPassword'],
 };
 let PasswordDto = class PasswordDto {
+    constructor(data) {
+        Object.assign(this, data);
+    }
 };
 PasswordDto = __decorate([
-    (0, validation_1.Schema)(exports.PasswordDtoSchema)
+    (0, validation_1.Schema)(exports.PasswordDtoSchema),
+    __metadata("design:paramtypes", [Object])
 ], PasswordDto);
 exports.PasswordDto = PasswordDto;
 //# sourceMappingURL=password-dto.js.map

package/lib/dto/password-dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"password-dto.js","sourceRoot":"","sources":["../../src/dto/password-dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAA6C;AAEhC,QAAA,iBAAiB,GAAG;IAC/B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QACzD,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KACjE;IACD,QAAQ,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;CAC1C,CAAC;AAGF,IAAa,WAAW,GAAxB,MAAa,WAAW;CAIvB,CAAA;AAJY,WAAW;IADvB,IAAA,mBAAM,EAAC,yBAAiB,CAAC;GACb,WAAW,CAIvB;AAJY,kCAAW"}
+{"version":3,"file":"password-dto.js","sourceRoot":"","sources":["../../src/dto/password-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA6C;AAEhC,QAAA,iBAAiB,GAAG;IAC/B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,mBAAmB;IAC1B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QACzD,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;KACjE;IACD,QAAQ,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;CAC1C,CAAC;AAGF,IAAa,WAAW,GAAxB,MAAa,WAAW;IAKtB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AARY,WAAW;IADvB,IAAA,mBAAM,EAAC,yBAAiB,CAAC;;GACb,WAAW,CAQvB;AARY,kCAAW"}

package/lib/dto/user-dto.d.ts

@@ -33,10 +33,11 @@ export declare const UserDtoSchema: {
     required: string[];
 };
 export declare class UserDto {
-    Id?: number;
+    Idsss?: number;
     Email: string;
     Login: string;
     Password: string;
     ConfirmPassword: string;
     NiceName: string;
+    constructor(data: any);
 }

package/lib/dto/user-dto.js

@@ -5,6 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserDto = exports.UserDtoSchema = void 0;
 const validation_1 = require("@spinajs/validation");
@@ -23,9 +26,13 @@ exports.UserDtoSchema = {
     required: ['Email', 'NiceName'],
 };
 let UserDto = class UserDto {
+    constructor(data) {
+        Object.assign(this, data);
+    }
 };
 UserDto = __decorate([
-    (0, validation_1.Schema)(exports.UserDtoSchema)
+    (0, validation_1.Schema)(exports.UserDtoSchema),
+    __metadata("design:paramtypes", [Object])
 ], UserDto);
 exports.UserDto = UserDto;
 //# sourceMappingURL=user-dto.js.map

package/lib/dto/user-dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-dto.js","sourceRoot":"","sources":["../../src/dto/user-dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAA6C;AAChC,QAAA,aAAa,GAAG;IAC3B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;QACzD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACxC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QAChE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QACzD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;CAChC,CAAC;AAGF,IAAa,OAAO,GAApB,MAAa,OAAO;CAYnB,CAAA;AAZY,OAAO;IADnB,IAAA,mBAAM,EAAC,qBAAa,CAAC;GACT,OAAO,CAYnB;AAZY,0BAAO"}
+{"version":3,"file":"user-dto.js","sourceRoot":"","sources":["../../src/dto/user-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA6C;AAChC,QAAA,aAAa,GAAG;IAC3B,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,UAAU;IACjB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;QACzD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;QACxC,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QAChE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QACzD,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;KAC5C;IACD,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;CAChC,CAAC;AAGF,IAAa,OAAO,GAApB,MAAa,OAAO;IAalB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAhBY,OAAO;IADnB,IAAA,mBAAM,EAAC,qBAAa,CAAC;;GACT,OAAO,CAgBnB;AAhBY,0BAAO"}

package/lib/middlewares.d.ts

@@ -1,6 +1,11 @@
+import { SessionProvider } from '@spinajs/rbac';
 import 'reflect-metadata';
 import * as express from 'express';
-/**
- * global express middleware that loads user from session
- */
-export declare function UserFromSession(): (req: express.Request, _res: express.Response, next: express.NextFunction) => Promise<void>;
+import { ServerMiddleware } from '@spinajs/http';
+export declare class UserFromSessionMiddleware extends ServerMiddleware {
+    protected CoockieSecret: string;
+    protected SessionProvider: SessionProvider;
+    resolveAsync(): Promise<void>;
+    before(): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+    after(): (req: express.Request, res: express.Response, next: express.NextFunction) => void;
+}

package/lib/middlewares.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -22,50 +28,64 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserFromSession = void 0;
+exports.UserFromSessionMiddleware = void 0;
 const rbac_1 = require("@spinajs/rbac");
 const di_1 = require("@spinajs/di");
 require("reflect-metadata");
 const configuration_1 = require("@spinajs/configuration");
 const cs = __importStar(require("cookie-signature"));
-const console_1 = require("console");
 const luxon_1 = require("luxon");
-/**
- * global express middleware that loads user from session
- */
-function UserFromSession() {
-    const wrapper = async (req, _res, next) => {
-        if (req.cookies.ssid) {
-            const secureKey = di_1.DI.get(configuration_1.Configuration).get('http.cookie.secret');
-            if (!secureKey) {
-                next();
-                (0, console_1.assert)(secureKey, 'coockie secure key should be set');
-                return;
-            }
-            const ssid = cs.unsign(req.cookies.ssid, secureKey);
-            if (ssid) {
-                const sessionProvider = di_1.DI.has(rbac_1.SessionProvider) ? di_1.DI.get(rbac_1.SessionProvider) : await di_1.DI.resolve(rbac_1.SessionProvider);
-                const session = (await sessionProvider.restoreSession(ssid));
-                if (session) {
-                    req.User = new rbac_1.User(session.Data);
-                    const liveTimeDiff = session.Expiration.diff(luxon_1.DateTime.now());
-                    if (liveTimeDiff.minutes < 30) {
-                        await sessionProvider.refreshSession(session);
+const http_1 = require("@spinajs/http");
+let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.ServerMiddleware {
+    async resolveAsync() {
+        if (!this.CoockieSecret) {
+            throw new Error('http.cookie.secres is not set, cannot start UserFromSessionMiddleware. Set this value in configuration file !');
+        }
+    }
+    before() {
+        return async (req, _res, next) => {
+            try {
+                if (req.cookies.ssid) {
+                    const ssid = cs.unsign(req.cookies.ssid, this.CoockieSecret);
+                    if (ssid) {
+                        const session = (await this.SessionProvider.restoreSession(ssid));
+                        if (session) {
+                            req.storage.user = new rbac_1.User(session.Data);
+                            const liveTimeDiff = session.Expiration.diff(luxon_1.DateTime.now());
+                            if (liveTimeDiff.minutes < 30) {
+                                await this.SessionProvider.refreshSession(session);
+                            }
+                        }
+                    }
+                    else {
+                        req.storage.user = null;
                     }
                 }
+                next();
             }
-            else {
-                req.User = null;
+            catch (err) {
+                next(err);
             }
-        }
-        next();
-    };
-    Object.defineProperty(wrapper, 'name', {
-        value: 'userFromSession',
-        writable: true,
-    });
-    return wrapper;
-}
-exports.UserFromSession = UserFromSession;
+        };
+    }
+    after() {
+        return null;
+    }
+};
+__decorate([
+    (0, configuration_1.Config)('http.cookie.secret'),
+    __metadata("design:type", String)
+], UserFromSessionMiddleware.prototype, "CoockieSecret", void 0);
+__decorate([
+    (0, di_1.Autoinject)(),
+    __metadata("design:type", rbac_1.SessionProvider)
+], UserFromSessionMiddleware.prototype, "SessionProvider", void 0);
+UserFromSessionMiddleware = __decorate([
+    (0, di_1.Injectable)(http_1.ServerMiddleware)
+], UserFromSessionMiddleware);
+exports.UserFromSessionMiddleware = UserFromSessionMiddleware;
 //# sourceMappingURL=middlewares.js.map

package/lib/middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAmE;AACnE,oCAAiC;AACjC,4BAA0B;AAE1B,0DAAuD;AACvD,qDAAuC;AACvC,qCAAiC;AACjC,iCAAiC;AAEjC;;GAEG;AACH,SAAgB,eAAe;IAC7B,MAAM,OAAO,GAAG,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,IAA0B,EAAE,EAAE;QACjG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;YACpB,MAAM,SAAS,GAAG,OAAE,CAAC,GAAG,CAAC,6BAAa,CAAC,CAAC,GAAG,CAAS,oBAAoB,CAAC,CAAC;YAE1E,IAAI,CAAC,SAAS,EAAE;gBACd,IAAI,EAAE,CAAC;gBACP,IAAA,gBAAM,EAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;gBACtD,OAAO;aACR;YAED,MAAM,IAAI,GAAmB,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACpE,IAAI,IAAI,EAAE;gBACR,MAAM,eAAe,GAAG,OAAE,CAAC,GAAG,CAAC,sBAAe,CAAC,CAAC,CAAC,CAAC,OAAE,CAAC,GAAG,CAAC,sBAAe,CAAC,CAAC,CAAC,CAAC,MAAM,OAAE,CAAC,OAAO,CAAC,sBAAe,CAAC,CAAC;gBAC9G,MAAM,OAAO,GAAG,CAAC,MAAM,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAgB,CAAC;gBAC5E,IAAI,OAAO,EAAE;oBACX,GAAG,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;oBAClC,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;oBAC7D,IAAI,YAAY,CAAC,OAAO,GAAG,EAAE,EAAE;wBAC7B,MAAM,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;qBAC/C;iBACF;aACF;iBAAM;gBACL,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;aACjB;SACF;QAED,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;IAEF,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE;QACrC,KAAK,EAAE,iBAAiB;QACxB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC;AApCD,0CAoCC"}
+{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAmE;AACnE,oCAAqD;AACrD,4BAA0B;AAE1B,0DAAgD;AAChD,qDAAuC;AACvC,iCAAiC;AACjC,wCAAsE;AAGtE,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,uBAAgB;IAOtD,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;SAClI;IACH,CAAC;IAEM,MAAM;QACX,OAAO,KAAK,EAAE,GAAa,EAAE,IAAsB,EAAE,IAA0B,EAAE,EAAE;YACjF,IAAI;gBACF,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;oBACpB,MAAM,IAAI,GAAmB,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;oBAC7E,IAAI,IAAI,EAAE;wBACR,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAgB,CAAC;wBACjF,IAAI,OAAO,EAAE;4BACX,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;4BAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;4BAC7D,IAAI,YAAY,CAAC,OAAO,GAAG,EAAE,EAAE;gCAC7B,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;6BACpD;yBACF;qBACF;yBAAM;wBACL,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;qBACzB;iBACF;gBACD,IAAI,EAAE,CAAC;aACR;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,GAAG,CAAC,CAAC;aACX;QACH,CAAC,CAAC;IACJ,CAAC;IACM,KAAK;QACV,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAtCC;IADC,IAAA,sBAAM,EAAC,oBAAoB,CAAC;;gEACG;AAGhC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;kEAAC;AALhC,yBAAyB;IADrC,IAAA,eAAU,EAAC,uBAAgB,CAAC;GAChB,yBAAyB,CAwCrC;AAxCY,8DAAyB"}

package/lib/policies.d.ts

@@ -1,13 +1,12 @@
 import { AccessControl, Permission } from 'accesscontrol';
-import { BasePolicy, IController, IRoute } from '@spinajs/http';
-import * as express from 'express';
+import { BasePolicy, IController, IRoute, Request as sRequest } from '@spinajs/http';
 import { User } from '@spinajs/rbac';
 export declare class RbacPolicy extends BasePolicy {
     protected Ac: AccessControl;
     constructor();
     isEnabled(_action: IRoute, _instance: IController): boolean;
-    execute(req: express.Request, action: IRoute, instance: IController): Promise<void>;
+    execute(req: sRequest, action: IRoute, instance: IController): Promise<void>;
 }
 export declare function checkRbacPermission(role: string | string[], resource: string, permission: string): Permission;
 export declare function checkUserPermission(user: User, resource: string, permission: string): Permission;
-export declare function checkRoutePermission(req: express.Request, resource: string, permission: string): Permission;
+export declare function checkRoutePermission(req: sRequest, resource: string, permission: string): Permission;

package/lib/policies.js

@@ -25,11 +25,11 @@ class RbacPolicy extends http_1.BasePolicy {
         if (!descriptor || !descriptor.Permission) {
             throw new exceptions_1.Forbidden(`no route permission or resources assigned`);
         }
-        if (!req.User) {
+        if (!req.storage || !req.storage.user) {
             throw new exceptions_1.AuthenticationFailed();
         }
         if (!checkRoutePermission(req, descriptor.Resource, permission).granted) {
-            throw new exceptions_1.Forbidden(`role(s) ${req.User.Role} does not have permission ${permission} for resource ${descriptor.Resource}`);
+            throw new exceptions_1.Forbidden(`role(s) ${req.storage.user.Role} does not have permission ${permission} for resource ${descriptor.Resource}`);
         }
     }
 }
@@ -48,10 +48,10 @@ function checkUserPermission(user, resource, permission) {
 }
 exports.checkUserPermission = checkUserPermission;
 function checkRoutePermission(req, resource, permission) {
-    if (!req.User) {
+    if (!req.storage || !req.storage.user) {
         return null;
     }
-    return checkUserPermission(req.User, resource, permission);
+    return checkUserPermission(req.storage.user, resource, permission);
 }
 exports.checkRoutePermission = checkRoutePermission;
 //# sourceMappingURL=policies.js.map

package/lib/policies.js.map

@@ -1 +1 @@
-{"version":3,"file":"policies.js","sourceRoot":"","sources":["../src/policies.ts"],"names":[],"mappings":";;;AACA,wCAAgE;AAEhE,oDAAsE;AACtE,6CAAyD;AAEzD,oCAAiC;AAGjC,MAAa,UAAW,SAAQ,iBAAU;IAGxC;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,EAAE,GAAG,OAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IAEM,SAAS,CAAC,OAAe,EAAE,SAAsB;QACtD,0BAA0B;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,GAAoB,EAAE,MAAc,EAAE,QAAqB;;QAC9E,MAAM,UAAU,GAAoB,OAAO,CAAC,WAAW,CAAC,sCAAyB,EAAE,QAAQ,CAAC,CAAC;QAC7F,IAAI,UAAU,GAAG,MAAA,UAAU,CAAC,UAAU,mCAAI,EAAE,CAAC;QAE7C,wCAAwC;QACxC,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACxC,UAAU,GAAG,MAAA,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,mCAAI,EAAE,CAAC;SACpE;QAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YACzC,MAAM,IAAI,sBAAS,CAAC,2CAA2C,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;YACb,MAAM,IAAI,iCAAoB,EAAE,CAAC;SAClC;QAED,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE;YACvE,MAAM,IAAI,sBAAS,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,IAAI,6BAA6B,UAAU,iBAAiB,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC5H;IACH,CAAC;CACF;AAnCD,gCAmCC;AAED,SAAgB,mBAAmB,CAAC,IAAuB,EAAE,QAAgB,EAAE,UAAkB;IAC/F,MAAM,EAAE,GAAG,OAAE,CAAC,GAAG,CAAgB,eAAe,CAAC,CAAC;IAClD,OAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;AACrD,CAAC;AAHD,kDAGC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,QAAgB,EAAE,UAAkB;IAClF,MAAM,EAAE,GAAG,OAAE,CAAC,GAAG,CAAgB,eAAe,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,OAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;AACrE,CAAC;AARD,kDAQC;AAED,SAAgB,oBAAoB,CAAC,GAAoB,EAAE,QAAgB,EAAE,UAAkB;IAC7F,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACb,OAAO,IAAI,CAAC;KACb;IAED,OAAO,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAC7D,CAAC;AAND,oDAMC"}
+{"version":3,"file":"policies.js","sourceRoot":"","sources":["../src/policies.ts"],"names":[],"mappings":";;;AACA,wCAAqF;AACrF,oDAAsE;AACtE,6CAAyD;AAEzD,oCAAiC;AAGjC,MAAa,UAAW,SAAQ,iBAAU;IAGxC;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,EAAE,GAAG,OAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACpC,CAAC;IAEM,SAAS,CAAC,OAAe,EAAE,SAAsB;QACtD,0BAA0B;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,GAAa,EAAE,MAAc,EAAE,QAAqB;;QACvE,MAAM,UAAU,GAAoB,OAAO,CAAC,WAAW,CAAC,sCAAyB,EAAE,QAAQ,CAAC,CAAC;QAC7F,IAAI,UAAU,GAAG,MAAA,UAAU,CAAC,UAAU,mCAAI,EAAE,CAAC;QAE7C,wCAAwC;QACxC,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YACxC,UAAU,GAAG,MAAA,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,mCAAI,EAAE,CAAC;SACpE;QAED,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YACzC,MAAM,IAAI,sBAAS,CAAC,2CAA2C,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,MAAM,IAAI,iCAAoB,EAAE,CAAC;SAClC;QAED,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE;YACvE,MAAM,IAAI,sBAAS,CAAC,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,6BAA6B,UAAU,iBAAiB,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;SACpI;IACH,CAAC;CACF;AAnCD,gCAmCC;AAED,SAAgB,mBAAmB,CAAC,IAAuB,EAAE,QAAgB,EAAE,UAAkB;IAC/F,MAAM,EAAE,GAAG,OAAE,CAAC,GAAG,CAAgB,eAAe,CAAC,CAAC;IAClD,OAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;AACrD,CAAC;AAHD,kDAGC;AAED,SAAgB,mBAAmB,CAAC,IAAU,EAAE,QAAgB,EAAE,UAAkB;IAClF,MAAM,EAAE,GAAG,OAAE,CAAC,GAAG,CAAgB,eAAe,CAAC,CAAC;IAElD,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,OAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;AACrE,CAAC;AARD,kDAQC;AAED,SAAgB,oBAAoB,CAAC,GAAa,EAAE,QAAgB,EAAE,UAAkB;IACtF,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;IAED,OAAO,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AACrE,CAAC;AAND,oDAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/rbac-http",
-  "version": "1.2.145",
+  "version": "1.2.152",
   "description": "HTTP API for user session & permissions",
   "main": "lib/index.js",
   "private": false,
@@ -43,7 +43,7 @@
     "@spinajs/exceptions": "^1.2.127",
     "@spinajs/log": "^1.2.137",
     "@spinajs/orm": "^1.2.140",
-    "@spinajs/rbac": "^1.2.140",
+    "@spinajs/rbac": "^1.2.152",
     "@spinajs/reflection": "^1.2.137",
     "accesscontrol": "^2.2.1",
     "luxon": "^2.4.0"
@@ -51,5 +51,5 @@
   "devDependencies": {
     "@spinajs/orm-sqlite": "^1.2.140"
   },
-  "gitHead": "fce080fe09be9b255f34981bfd00257726472f60"
+  "gitHead": "c18f00316083d2ce7a080572b833cb4cc37bef7d"
 }