@spinajs/rbac-http 1.2.211 → 2.0.12

package/lib/http/src/response-methods/forbidden.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Forbidden = void 0;
+const interfaces_1 = require("../interfaces");
+const responses_1 = require("../responses");
+/**
+ * Internall response function.
+ * Returns HTTP 403 FORBIDDEN ERROR
+ * @param err - error to send
+ */
+class Forbidden extends responses_1.Response {
+    constructor(data) {
+        super(data);
+    }
+    async execute(_req, _res) {
+        return await (0, responses_1.httpResponse)(this.responseData, interfaces_1.HTTP_STATUS_CODE.FORBIDDEN, 'responses/forbidden');
+    }
+}
+exports.Forbidden = Forbidden;
+//# sourceMappingURL=forbidden.js.map

package/lib/http/src/response-methods/forbidden.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"forbidden.js","sourceRoot":"","sources":["../../../../../http/src/response-methods/forbidden.ts"],"names":[],"mappings":";;;AACA,8CAAiD;AACjD,4CAAsD;AAEtD;;;;GAIG;AAEH,MAAa,SAAU,SAAQ,oBAAQ;IACrC,YAAY,IAAS;QACnB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAqB,EAAE,IAAsB;QAChE,OAAO,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,YAAY,EAAE,6BAAgB,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAClG,CAAC;CACF;AARD,8BAQC"}

package/lib/http/src/responses.d.ts

@@ -0,0 +1,40 @@
+import * as express from 'express';
+import { HTTP_STATUS_CODE } from './interfaces';
+export declare type ResponseFunction = (req: express.Request, res: express.Response) => void;
+export declare abstract class Response {
+    protected responseData: any;
+    constructor(responseData: any);
+    abstract execute(req: express.Request, res: express.Response, next?: express.NextFunction): Promise<ResponseFunction | void>;
+}
+/**
+ * Sends data & sets proper header as json
+ *
+ * @param model - data to send
+ * @param status - status code
+ */
+export declare function jsonResponse(model: any, status?: HTTP_STATUS_CODE): (_req: express.Request, res: express.Response) => void;
+/**
+ * Sends data & sets proper header as json
+ *
+ * @param model - data to send
+ * @param status - status code
+ */
+export declare function textResponse(model: any, status?: HTTP_STATUS_CODE): (_req: express.Request, res: express.Response) => void;
+/**
+ * Sends html response & sets proper header. If template is not avaible, handles proper error rendering.
+ *
+ * @param file - template file path
+ * @param model - data passed to template
+ * @param status - optional status code
+ */
+export declare function pugResponse(file: string, model: any, status?: HTTP_STATUS_CODE): (req: express.Request, res: express.Response) => void;
+/**
+ * Default response handling. Checks `Accept` header & matches proper response
+ * For now its supports html & json responses
+ *
+ * @param model - data to send
+ * @param code - status code
+ * @param template - template to render without extension eg. `views/responses/ok`. It will try to match .pug, .xml or whatever to match response
+ *                  to `Accept` header
+ */
+export declare function httpResponse(model: any, code: HTTP_STATUS_CODE, template: string): (req: express.Request, res: express.Response) => void;

package/lib/http/src/responses.js

