@spinajs/rbac-http 1.2.211 → 2.0.15

package/lib/controllers/LoginController.d.ts

@@ -1,12 +1,12 @@
 import { LoginDto } from './../dto/login-dto';
-import { BaseController, Ok, CookieResponse, Unauthorized } from '@spinajs/http';
-import { AuthProvider, SessionProvider } from '@spinajs/rbac';
+import { BaseController, Ok, CookieResponse, Unauthorized, NotAllowed } from '@spinajs/http';
+import { AuthProvider, SessionProvider, User as UserModel } from '@spinajs/rbac';
 import { Configuration } from '@spinajs/configuration';
 export declare class LoginController extends BaseController {
     protected Configuration: Configuration;
     protected AuthProvider: AuthProvider;
     protected SessionProvider: SessionProvider;
     protected SessionExpirationTime: number;
-    login(credentials: LoginDto): Promise<Unauthorized | CookieResponse>;
+    login(credentials: LoginDto, logged: UserModel): Promise<Unauthorized | CookieResponse | NotAllowed>;
     logout(ssid: string): Promise<Ok | CookieResponse>;
 }

package/lib/controllers/LoginController.js

@@ -11,6 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LoginController = void 0;
 const login_dto_1 = require("./../dto/login-dto");
@@ -18,9 +21,13 @@ const http_1 = require("@spinajs/http");
 const rbac_1 = require("@spinajs/rbac");
 const di_1 = require("@spinajs/di");
 const configuration_1 = require("@spinajs/configuration");
-const luxon_1 = require("luxon");
+const decorators_1 = require("./../decorators");
+const lodash_1 = __importDefault(require("lodash"));
 let LoginController = class LoginController extends http_1.BaseController {
-    async login(credentials) {
+    async login(credentials, logged) {
+        if (logged) {
+            return new http_1.NotAllowed('User already logged in. Please logout before trying to authorize.');
+        }
         const user = await this.AuthProvider.authenticate(credentials.Login, credentials.Password);
         if (!user) {
             return new http_1.Unauthorized({
@@ -29,29 +36,19 @@ let LoginController = class LoginController extends http_1.BaseController {
                 },
             });
         }
-        const lifetime = luxon_1.DateTime.now().plus({ minutes: this.SessionExpirationTime });
-        const uObject = {
-            Login: user.Login,
-            Email: user.Email,
-            NiceName: user.NiceName,
-            Metadata: user.Metadata.map((m) => ({ Key: m.Key, Value: m.Value })),
-            Role: user.Role,
-            Id: user.Id,
-        };
-        const session = new rbac_1.Session({
-            Data: uObject,
-            Expiration: lifetime,
-        });
-        await this.SessionProvider.updateSession(session);
-        // sessionExpiration time is in minutes
-        // coockie maxAge is in seconds
-        return new http_1.CookieResponse('ssid', session.SessionId, this.SessionExpirationTime * 60, uObject, { httpOnly: true });
+        await user.Metadata.populate();
+        const session = new rbac_1.Session();
+        const sData = user.dehydrate();
+        session.Data.set('User', sData);
+        await this.SessionProvider.save(session);
+        // BEWARE: httpOnly coockie, only accesible via http method in browser
+        return new http_1.CookieResponse('ssid', session.SessionId, this.SessionExpirationTime, true, lodash_1.default.omit(sData, ['Id']), { httpOnly: true });
     }
     async logout(ssid) {
         if (!ssid) {
             return new http_1.Ok();
         }
-        await this.SessionProvider.deleteSession(ssid);
+        await this.SessionProvider.delete(ssid);
         // send empty cookie to confirm session deletion
         return new http_1.CookieResponse('ssid', null, this.SessionExpirationTime);
     }
@@ -69,14 +66,15 @@ __decorate([
     __metadata("design:type", rbac_1.SessionProvider)
 ], LoginController.prototype, "SessionProvider", void 0);
 __decorate([
-    (0, configuration_1.Config)('rbac.session.expiration', 10),
+    (0, configuration_1.Config)('rbac.session.expiration', 120),
     __metadata("design:type", Number)
 ], LoginController.prototype, "SessionExpirationTime", void 0);
 __decorate([
     (0, http_1.Post)(),
     __param(0, (0, http_1.Body)()),
+    __param(1, (0, decorators_1.User)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [login_dto_1.LoginDto]),
+    __metadata("design:paramtypes", [login_dto_1.LoginDto, rbac_1.User]),
     __metadata("design:returntype", Promise)
 ], LoginController.prototype, "login", null);
 __decorate([
@@ -87,7 +85,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], LoginController.prototype, "logout", null);
 LoginController = __decorate([
-    (0, http_1.BasePath)('auth')
+    (0, http_1.BasePath)('user/auth')
 ], LoginController);
 exports.LoginController = LoginController;
 //# sourceMappingURL=LoginController.js.map

package/lib/controllers/LoginController.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginController.js","sourceRoot":"","sources":["../../src/controllers/LoginController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA8C;AAC9C,wCAAoH;AACpH,wCAAuE;AACvE,oCAAyC;AACzC,0DAA+D;AAC/D,iCAAiC;AAGjC,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,qBAAc;IAc1C,KAAK,CAAC,KAAK,CAAS,WAAqB;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3F,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,mBAAY,CAAC;gBACtB,KAAK,EAAE;oBACL,OAAO,EAAE,6BAA6B;iBACvC;aACF,CAAC,CAAC;SACJ;QAED,MAAM,QAAQ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAE9E,MAAM,OAAO,GAAG;YACd,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YACpE,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;SACZ,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,cAAO,CAAC;YAC1B,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAElD,uCAAuC;QACvC,+BAA+B;QAC/B,OAAO,IAAI,qBAAc,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,qBAAqB,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACrH,CAAC;IAGM,KAAK,CAAC,MAAM,CAAW,IAAY;QACxC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,SAAE,EAAE,CAAC;SACjB;QAED,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/C,gDAAgD;QAChD,OAAO,IAAI,qBAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACtE,CAAC;CACF,CAAA;AAzDC;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;sDAAC;AAGvC;IADC,IAAA,eAAU,GAAE;8BACW,mBAAY;qDAAC;AAGrC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;wDAAC;AAG3C;IADC,IAAA,sBAAM,EAAC,yBAAyB,EAAE,EAAE,CAAC;;8DACE;AAGxC;IADC,IAAA,WAAI,GAAE;IACa,WAAA,IAAA,WAAI,GAAE,CAAA;;qCAAc,oBAAQ;;4CAgC/C;AAGD;IADC,IAAA,UAAG,GAAE;IACe,WAAA,IAAA,aAAM,GAAE,CAAA;;;;6CAS5B;AA1DU,eAAe;IAD3B,IAAA,eAAQ,EAAC,MAAM,CAAC;GACJ,eAAe,CA2D3B;AA3DY,0CAAe"}
+{"version":3,"file":"LoginController.js","sourceRoot":"","sources":["../../src/controllers/LoginController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,kDAA8C;AAC9C,wCAAgI;AAChI,wCAA0F;AAC1F,oCAAyC;AACzC,0DAA+D;AAC/D,gDAAuC;AACvC,oDAAuB;AAGvB,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,qBAAc;IAc1C,KAAK,CAAC,KAAK,CAAS,WAAqB,EAAU,MAAiB;QACzE,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,iBAAU,CAAC,mEAAmE,CAAC,CAAC;SAC5F;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE3F,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,mBAAY,CAAC;gBACtB,KAAK,EAAE;oBACL,OAAO,EAAE,6BAA6B;iBACvC;aACF,CAAC,CAAC;SACJ;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAE/B,MAAM,OAAO,GAAG,IAAI,cAAO,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAE/B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAEhC,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEzC,sEAAsE;QACtE,OAAO,IAAI,qBAAc,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,EAAE,gBAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IACpI,CAAC;IAGM,KAAK,CAAC,MAAM,CAAW,IAAY;QACxC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,SAAE,EAAE,CAAC;SACjB;QAED,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAExC,gDAAgD;QAChD,OAAO,IAAI,qBAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACtE,CAAC;CACF,CAAA;AAnDC;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;sDAAC;AAGvC;IADC,IAAA,eAAU,GAAE;8BACW,mBAAY;qDAAC;AAGrC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;wDAAC;AAG3C;IADC,IAAA,sBAAM,EAAC,yBAAyB,EAAE,GAAG,CAAC;;8DACC;AAGxC;IADC,IAAA,WAAI,GAAE;IACa,WAAA,IAAA,WAAI,GAAE,CAAA;IAAyB,WAAA,IAAA,iBAAI,GAAE,CAAA;;qCAAjB,oBAAQ,EAAkB,WAAS;;4CA0B1E;AAGD;IADC,IAAA,UAAG,GAAE;IACe,WAAA,IAAA,aAAM,GAAE,CAAA;;;;6CAS5B;AApDU,eAAe;IAD3B,IAAA,eAAQ,EAAC,WAAW,CAAC;GACT,eAAe,CAqD3B;AArDY,0CAAe"}

package/lib/controllers/UserAdminController.js

@@ -0,0 +1,82 @@
+// import { InvalidArgument } from '@spinajs/exceptions';
+// import { BaseController, Body, Get, NotFound, Ok, Patch, Post, Query, Req, Param } from '@spinajs/http';
+// import { DateTime, RawQuery } from '@spinajs/orm';
+// import { PasswordProvider, User } from '@spinajs/rbac';
+// import { Permission, Resource } from './../decorators';
+// import { UserDto } from '../dto/user-dto';
+// import { BasePath } from 'http/lib';
+// @Resource('user')
+// @BasePath('user')
+// export class UsersController extends BaseController {
+//   @Get('/')
+//   @Permission('readAny')
+//   public async listUsers(@Query() search: string, @Query({ type: 'number', minimum: 1 }) page: number, @Query({ type: 'number', minimum: 1 }) perPage: number, @Query() order: string, @Query(OrderSchema) orderDirection: SORT_ORDER, @Req() request: express.Request) {
+//     /**
+//      * implement include query param
+//      * do not return internal id
+//      *
+//      */
+//     const query = User.all()
+//       .whereNull('DeletedAt')
+//       .skip((page - 1) * perPage)
+//       .take(perPage)
+//       .order(order, orderDirection)
+//       .populate('Metadata');
+//     const countQuery = User.query().select(new RawQuery('count(*) as count')).whereNull('DeletedAt');
+//     if (search) {
+//       const searchFunc = function () {
+//         this.where('Email', 'like', `%${search}%`);
+//         this.orWhere('NiceName', 'like', `%${search}%`);
+//       };
+//       query.where(searchFunc);
+//       countQuery.where(searchFunc);
+//     }
+//     const r = await query;
+//     const c = await countQuery.asRaw<Array<{ count: number }>>();
+//     if (r.length === 0) {
+//       return new NotFound('no users met search criteria');
+//     }
+//     return new Ok(
+//       this.DataTransformer.transform(
+//         {
+//           Data: r.map((u) => u.dehydrate()),
+//           Total: c[0].count,
+//         },
+//         request,
+//       ),
+//     );
+//   }
+//   // @Post('/')
+//   // public async addUser(@Body() user: UserDto) {
+//   //   const password = this._container.resolve<PasswordProvider>(PasswordProvider);
+//   //   if (user.Password !== user.ConfirmPassword) {
+//   //     throw new InvalidArgument('password does not match');
+//   //   }
+//   //   let hashedPassword = '';
+//   //   let userPassword = user.Password;
+//   //   if (!userPassword) {
+//   //     userPassword = password.generate();
+//   //   }
+//   //   hashedPassword = await password.hash(userPassword);
+//   //   const entity = new User({
+//   //     Email: user.Email,
+//   //     Login: user.Login,
+//   //     NiceName: user.NiceName,
+//   //     Password: hashedPassword,
+//   //     CreatedAt: DateTime.now(),
+//   //     Role: user.Role,
+//   //   });
+//   //   await entity.insert();
+//   //   return new Ok({ Id: entity.Id });
+//   // }
+//   // @Patch('role/add/:login/:role')
+//   // @Permission('updateAny')
+//   // public async addRole(@Param() login: string, @Param() role: string) {}
+//   // @Patch('role/revoke/:login/:role')
+//   // @Permission('updateAny')
+//   // public async revokeRole(@Param() login: string, @Param() role: string) {}
+//   // @Patch('update/:login')
+//   // @Permission('updateAny')
+//   // public async update(@Param() login: string, @Body() data: any) {}
+// }
+//# sourceMappingURL=UserAdminController.js.map

package/lib/controllers/UserAdminController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserAdminController.js","sourceRoot":"","sources":["../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,2GAA2G;AAC3G,qDAAqD;AACrD,0DAA0D;AAC1D,0DAA0D;AAC1D,6CAA6C;AAC7C,uCAAuC;AAEvC,oBAAoB;AACpB,oBAAoB;AACpB,wDAAwD;AACxD,cAAc;AACd,2BAA2B;AAC3B,4QAA4Q;AAC5Q,UAAU;AACV,uCAAuC;AACvC,mCAAmC;AACnC,SAAS;AACT,UAAU;AAEV,+BAA+B;AAC/B,gCAAgC;AAChC,oCAAoC;AACpC,uBAAuB;AACvB,sCAAsC;AACtC,+BAA+B;AAC/B,wGAAwG;AAExG,oBAAoB;AACpB,yCAAyC;AACzC,sDAAsD;AACtD,2DAA2D;AAC3D,WAAW;AAEX,iCAAiC;AACjC,sCAAsC;AACtC,QAAQ;AAER,6BAA6B;AAC7B,oEAAoE;AAEpE,4BAA4B;AAC5B,6DAA6D;AAC7D,QAAQ;AAER,qBAAqB;AACrB,wCAAwC;AACxC,YAAY;AACZ,+CAA+C;AAC/C,+BAA+B;AAC/B,aAAa;AACb,mBAAmB;AACnB,WAAW;AACX,SAAS;AACT,MAAM;AAEN,kBAAkB;AAClB,qDAAqD;AACrD,uFAAuF;AACvF,uDAAuD;AACvD,iEAAiE;AACjE,WAAW;AAEX,kCAAkC;AAClC,2CAA2C;AAE3C,8BAA8B;AAC9B,+CAA+C;AAC/C,WAAW;AAEX,6DAA6D;AAC7D,mCAAmC;AACnC,8BAA8B;AAC9B,8BAA8B;AAC9B,oCAAoC;AACpC,qCAAqC;AACrC,sCAAsC;AACtC,4BAA4B;AAC5B,aAAa;AAEb,gCAAgC;AAEhC,2CAA2C;AAC3C,SAAS;AAET,uCAAuC;AACvC,gCAAgC;AAChC,8EAA8E;AAE9E,0CAA0C;AAC1C,gCAAgC;AAChC,iFAAiF;AAEjF,+BAA+B;AAC/B,gCAAgC;AAChC,yEAAyE;AACzE,IAAI"}

package/lib/controllers/UserController.d.ts

@@ -0,0 +1,10 @@
+import { PasswordDto } from '../dto/password-dto';
+import { User as UserModel, PasswordProvider, SessionProvider } from '@spinajs/rbac';
+import { BaseController, Ok } from '@spinajs/http';
+export declare class UserController extends BaseController {
+    protected PasswordProvider: PasswordProvider;
+    protected CoockieSecret: string;
+    protected SessionProvider: SessionProvider;
+    refresh(user: UserModel, ssid: string): Promise<Ok>;
+    newPassword(login: string, pwd: PasswordDto): Promise<Ok>;
+}

package/lib/controllers/UserController.js

@@ -0,0 +1,115 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserController = void 0;
+const password_dto_1 = require("../dto/password-dto");
+const rbac_1 = require("@spinajs/rbac");
+const http_1 = require("@spinajs/http");
+const exceptions_1 = require("@spinajs/exceptions");
+const di_1 = require("@spinajs/di");
+const decorators_1 = require("../decorators");
+const http_2 = require("@spinajs/http");
+const configuration_1 = require("@spinajs/configuration");
+const cs = __importStar(require("cookie-signature"));
+const lodash_1 = __importDefault(require("lodash"));
+let UserController = class UserController extends http_1.BaseController {
+    async refresh(user, ssid) {
+        // get user data from db
+        await user.refresh();
+        // refresh session data from DB
+        const sId = cs.unsign(ssid, this.CoockieSecret);
+        if (sId) {
+            const session = await this.SessionProvider.restore(sId);
+            if (session) {
+                session.Data.set('User', user.dehydrate());
+            }
+        }
+        return new http_1.Ok(lodash_1.default.omit(user.dehydrate(), ['Id']));
+    }
+    async newPassword(login, pwd) {
+        if (pwd.Password !== pwd.ConfirmPassword) {
+            throw new exceptions_1.InvalidArgument('password does not match');
+        }
+        const user = await rbac_1.User.where({ Login: login }).firstOrFail();
+        const isValid = await this.PasswordProvider.verify(user.Password, pwd.OldPassword);
+        if (!isValid) {
+            throw new exceptions_1.Forbidden('Invalid login or password');
+        }
+        const hashedPassword = await this.PasswordProvider.hash(pwd.Password);
+        user.Password = hashedPassword;
+        await user.update();
+        return new http_1.Ok();
+    }
+};
+__decorate([
+    (0, di_1.Autoinject)(),
+    __metadata("design:type", rbac_1.PasswordProvider)
+], UserController.prototype, "PasswordProvider", void 0);
+__decorate([
+    (0, configuration_1.Config)('http.cookie.secret'),
+    __metadata("design:type", String)
+], UserController.prototype, "CoockieSecret", void 0);
+__decorate([
+    (0, di_1.Autoinject)(),
+    __metadata("design:type", rbac_1.SessionProvider)
+], UserController.prototype, "SessionProvider", void 0);
+__decorate([
+    (0, http_1.Get)(),
+    (0, decorators_1.Permission)('readOwn'),
+    __param(0, (0, decorators_1.User)()),
+    __param(1, (0, http_2.Cookie)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [rbac_1.User, String]),
+    __metadata("design:returntype", Promise)
+], UserController.prototype, "refresh", null);
+__decorate([
+    (0, http_1.Patch)('/password/:login'),
+    __param(0, (0, http_1.Param)()),
+    __param(1, (0, http_1.Body)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, password_dto_1.PasswordDto]),
+    __metadata("design:returntype", Promise)
+], UserController.prototype, "newPassword", null);
+UserController = __decorate([
+    (0, http_1.BasePath)('user'),
+    (0, decorators_1.Resource)('user')
+], UserController);
+exports.UserController = UserController;
+//# sourceMappingURL=UserController.js.map

package/lib/controllers/UserController.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserController.js","sourceRoot":"","sources":["../../src/controllers/UserController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAkD;AAClD,wCAAqF;AACrF,wCAAsF;AACtF,oDAAiE;AACjE,oCAAyC;AACzC,8CAA2D;AAC3D,wCAAuC;AACvC,0DAAgD;AAChD,qDAAuC;AACvC,oDAAuB;AAIvB,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,qBAAc;IAYzC,KAAK,CAAC,OAAO,CAAS,IAAe,EAAY,IAAY;QAClE,wBAAwB;QACxB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAErB,+BAA+B;QAC/B,MAAM,GAAG,GAAmB,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAChE,IAAI,GAAG,EAAE;YACP,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxD,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;aAC5C;SACF;QAED,OAAO,IAAI,SAAE,CAAC,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC;IAGM,KAAK,CAAC,WAAW,CAAU,KAAa,EAAU,GAAgB;QACvE,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,eAAe,EAAE;YACxC,MAAM,IAAI,4BAAe,CAAC,yBAAyB,CAAC,CAAC;SACtD;QAED,MAAM,IAAI,GAAG,MAAM,WAAS,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QAEnF,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,sBAAS,CAAC,2BAA2B,CAAC,CAAC;SAClD;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QAC/B,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;CACF,CAAA;AA5CC;IADC,IAAA,eAAU,GAAE;8BACe,uBAAgB;wDAAC;AAG7C;IADC,IAAA,sBAAM,EAAC,oBAAoB,CAAC;;qDACG;AAGhC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;uDAAC;AAI3C;IAFC,IAAA,UAAG,GAAE;IACL,IAAA,uBAAU,EAAC,SAAS,CAAC;IACA,WAAA,IAAA,iBAAI,GAAE,CAAA;IAAmB,WAAA,IAAA,aAAM,GAAE,CAAA;;qCAApB,WAAS;;6CAc3C;AAGD;IADC,IAAA,YAAK,EAAC,kBAAkB,CAAC;IACA,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,WAAI,GAAE,CAAA;;6CAAM,0BAAW;;iDAgBxE;AA7CU,cAAc;IAF1B,IAAA,eAAQ,EAAC,MAAM,CAAC;IAChB,IAAA,qBAAQ,EAAC,MAAM,CAAC;GACJ,cAAc,CA8C1B;AA9CY,wCAAc"}

package/lib/controllers/UserMetadata.d.ts

@@ -0,0 +1,6 @@
+import { Ok } from '@spinajs/http';
+import { User as UserModel, UserMetadata } from '@spinajs/rbac';
+export declare class UserMetaController {
+    addMetadata(logged: UserModel, user: UserModel, meta: UserMetadata): Promise<Ok>;
+    updateMetadata(logged: UserModel, user: UserModel, meta: UserMetadata): Promise<Ok>;
+}

package/lib/controllers/UserMetadata.js

@@ -0,0 +1,66 @@
+"use strict";
+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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserMetaController = void 0;
+const http_1 = require("@spinajs/http");
+const rbac_1 = require("@spinajs/rbac");
+const decorators_1 = require("./../decorators");
+const decorators_2 = require("../decorators");
+const orm_http_1 = require("@spinajs/orm-http");
+let UserMetaController = class UserMetaController {
+    async addMetadata(logged, user, meta) {
+        if (logged.Id !== user.Id) {
+            throw new http_1.Forbidden('cannot add metadata to another user');
+        }
+        await user.Metadata.add(meta);
+        return new http_1.Ok(meta);
+    }
+    async updateMetadata(logged, user, meta) {
+        if (logged.Id !== user.Id) {
+            throw new http_1.Forbidden('cannot add metadata to another user');
+        }
+        await meta.User.populate();
+        if (meta.User.Value.Id !== logged.Id) {
+            throw new http_1.Forbidden('cannot edit metadata that is not own by user');
+        }
+        await meta.update();
+        return new http_1.Ok();
+    }
+};
+__decorate([
+    (0, http_1.Post)(),
+    (0, decorators_2.Permission)('updateOwn'),
+    __param(0, (0, decorators_2.User)()),
+    __param(1, (0, orm_http_1.FromModel)()),
+    __param(2, (0, orm_http_1.AsModel)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [rbac_1.User, rbac_1.User, rbac_1.UserMetadata]),
+    __metadata("design:returntype", Promise)
+], UserMetaController.prototype, "addMetadata", null);
+__decorate([
+    (0, http_1.Patch)('user/:user/metadata/:meta'),
+    (0, decorators_2.Permission)('updateOwn'),
+    __param(0, (0, decorators_2.User)()),
+    __param(1, (0, orm_http_1.FromModel)()),
+    __param(2, (0, orm_http_1.FromModel)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [rbac_1.User, rbac_1.User, rbac_1.UserMetadata]),
+    __metadata("design:returntype", Promise)
+], UserMetaController.prototype, "updateMetadata", null);
+UserMetaController = __decorate([
+    (0, http_1.BasePath)('user/:user/metadata'),
+    (0, decorators_1.Resource)('user.metadata')
+], UserMetaController);
+exports.UserMetaController = UserMetaController;
+//# sourceMappingURL=UserMetadata.js.map

package/lib/controllers/UserMetadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../src/controllers/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAqE;AACrE,wCAAgE;AAChE,gDAA2C;AAC3C,8CAAiD;AACjD,gDAAuD;AAIvD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAGtB,KAAK,CAAC,WAAW,CAAS,MAAiB,EAAe,IAAe,EAAa,IAAkB;QAC7G,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE;YACzB,MAAM,IAAI,gBAAS,CAAC,qCAAqC,CAAC,CAAC;SAC5D;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,IAAI,SAAE,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAIM,KAAK,CAAC,cAAc,CAAS,MAAiB,EAAe,IAAe,EAAe,IAAkB;QAClH,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE;YACzB,MAAM,IAAI,gBAAS,CAAC,qCAAqC,CAAC,CAAC;SAC5D;QAED,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,EAAE;YACpC,MAAM,IAAI,gBAAS,CAAC,8CAA8C,CAAC,CAAC;SACrE;QAED,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEpB,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;CACF,CAAA;AAzBC;IAFC,IAAA,WAAI,GAAE;IACN,IAAA,uBAAU,EAAC,WAAW,CAAC;IACE,WAAA,IAAA,iBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,oBAAS,GAAE,CAAA;IAAmB,WAAA,IAAA,kBAAO,GAAE,CAAA;;qCAAnD,WAAS,EAAqB,WAAS,EAAmB,mBAAY;;qDAO9G;AAID;IAFC,IAAA,YAAK,EAAC,2BAA2B,CAAC;IAClC,IAAA,uBAAU,EAAC,WAAW,CAAC;IACK,WAAA,IAAA,iBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,oBAAS,GAAE,CAAA;IAAmB,WAAA,IAAA,oBAAS,GAAE,CAAA;;qCAArD,WAAS,EAAqB,WAAS,EAAqB,mBAAY;;wDAanH;AA3BU,kBAAkB;IAF9B,IAAA,eAAQ,EAAC,qBAAqB,CAAC;IAC/B,IAAA,qBAAQ,EAAC,eAAe,CAAC;GACb,kBAAkB,CA4B9B;AA5BY,gDAAkB"}

package/lib/decorators.d.ts

@@ -15,4 +15,11 @@ export declare function Resource(resource: string, permission?: PermissionType):
  * @param permission - permission to set
  */
 export declare function Permission(permission?: PermissionType): any;
-export declare function FromUser(): (target: any, propertyKey?: string | symbol, indexOrDescriptor?: number | PropertyDescriptor) => void;
+/**
+ * Retrieves user from session if is logged in
+ */
+export declare function User(): (target: any, propertyKey?: string | symbol, indexOrDescriptor?: number | PropertyDescriptor) => void;
+/**
+ * Extract args from user session
+ */
+export declare function Session(): (target: any, propertyKey?: string | symbol, indexOrDescriptor?: number | PropertyDescriptor) => void;

package/lib/decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FromUser = exports.Permission = exports.Resource = exports.setRbacMetadata = exports.ACL_CONTROLLER_DESCRIPTOR = void 0;
+exports.Session = exports.User = exports.Permission = exports.Resource = exports.setRbacMetadata = exports.ACL_CONTROLLER_DESCRIPTOR = void 0;
 const http_1 = require("@spinajs/http");
 const policies_1 = require("./policies");
 exports.ACL_CONTROLLER_DESCRIPTOR = Symbol('ACL_CONTROLLER_DESCRIPTOR_SYMBOL');
@@ -73,8 +73,18 @@ function Permission(permission = 'readOwn') {
     });
 }
 exports.Permission = Permission;