@@ -0,0 +1,218 @@
+"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 __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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpResponse = exports.pugResponse = exports.textResponse = exports.jsonResponse = exports.Response = void 0;
+const interfaces_1 = require("./interfaces");
+const configuration_1 = require("@spinajs/configuration");
+const di_1 = require("@spinajs/di");
+const log_1 = require("@spinajs/log");
+const pugTemplate = __importStar(require("pug"));
+const path_1 = require("path");
+const fs = __importStar(require("fs"));
+const _ = __importStar(require("lodash"));
+const exceptions_1 = require("@spinajs/exceptions");
+const randomstring = __importStar(require("randomstring"));
+const intl_1 = require("@spinajs/intl");
+class Response {
+    constructor(responseData) {
+        this.responseData = responseData;
+    }
+}
+exports.Response = Response;
+/**
+ * Sends data & sets proper header as json
+ *
+ * @param model - data to send
+ * @param status - status code
+ */
+function jsonResponse(model, status) {
+    return (_req, res) => {
+        res.status(status ? status : interfaces_1.HTTP_STATUS_CODE.OK);
+        if (model) {
+            res.json(model);
+        }
+        else {
+            res.json();
+        }
+    };
+}
+exports.jsonResponse = jsonResponse;
+/**
+ * Sends data & sets proper header as json
+ *
+ * @param model - data to send
+ * @param status - status code
+ */
+function textResponse(model, status) {
+    return (_req, res) => {
+        res.status(status ? status : interfaces_1.HTTP_STATUS_CODE.OK);
+        if (model) {
+            res.set('Content-Type', 'text/plain');
+            res.send(JSON.stringify(model));
+        }
+    };
+}
+exports.textResponse = textResponse;
+const __translate = (lang) => {
+    return (text, ...args) => {
+        const intl = di_1.DI.get(intl_1.Intl);
+        if (typeof text === 'string') {
+            return intl.__({
+                phrase: text,
+                locale: lang,
+            }, ...args);
+        }
+        return intl.__(text, ...args);
+    };
+};
+const __translateNumber = (lang) => {
+    return (text, count) => {
+        const intl = di_1.DI.get(intl_1.Intl);
+        if (typeof text === 'string') {
+            return intl.__n({
+                phrase: text,
+                locale: lang,
+            }, count);
+        }
+        return intl.__n(text, count);
+    };
+};
+const __translateL = (text) => {
+    const intl = di_1.DI.get(intl_1.Intl);
+    return intl.__l(text);
+};
+const __translateH = (text) => {
+    const intl = di_1.DI.get(intl_1.Intl);
+    return intl.__h(text);
+};
+/**
+ * Sends html response & sets proper header. If template is not avaible, handles proper error rendering.
+ *
+ * @param file - template file path
+ * @param model - data passed to template
+ * @param status - optional status code
+ */
+function pugResponse(file, model, status) {
+    const cfg = di_1.DI.get(configuration_1.Configuration);
+    return (req, res) => {
+        if (!req.accepts('html')) {
+            httpResponse({
+                error: {
+                    message: 'invalid request content type',
+                    code: 400,
+                },
+            }, interfaces_1.HTTP_STATUS_CODE.BAD_REQUEST, 'responses/serverError.pug')(req, res);
+            return;
+        }
+        res.set('Content-Type', 'text/html');
+        try {
+            try {
+                _render(file, model, status);
+            }
+            catch (err) {
+                const log = di_1.DI.resolve(log_1.Log, ['http']);
+                log.warn(`Cannot render pug file ${file}, error: ${err.message}:${err.stack}`, err);
+                // try to render server error response
+                _render('responses/serverError.pug', { error: err }, interfaces_1.HTTP_STATUS_CODE.INTERNAL_ERROR);
+            }
+        }
+        catch (err) {
+            const log = di_1.DI.resolve(log_1.Log, ['http']);
+            // final fallback rendering error fails, we render embedded html error page
+            const ticketNo = randomstring.generate(7);
+            log.warn(`Cannot render pug file error: ${err.message}, ticket: ${ticketNo}`, err);
+            res.status(interfaces_1.HTTP_STATUS_CODE.INTERNAL_ERROR);
+            res.send(cfg.get('http.FatalTemplate').replace('{ticket}', ticketNo));
+        }
+        function _render(f, m, c) {
+            const view = getView(f);
+            const language = req.query[cfg.get('intl.queryParameter')];
+            const content = pugTemplate.renderFile(view, _.merge(m, {
+                // add i18n functions as globals
+                __: __translate(language),
+                __n: __translateNumber(language),
+                __l: __translateL,
+                __h: __translateH,
+            }));
+            res.status(c ? c : interfaces_1.HTTP_STATUS_CODE.OK);
+            res.send(content);
+        }
+        function getView(viewFile) {
+            const views = cfg
+                .get('system.dirs.views')
+                .map((p) => (0, path_1.normalize)((0, path_1.join)(p, viewFile)))
+                .filter((f) => fs.existsSync(f));
+            if (_.isEmpty(views)) {
+                throw new exceptions_1.IOFail(`View file ${viewFile} not exists.`);
+            }
+            // return last merged path, eg. if application have own view files (override standard views)
+            return views[views.length - 1];
+        }
+    };
+}
+exports.pugResponse = pugResponse;
+/**
+ * Default response handling. Checks `Accept` header & matches proper response
+ * For now its supports html & json responses
+ *
+ * @param model - data to send
+ * @param code - status code
+ * @param template - template to render without extension eg. `views/responses/ok`. It will try to match .pug, .xml or whatever to match response
+ *                  to `Accept` header
+ */
+function httpResponse(model, code, template) {
+    const cfg = di_1.DI.get(configuration_1.Configuration);
+    const acceptedHeaders = cfg.get('http.AcceptHeaders');
+    const transformers = di_1.DI.resolve(Array.ofType(interfaces_1.DataTransformer));
+    return (req, res) => {
+        if (req.accepts('html') && (acceptedHeaders & interfaces_1.HttpAcceptHeaders.HTML) === interfaces_1.HttpAcceptHeaders.HTML) {
+            pugResponse(`${template}.pug`, model, code)(req, res);
+        }
+        else if (req.accepts('json') && (acceptedHeaders & interfaces_1.HttpAcceptHeaders.JSON) === interfaces_1.HttpAcceptHeaders.JSON) {
+            if (req.headers['x-data-transform']) {
+                const transformer = transformers.find((t) => t.Type === req.headers['x-data-transform']);
+                if (transformer) {
+                    jsonResponse(transformer.transform(model, req), code)(req, res);
+                }
+                else {
+                    jsonResponse({
+                        error: {
+                            message: "invalid data transformer, remove header 'x-data-transform' to return raw data or set proper data transformer",
+                            code: 400,
+                        },
+                    }, interfaces_1.HTTP_STATUS_CODE.BAD_REQUEST)(req, res);
+                }
+            }
+            else {
+                jsonResponse(model, code)(req, res);
+            }
+        }
+        else {
+            textResponse(model, code)(req, res);
+        }
+    };
+}
+exports.httpResponse = httpResponse;
+//# sourceMappingURL=responses.js.map

package/lib/http/src/responses.js.map

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

package/lib/rbac-http/src/augumentation.js

@@ -0,0 +1,9 @@
+// import '@spinajs/http';
+// import { ISession, User } from '@spinajs/rbac';
+// declare module '@spinajs/http' {
+//   interface IActionLocalStoregeContext {
+//     user: User | null;
+//     session: ISession | null;
+//   }
+// }
+//# sourceMappingURL=augumentation.js.map

package/lib/rbac-http/src/augumentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"augumentation.js","sourceRoot":"","sources":["../../../src/augumentation.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,kDAAkD;AAElD,mCAAmC;AACnC,2CAA2C;AAC3C,yBAAyB;AACzB,gCAAgC;AAChC,MAAM;AACN,IAAI"}

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

@@ -0,0 +1 @@
+{"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/{controllers → rbac-http/src/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 → rbac-http/src/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/rbac-http/src/controllers/LoginController.js.map

@@ -0,0 +1 @@
+{"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/rbac-http/src/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/rbac-http/src/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/rbac-http/src/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/rbac-http/src/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