-function FromUser() {
+/**
+ * Retrieves user from session if is logged in
+ */
+function User() {
     return (0, http_1.Route)((0, http_1.Parameter)('UserArg'));
 }
-exports.FromUser = FromUser;
+exports.User = User;
+/**
+ * Extract args from user session
+ */
+function Session() {
+    return (0, http_1.Route)((0, http_1.Parameter)('SessionArg'));
+}
+exports.Session = Session;
 //# sourceMappingURL=decorators.js.map

package/lib/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":";;;AACA,wCAAyD;AACzD,yCAAwC;AAE3B,QAAA,yBAAyB,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAEpF,SAAgB,eAAe,CAAC,MAAW,EAAE,QAAyC;IACpF,IAAI,QAAQ,GAAoB,OAAO,CAAC,WAAW,CAAC,iCAAyB,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;IAC3G,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG;YACT,QAAQ,EAAE,EAAE;YACZ,MAAM,EAAE,IAAI,GAAG,EAA0C;YACzD,UAAU,EAAE,SAAS;SACtB,CAAC;QAEF,OAAO,CAAC,cAAc,CAAC,iCAAyB,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;KACzF;IAED,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,QAAQ,CAAC,CAAC;KACpB;AACH,CAAC;AAfD,0CAeC;AAED,SAAS,UAAU,CAAC,QAA0I;IAC5J,OAAO,CAAC,MAAW,EAAE,WAA4B,EAAE,iBAA8C,EAAE,EAAE;QACnG,IAAI,QAAQ,GAAoB,OAAO,CAAC,WAAW,CAAC,iCAAyB,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;QAC3G,IAAI,CAAC,QAAQ,EAAE;YACb,QAAQ,GAAG;gBACT,QAAQ,EAAE,EAAE;gBACZ,MAAM,EAAE,IAAI,GAAG,EAA0C;gBACzD,UAAU,EAAE,SAAS;aACtB,CAAC;YAEF,OAAO,CAAC,cAAc,CAAC,iCAAyB,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,CAAC;SACzF;QAED,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAC;SAC5D;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,QAAgB,EAAE,aAA6B,SAAS;IAC/E,OAAO,UAAU,CAAC,CAAC,QAAyB,EAAE,MAAW,EAAE,EAAE;QAC3D,IAAA,aAAM,EAAC,qBAAU,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEvC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC7B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,4BAOC;AAED;;;;;GAKG;AACH,SAAgB,UAAU,CAAC,aAA6B,SAAS;IAC/D,OAAO,UAAU,CAAC,CAAC,QAAyB,EAAE,MAAW,EAAE,WAAmB,EAAE,EAAE;QAChF,IAAI,KAAK,GAAmC,IAAI,CAAC;QAEjD,IAAI,WAAW,EAAE;YACf,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBACpC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;aAC1C;iBAAM;gBACL,KAAK,GAAG;oBACN,UAAU,EAAE,UAAU;iBACvB,CAAC;aACH;YAED,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;SACzC;QAED,IAAA,aAAM,EAAC,qBAAU,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC;AAlBD,gCAkBC;AAED,SAAgB,QAAQ;IACtB,OAAO,IAAA,YAAK,EAAC,IAAA,gBAAS,EAAC,SAAS,CAAC,CAAC,CAAC;AACrC,CAAC;AAFD,4BAEC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"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"}

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

@@ -5,7 +5,7 @@ export declare const LoginDtoSchema: {
     properties: {
         Login: {
             type: string;
-            maxLength: number;
+            format: string;
         };
         Password: {
             type: string;

package/lib/dto/login-dto.js

@@ -16,10 +16,10 @@ exports.LoginDtoSchema = {
     title: 'User login DTO',
     type: 'object',
     properties: {
-        Login: { type: 'string', maxLength: 32 },
+        Login: { type: 'string', format: 'email' },
         Password: { type: 'string', maxLength: 32 },
     },
-    required: ['Login', 'Password'],
+    required: ['Email', 'Password'],
 };
 let LoginDto = class LoginDto {
     constructor(data) {

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;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"}
+{"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,MAAM,EAAE,OAAO,EAAE;QAC1C,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

@@ -3,6 +3,11 @@ export declare const PasswordDtoSchema: {
     title: string;
     type: string;
     properties: {
+        OldPassword: {
+            type: string;
+            maxLength: number;
+            minLength: number;
+        };
         Password: {
             type: string;
             maxLength: number;
@@ -17,6 +22,7 @@ export declare const PasswordDtoSchema: {
     required: string[];
 };
 export declare class PasswordDto {
+    OldPassword: string;
     Password: string;
     ConfirmPassword: string;
     constructor(data: any);

package/lib/dto/password-dto.js

@@ -16,10 +16,11 @@ exports.PasswordDtoSchema = {
     title: 'User password DTO',
     type: 'object',
     properties: {
+        OldPassword: { type: 'string', maxLength: 32, minLength: 6 },
         Password: { type: 'string', maxLength: 32, minLength: 6 },
         ConfirmPassword: { type: 'string', maxLength: 32, minLength: 6 },
     },
-    required: ['Password', 'ConfirmPassword'],
+    required: ['OldPassword', 'Password', 'ConfirmPassword'],
 };
 let PasswordDto = class PasswordDto {
     constructor(data) {

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;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"}
+{"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,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QAC5D,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,aAAa,EAAE,UAAU,EAAE,iBAAiB,CAAC;CACzD,CAAC;AAGF,IAAa,WAAW,GAAxB,MAAa,WAAW;IAOtB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAVY,WAAW;IADvB,IAAA,mBAAM,EAAC,yBAAiB,CAAC;;GACb,WAAW,CAUvB;AAVY,kCAAW"}

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

@@ -3,9 +3,6 @@ export declare const UserDtoSchema: {
     title: string;
     type: string;
     properties: {
-        Id: {
-            type: string;
-        };
         Email: {
             type: string;
             format: string;
@@ -15,30 +12,10 @@ export declare const UserDtoSchema: {
             type: string;
             maxLength: number;
         };
-        ConfirmPassword: {
-            type: string;
-            maxLength: number;
-            minLength: number;
-        };
-        Password: {
-            type: string;
-            maxLength: number;
-            minLength: number;
-        };
-        NiceName: {
-            type: string;
-            maxLength: number;
-        };
     };
-    required: string[];
 };
 export declare class UserDto {
-    Idsss?: number;
     Email: string;
     Login: string;
-    Password: string;
-    ConfirmPassword: string;
-    NiceName: string;
-    Role: string;
     constructor(data: any);
 }

package/lib/dto/user-dto.js

@@ -16,14 +16,9 @@ exports.UserDtoSchema = {
     title: 'User DTO',
     type: 'object',
     properties: {
-        Id: { type: 'number' },
         Email: { type: 'string', format: 'email', maxLength: 64 },
         Login: { type: 'string', maxLength: 64 },
-        ConfirmPassword: { type: 'string', maxLength: 32, minLength: 6 },
-        Password: { type: 'string', maxLength: 32, minLength: 6 },
-        NiceName: { type: 'string', maxLength: 64 },
     },
-    required: ['Email', 'NiceName'],
 };
 let UserDto = class UserDto {
     constructor(data) {

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;IAelB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAlBY,OAAO;IADnB,IAAA,mBAAM,EAAC,qBAAa,CAAC;;GACT,OAAO,CAkBnB;AAlBY,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,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;KACzC;CACF,CAAC;AAGF,IAAa,OAAO,GAApB,MAAa,OAAO;IAKlB,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AARY,OAAO;IADnB,IAAA,mBAAM,EAAC,qBAAa,CAAC;;GACT,OAAO,CAQnB;AARY,0BAAO"}

package/lib/index.d.ts

@@ -3,6 +3,6 @@ export * from './interfaces';
 export * from './middlewares';
 export * from './policies';
 export * from './controllers/LoginController';
-export * from './controllers/UsersController';
+export * from './controllers/UserController';
 export * from './transformers';
 export * from './route-args';

package/lib/index.js

@@ -19,7 +19,7 @@ __exportStar(require("./interfaces"), exports);
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./policies"), exports);
 __exportStar(require("./controllers/LoginController"), exports);
-__exportStar(require("./controllers/UsersController"), exports);
+__exportStar(require("./controllers/UserController"), exports);
 __exportStar(require("./transformers"), exports);
 __exportStar(require("./route-args"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,gDAA8B;AAC9B,6CAA2B;AAC3B,gEAA8C;AAC9C,gEAA8C;AAC9C,iDAA+B;AAC/B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,+CAA6B;AAC7B,gDAA8B;AAC9B,6CAA2B;AAC3B,gEAA8C;AAC9C,+DAA6C;AAC7C,iDAA+B;AAC/B,+CAA6B"}

package/lib/interfaces.d.ts

@@ -1,4 +1,11 @@
+import { User, ISession } from '@spinajs/rbac';
 export declare type PermissionType = 'readAny' | 'readOwn' | 'updateAny' | 'updateOwn' | 'deleteAny' | 'deleteOwn' | 'createAny' | 'createOwn';
+declare module '@spinajs/http' {
+    interface IActionLocalStoregeContext {
+        user: User | null;
+        session: ISession;
+    }
+}
 export interface IRbacDescriptor {
     /**
      * Resource name

package/lib/middlewares.d.ts

@@ -1,11 +1,11 @@
 import { SessionProvider } from '@spinajs/rbac';
 import 'reflect-metadata';
 import * as express from 'express';
-import { ServerMiddleware } from '@spinajs/http';
-export declare class UserFromSessionMiddleware extends ServerMiddleware {
+import { Request as sRequest, ServerMiddleware } from '@spinajs/http';
+export declare class RbacMiddleware 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;
+    before(): (req: sRequest, res: express.Response, next: express.NextFunction) => void;
+    after(): (req: sRequest, res: express.Response, next: express.NextFunction) => void;
 }

package/lib/middlewares.js

@@ -32,15 +32,14 @@ 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.UserFromSessionMiddleware = void 0;
+exports.RbacMiddleware = 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 luxon_1 = require("luxon");
 const http_1 = require("@spinajs/http");
-let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.ServerMiddleware {
+let RbacMiddleware = class RbacMiddleware 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 !');
@@ -52,13 +51,10 @@ let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.S
                 if (req.cookies.ssid) {
                     const ssid = cs.unsign(req.cookies.ssid, this.CoockieSecret);
                     if (ssid) {
-                        const session = (await this.SessionProvider.restoreSession(ssid));
+                        const session = await this.SessionProvider.restore(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);
-                            }
+                            req.storage.user = new rbac_1.User(session.Data.get('User'));
+                            req.storage.session = session;
                         }
                         else {
                             req.storage.user = null;
@@ -82,13 +78,13 @@ let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.S
 __decorate([
     (0, configuration_1.Config)('http.cookie.secret'),
     __metadata("design:type", String)
-], UserFromSessionMiddleware.prototype, "CoockieSecret", void 0);
+], RbacMiddleware.prototype, "CoockieSecret", void 0);
 __decorate([
     (0, di_1.Autoinject)(),
     __metadata("design:type", rbac_1.SessionProvider)
-], UserFromSessionMiddleware.prototype, "SessionProvider", void 0);
-UserFromSessionMiddleware = __decorate([
+], RbacMiddleware.prototype, "SessionProvider", void 0);
+RbacMiddleware = __decorate([
     (0, di_1.Injectable)(http_1.ServerMiddleware)
-], UserFromSessionMiddleware);
-exports.UserFromSessionMiddleware = UserFromSessionMiddleware;
+], RbacMiddleware);
+exports.RbacMiddleware = RbacMiddleware;
 //# 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,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;6BAAM;4BACL,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;yBACzB;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;AAxCC;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,CA0CrC;AA1CY,8DAAyB"}
+{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAsD;AACtD,oCAAqD;AACrD,4BAA0B;AAE1B,0DAAgD;AAChD,qDAAuC;AACvC,wCAAsE;AAGtE,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,uBAAgB;IAO3C,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,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACzD,IAAI,OAAO,EAAE;4BACX,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;4BACtD,GAAG,CAAC,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC;yBAC/B;6BAAM;4BACL,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;yBACzB;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;AArCC;IADC,IAAA,sBAAM,EAAC,oBAAoB,CAAC;;qDACG;AAGhC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;uDAAC;AALhC,cAAc;IAD1B,IAAA,eAAU,EAAC,uBAAgB,CAAC;GAChB,cAAc,CAuC1B;AAvCY,wCAAc"}

package/lib/policies.js

@@ -44,7 +44,7 @@ function checkUserPermission(user, resource, permission) {
     if (!user) {
         return null;
     }
-    return ac.can(user.Role.split(','))[permission](resource);
+    return ac.can(user.Role)[permission](resource);
 }
 exports.checkUserPermission = checkUserPermission;
 function checkRoutePermission(req, resource, permission) {

package/lib/policies.js.map

@@ -1 +1 @@
-{"version":3,"file":"policies.js","sourceRoot":"","sources":["../src/policies.ts"],"names":[],"mappings":";;;AACA,wCAAqF;AACrF,oDAAgD;AAChD,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,sBAAS,CAAC,oCAAoC,CAAC,CAAC;SAC3D;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"}
+{"version":3,"file":"policies.js","sourceRoot":"","sources":["../src/policies.ts"],"names":[],"mappings":";;;AACA,wCAAqF;AACrF,oDAAgD;AAChD,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,sBAAS,CAAC,oCAAoC,CAAC,CAAC;SAC3D;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,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;AAC1D,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/lib/route-args.d.ts

@@ -1,9 +1,16 @@
 import { RouteArgs, IRouteParameter, ParameterType, IRouteCall } from '@spinajs/http';
-import * as express from 'express';
+import { Request } from '@spinajs/http';
 export declare class UserArg extends RouteArgs {
     get SupportedType(): ParameterType;
-    extract(callData: IRouteCall, _param: IRouteParameter, req: express.Request): Promise<{
+    extract(callData: IRouteCall, _param: IRouteParameter, req: Request): Promise<{
         CallData: IRouteCall;
         Args: import("@spinajs/rbac/lib").User;
     }>;
 }
+export declare class SessionArg extends RouteArgs {
+    get SupportedType(): string;
+    extract(callData: IRouteCall, param: IRouteParameter, req: Request): Promise<{
+        CallData: IRouteCall;
+        Args: unknown;
+    }>;
+}

package/lib/route-args.js

@@ -6,19 +6,31 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserArg = void 0;
+exports.SessionArg = exports.UserArg = void 0;
 const http_1 = require("@spinajs/http");
 const di_1 = require("@spinajs/di");
 let UserArg = class UserArg extends http_1.RouteArgs {
     get SupportedType() {
-        return http_1.ParameterType.Res;
+        return http_1.ParameterType.Other;
     }
     async extract(callData, _param, req) {
-        return { CallData: callData, Args: req.User };
+        return { CallData: callData, Args: req.storage.user };
     }
 };
 UserArg = __decorate([
     (0, di_1.Injectable)()
 ], UserArg);
 exports.UserArg = UserArg;
+let SessionArg = class SessionArg extends http_1.RouteArgs {
+    get SupportedType() {
+        throw new Error('Method not implemented.');
+    }
+    async extract(callData, param, req) {
+        return { CallData: callData, Args: req.storage.session ? req.storage.session.Data.get(param.Name) : undefined };
+    }
+};
+SessionArg = __decorate([
+    (0, di_1.Injectable)()
+], SessionArg);
+exports.SessionArg = SessionArg;
 //# sourceMappingURL=route-args.js.map

package/lib/route-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-args.js","sourceRoot":"","sources":["../src/route-args.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wCAAsF;AAEtF,oCAAyC;AAGzC,IAAa,OAAO,GAApB,MAAa,OAAQ,SAAQ,gBAAS;IACpC,IAAW,aAAa;QACtB,OAAO,oBAAa,CAAC,GAAG,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,MAAuB,EAAE,GAAoB;QACtF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;IAChD,CAAC;CACF,CAAA;AARY,OAAO;IADnB,IAAA,eAAU,GAAE;GACA,OAAO,CAQnB;AARY,0BAAO"}
+{"version":3,"file":"route-args.js","sourceRoot":"","sources":["../src/route-args.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wCAAsF;AACtF,oCAAyC;AAIzC,IAAa,OAAO,GAApB,MAAa,OAAQ,SAAQ,gBAAS;IACpC,IAAW,aAAa;QACtB,OAAO,oBAAa,CAAC,KAAK,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,MAAuB,EAAE,GAAY;QAC9E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;CACF,CAAA;AARY,OAAO;IADnB,IAAA,eAAU,GAAE;GACA,OAAO,CAQnB;AARY,0BAAO;AAWpB,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,gBAAS;IACvC,IAAI,aAAa;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAsB,EAAE,GAAY;QAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAClH,CAAC;CACF,CAAA;AAPY,UAAU;IADtB,IAAA,eAAU,GAAE;GACA,UAAU,CAOtB;AAPY,gCAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/rbac-http",
-  "version": "1.2.211",
+  "version": "2.0.15",
   "description": "HTTP API for user session & permissions",
   "main": "lib/index.js",
   "private": false,
@@ -38,18 +38,19 @@
   },
   "homepage": "https://github.com/spinajs/main#readme",
   "dependencies": {
-    "@spinajs/configuration": "^1.2.211",
-    "@spinajs/di": "^1.2.211",
-    "@spinajs/exceptions": "^1.2.127",
-    "@spinajs/log": "^1.2.211",
-    "@spinajs/orm": "^1.2.211",
-    "@spinajs/rbac": "^1.2.211",
-    "@spinajs/reflection": "^1.2.211",
+    "@spinajs/configuration": "^2.0.12",
+    "@spinajs/di": "^2.0.12",
+    "@spinajs/exceptions": "^2.0.12",
+    "@spinajs/log": "^2.0.14",
+    "@spinajs/orm": "^2.0.14",
+    "@spinajs/orm-http": "^2.0.15",
+    "@spinajs/rbac": "^2.0.14",
+    "@spinajs/reflection": "^2.0.14",
     "accesscontrol": "^2.2.1",
     "luxon": "^2.4.0"
   },
   "devDependencies": {
-    "@spinajs/orm-sqlite": "^1.2.211"
+    "@spinajs/orm-sqlite": "^2.0.14"
   },
-  "gitHead": "70d07e9437552855ac6c986465929a31ee49f5c3"
+  "gitHead": "accb5cda01f335933f681eec75e32ca25fdb8dc7"
 }

package/lib/augumentation.d.ts

@@ -1,7 +0,0 @@
-import '@spinajs/http';
-import { User } from '@spinajs/rbac';
-declare module '@spinajs/http' {
-    interface IActionLocalStoregeContext {
-        user: User;
-    }
-}

package/lib/augumentation.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("@spinajs/http");
-//# sourceMappingURL=augumentation.js.map

package/lib/augumentation.js.map

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

package/lib/controllers/UsersController.d.ts

@@ -1,15 +0,0 @@
-import { PasswordDto } from './../dto/password-dto';
-import { UserDto } from './../dto/user-dto';
-import * as express from 'express';
-import { BaseController, Ok, NotFound } from '@spinajs/http';
-import { UserDataTransformer, IUserResult } from '../transformers';
-import { SORT_ORDER } from '@spinajs/orm/lib/enums';
-export declare class UsersController extends BaseController {
-    protected DataTransformer: UserDataTransformer<IUserResult>;
-    listUsers(search: string, page: number, perPage: number, order: string, orderDirection: SORT_ORDER, request: express.Request): Promise<NotFound | Ok>;
-    getUser(id: number): Promise<Ok>;
-    addUser(user: UserDto): Promise<Ok>;
-    deleteUser(id: number): Promise<Ok>;
-    updateUser(id: number, user: UserDto): Promise<Ok>;
-    updateUserPassword(id: number, pwd: PasswordDto): Promise<Ok>;
-}

package/lib/controllers/UsersController.js

@@ -1,197 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : 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 = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UsersController = void 0;
-const password_dto_1 = require("./../dto/password-dto");
-const user_dto_1 = require("./../dto/user-dto");
-const rbac_1 = require("@spinajs/rbac");
-const express = __importStar(require("express"));
-const http_1 = require("@spinajs/http");
-const exceptions_1 = require("@spinajs/exceptions");
-const orm_1 = require("@spinajs/orm");
-const di_1 = require("@spinajs/di");
-const transformers_1 = require("../transformers");
-const enums_1 = require("@spinajs/orm/lib/enums");
-const luxon_1 = require("luxon");
-const OrderSchema = {
-    type: 'string',
-    enum: ['asc', 'desc'],
-};
-let UsersController = class UsersController extends http_1.BaseController {
-    async listUsers(search, page, perPage, order, orderDirection, request) {
-        const query = rbac_1.User.all()
-            .whereNull('DeletedAt')
-            .skip((page - 1) * perPage)
-            .take(perPage)
-            .order(order, orderDirection)
-            .populate('Metadata');
-        const countQuery = rbac_1.User.query().select(new orm_1.RawQuery('count(*) as count')).whereNull('DeletedAt');
-        if (search) {
-            const searchFunc = function () {
-                this.where('Email', 'like', `%${search}%`);
-                this.orWhere('Login', 'like', `${search}%`);
-                this.orWhere('NiceName', 'like', `%${search}%`);
-            };
-            query.where(searchFunc);
-            countQuery.where(searchFunc);
-        }
-        const r = await query;
-        const c = await countQuery.asRaw();
-        if (r.length === 0) {
-            return new http_1.NotFound('no users met search criteria');
-        }
-        return new http_1.Ok(this.DataTransformer.transform({
-            Data: r.map((u) => u.dehydrate()),
-            Total: c[0].count,
-        }, request));
-    }
-    async getUser(id) {
-        const user = await rbac_1.User.where({
-            Id: id,
-        })
-            .whereNull('DeletedAt')
-            .populate('Metadata')
-            .firstOrFail();
-        return new http_1.Ok(user);
-    }
-    async addUser(user) {
-        const password = this._container.resolve(rbac_1.PasswordProvider);
-        if (user.Password !== user.ConfirmPassword) {
-            throw new exceptions_1.InvalidArgument('password does not match');
-        }
-        let hashedPassword = '';
-        let userPassword = user.Password;
-        if (!userPassword) {
-            userPassword = password.generate();
-        }
-        hashedPassword = await password.hash(userPassword);
-        const entity = new rbac_1.User({
-            Email: user.Email,
-            Login: user.Login,
-            NiceName: user.NiceName,
-            Password: hashedPassword,
-            CreatedAt: luxon_1.DateTime.now(),
-            Role: user.Role,
-        });
-        await entity.insert();
-        return new http_1.Ok({ Id: entity.Id });
-    }
-    async deleteUser(id) {
-        const entity = await rbac_1.User.getOrFail(id);
-        await entity.destroy();
-        return new http_1.Ok();
-    }
-    async updateUser(id, user) {
-        var _a;
-        const entity = await rbac_1.User.getOrFail(id);
-        entity.Email = user.Email;
-        entity.NiceName = user.NiceName;
-        entity.Login = user.Login;
-        entity.Role = (_a = user.Role) !== null && _a !== void 0 ? _a : entity.Role;
-        await entity.update();
-        return new http_1.Ok();
-    }
-    async updateUserPassword(id, pwd) {
-        if (pwd.Password !== pwd.ConfirmPassword) {
-            throw new exceptions_1.InvalidArgument('password does not match');
-        }
-        const entity = await rbac_1.User.getOrFail(id);
-        const password = this._container.resolve(rbac_1.PasswordProvider);
-        const hashedPassword = await password.hash(pwd.Password);
-        entity.Password = hashedPassword;
-        await entity.update();
-        return new http_1.Ok();
-    }
-};
-__decorate([
-    (0, di_1.Autoinject)(),
-    __metadata("design:type", transformers_1.UserDataTransformer)
-], UsersController.prototype, "DataTransformer", void 0);
-__decorate([
-    (0, http_1.Get)('/'),
-    __param(0, (0, http_1.Query)()),
-    __param(1, (0, http_1.Query)({ type: 'number', minimum: 1 })),
-    __param(2, (0, http_1.Query)({ type: 'number', minimum: 1 })),
-    __param(3, (0, http_1.Query)()),
-    __param(4, (0, http_1.Query)(OrderSchema)),
-    __param(5, (0, http_1.Req)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Number, Number, String, String, Object]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "listUsers", null);
-__decorate([
-    (0, http_1.Get)(':id'),
-    __param(0, (0, http_1.PKey)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "getUser", null);
-__decorate([
-    (0, http_1.Post)('/'),
-    __param(0, (0, http_1.Body)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [user_dto_1.UserDto]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "addUser", null);
-__decorate([
-    (0, http_1.Del)(':id'),
-    __param(0, (0, http_1.PKey)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "deleteUser", null);
-__decorate([
-    (0, http_1.Put)(':id'),
-    __param(0, (0, http_1.PKey)()),
-    __param(1, (0, http_1.Body)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, user_dto_1.UserDto]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "updateUser", null);
-__decorate([
-    (0, http_1.Put)(':id/change-password'),
-    __param(0, (0, http_1.PKey)()),
-    __param(1, (0, http_1.Body)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Number, password_dto_1.PasswordDto]),
-    __metadata("design:returntype", Promise)
-], UsersController.prototype, "updateUserPassword", null);
-UsersController = __decorate([
-    (0, http_1.BasePath)('users')
-], UsersController);
-exports.UsersController = UsersController;
-//# sourceMappingURL=UsersController.js.map

package/lib/controllers/UsersController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"UsersController.js","sourceRoot":"","sources":["../../src/controllers/UsersController.ts"],"names":[],"mappings":"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"}