@spinajs/rbac-http 1.2.209 → 2.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/http/src/interfaces.d.ts +461 -0
- package/lib/http/src/interfaces.js +230 -0
- package/lib/http/src/interfaces.js.map +1 -0
- package/lib/http/src/response-methods/forbidden.d.ts +11 -0
- package/lib/http/src/response-methods/forbidden.js +20 -0
- package/lib/http/src/response-methods/forbidden.js.map +1 -0
- package/lib/http/src/responses.d.ts +40 -0
- package/lib/http/src/responses.js +218 -0
- package/lib/http/src/responses.js.map +1 -0
- package/lib/rbac-http/src/augumentation.d.ts +0 -0
- package/lib/rbac-http/src/augumentation.js +9 -0
- package/lib/rbac-http/src/augumentation.js.map +1 -0
- package/lib/{config → rbac-http/src/config}/rbac-http.d.ts +0 -0
- package/lib/{config → rbac-http/src/config}/rbac-http.js +0 -0
- package/lib/rbac-http/src/config/rbac-http.js.map +1 -0
- package/lib/{controllers → rbac-http/src/controllers}/LoginController.d.ts +3 -3
- package/lib/{controllers → rbac-http/src/controllers}/LoginController.js +21 -23
- package/lib/rbac-http/src/controllers/LoginController.js.map +1 -0
- package/lib/rbac-http/src/controllers/UserAdminController.d.ts +0 -0
- package/lib/rbac-http/src/controllers/UserAdminController.js +82 -0
- package/lib/rbac-http/src/controllers/UserAdminController.js.map +1 -0
- package/lib/rbac-http/src/controllers/UserController.d.ts +10 -0
- package/lib/rbac-http/src/controllers/UserController.js +115 -0
- package/lib/rbac-http/src/controllers/UserController.js.map +1 -0
- package/lib/rbac-http/src/controllers/UserMetadata.d.ts +6 -0
- package/lib/rbac-http/src/controllers/UserMetadata.js +67 -0
- package/lib/rbac-http/src/controllers/UserMetadata.js.map +1 -0
- package/lib/{decorators.d.ts → rbac-http/src/decorators.d.ts} +8 -1
- package/lib/{decorators.js → rbac-http/src/decorators.js} +13 -3
- package/lib/rbac-http/src/decorators.js.map +1 -0
- package/lib/{dto → rbac-http/src/dto}/login-dto.d.ts +1 -1
- package/lib/{dto → rbac-http/src/dto}/login-dto.js +2 -2
- package/lib/rbac-http/src/dto/login-dto.js.map +1 -0
- package/lib/{dto → rbac-http/src/dto}/password-dto.d.ts +6 -0
- package/lib/{dto → rbac-http/src/dto}/password-dto.js +2 -1
- package/lib/rbac-http/src/dto/password-dto.js.map +1 -0
- package/lib/rbac-http/src/dto/user-dto.d.ts +21 -0
- package/lib/{dto → rbac-http/src/dto}/user-dto.js +0 -5
- package/lib/rbac-http/src/dto/user-dto.js.map +1 -0
- package/lib/{index.d.ts → rbac-http/src/index.d.ts} +1 -1
- package/lib/{index.js → rbac-http/src/index.js} +1 -1
- package/lib/rbac-http/src/index.js.map +1 -0
- package/lib/{interfaces.d.ts → rbac-http/src/interfaces.d.ts} +7 -0
- package/lib/{interfaces.js → rbac-http/src/interfaces.js} +0 -0
- package/lib/{interfaces.js.map → rbac-http/src/interfaces.js.map} +1 -1
- package/lib/rbac-http/src/middlewares.d.ts +11 -0
- package/lib/{middlewares.js → rbac-http/src/middlewares.js} +10 -14
- package/lib/rbac-http/src/middlewares.js.map +1 -0
- package/lib/{policies.d.ts → rbac-http/src/policies.d.ts} +0 -0
- package/lib/{policies.js → rbac-http/src/policies.js} +1 -1
- package/lib/rbac-http/src/policies.js.map +1 -0
- package/lib/{route-args.d.ts → rbac-http/src/route-args.d.ts} +9 -2
- package/lib/{route-args.js → rbac-http/src/route-args.js} +15 -3
- package/lib/rbac-http/src/route-args.js.map +1 -0
- package/lib/{transformers.d.ts → rbac-http/src/transformers.d.ts} +0 -0
- package/lib/{transformers.js → rbac-http/src/transformers.js} +0 -0
- package/lib/rbac-http/src/transformers.js.map +1 -0
- package/package.json +11 -10
- package/lib/augumentation.d.ts +0 -7
- package/lib/augumentation.js +0 -4
- package/lib/augumentation.js.map +0 -1
- package/lib/config/rbac-http.js.map +0 -1
- package/lib/controllers/LoginController.js.map +0 -1
- package/lib/controllers/UsersController.d.ts +0 -15
- package/lib/controllers/UsersController.js +0 -197
- package/lib/controllers/UsersController.js.map +0 -1
- package/lib/decorators.js.map +0 -1
- package/lib/dto/login-dto.js.map +0 -1
- package/lib/dto/password-dto.js.map +0 -1
- package/lib/dto/user-dto.d.ts +0 -44
- package/lib/dto/user-dto.js.map +0 -1
- package/lib/index.js.map +0 -1
- package/lib/middlewares.d.ts +0 -11
- package/lib/middlewares.js.map +0 -1
- package/lib/policies.js.map +0 -1
- package/lib/route-args.js.map +0 -1
- package/lib/transformers.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Ok } from '@spinajs/http';
|
|
2
|
+
import { User as UserModel, UserMetadata } from '@spinajs/rbac';
|
|
3
|
+
export declare class UserMetaController {
|
|
4
|
+
addMetadata(logged: UserModel, user: UserModel, meta: UserMetadata): Promise<Ok>;
|
|
5
|
+
updateMetadata(logged: UserModel, user: UserModel, meta: UserMetadata): Promise<Ok>;
|
|
6
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
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;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.UserMetaController = void 0;
|
|
16
|
+
const forbidden_1 = require("./../../../http/src/response-methods/forbidden");
|
|
17
|
+
const http_1 = require("@spinajs/http");
|
|
18
|
+
const rbac_1 = require("@spinajs/rbac");
|
|
19
|
+
const decorators_1 = require("./../decorators");
|
|
20
|
+
const decorators_2 = require("../decorators");
|
|
21
|
+
const orm_http_1 = require("@spinajs/orm-http");
|
|
22
|
+
let UserMetaController = class UserMetaController {
|
|
23
|
+
async addMetadata(logged, user, meta) {
|
|
24
|
+
if (logged.Id !== user.Id) {
|
|
25
|
+
throw new forbidden_1.Forbidden('cannot add metadata to another user');
|
|
26
|
+
}
|
|
27
|
+
await user.Metadata.add(meta);
|
|
28
|
+
return new http_1.Ok(meta);
|
|
29
|
+
}
|
|
30
|
+
async updateMetadata(logged, user, meta) {
|
|
31
|
+
if (logged.Id !== user.Id) {
|
|
32
|
+
throw new forbidden_1.Forbidden('cannot add metadata to another user');
|
|
33
|
+
}
|
|
34
|
+
await meta.User.populate();
|
|
35
|
+
if (meta.User.Value.Id !== logged.Id) {
|
|
36
|
+
throw new forbidden_1.Forbidden('cannot edit metadata that is not own by user');
|
|
37
|
+
}
|
|
38
|
+
await meta.update();
|
|
39
|
+
return new http_1.Ok();
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
__decorate([
|
|
43
|
+
(0, http_1.Post)(),
|
|
44
|
+
(0, decorators_2.Permission)('updateOwn'),
|
|
45
|
+
__param(0, (0, decorators_2.User)()),
|
|
46
|
+
__param(1, (0, orm_http_1.FromModel)()),
|
|
47
|
+
__param(2, (0, orm_http_1.AsModel)()),
|
|
48
|
+
__metadata("design:type", Function),
|
|
49
|
+
__metadata("design:paramtypes", [rbac_1.User, rbac_1.User, rbac_1.UserMetadata]),
|
|
50
|
+
__metadata("design:returntype", Promise)
|
|
51
|
+
], UserMetaController.prototype, "addMetadata", null);
|
|
52
|
+
__decorate([
|
|
53
|
+
(0, http_1.Patch)('user/:user/metadata/:meta'),
|
|
54
|
+
(0, decorators_2.Permission)('updateOwn'),
|
|
55
|
+
__param(0, (0, decorators_2.User)()),
|
|
56
|
+
__param(1, (0, orm_http_1.FromModel)()),
|
|
57
|
+
__param(2, (0, orm_http_1.FromModel)()),
|
|
58
|
+
__metadata("design:type", Function),
|
|
59
|
+
__metadata("design:paramtypes", [rbac_1.User, rbac_1.User, rbac_1.UserMetadata]),
|
|
60
|
+
__metadata("design:returntype", Promise)
|
|
61
|
+
], UserMetaController.prototype, "updateMetadata", null);
|
|
62
|
+
UserMetaController = __decorate([
|
|
63
|
+
(0, http_1.BasePath)('user/:user/metadata'),
|
|
64
|
+
(0, decorators_1.Resource)('user.metadata')
|
|
65
|
+
], UserMetaController);
|
|
66
|
+
exports.UserMetaController = UserMetaController;
|
|
67
|
+
//# sourceMappingURL=UserMetadata.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../../../src/controllers/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAA2E;AAC3E,wCAA0D;AAC1D,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,qBAAS,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,qBAAS,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,qBAAS,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"}
|
|
@@ -15,4 +15,11 @@ export declare function Resource(resource: string, permission?: PermissionType):
|
|
|
15
15
|
* @param permission - permission to set
|
|
16
16
|
*/
|
|
17
17
|
export declare function Permission(permission?: PermissionType): any;
|
|
18
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Retrieves user from session if is logged in
|
|
20
|
+
*/
|
|
21
|
+
export declare function User(): (target: any, propertyKey?: string | symbol, indexOrDescriptor?: number | PropertyDescriptor) => void;
|
|
22
|
+
/**
|
|
23
|
+
* Extract args from user session
|
|
24
|
+
*/
|
|
25
|
+
export declare function Session(): (target: any, propertyKey?: string | symbol, indexOrDescriptor?: number | PropertyDescriptor) => void;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.Session = exports.User = exports.Permission = exports.Resource = exports.setRbacMetadata = exports.ACL_CONTROLLER_DESCRIPTOR = void 0;
|
|
4
4
|
const http_1 = require("@spinajs/http");
|
|
5
5
|
const policies_1 = require("./policies");
|
|
6
6
|
exports.ACL_CONTROLLER_DESCRIPTOR = Symbol('ACL_CONTROLLER_DESCRIPTOR_SYMBOL');
|
|
@@ -73,8 +73,18 @@ function Permission(permission = 'readOwn') {
|
|
|
73
73
|
});
|
|
74
74
|
}
|
|
75
75
|
exports.Permission = Permission;
|
|
76
|
-
|
|
76
|
+
/**
|
|
77
|
+
* Retrieves user from session if is logged in
|
|
78
|
+
*/
|
|
79
|
+
function User() {
|
|
77
80
|
return (0, http_1.Route)((0, http_1.Parameter)('UserArg'));
|
|
78
81
|
}
|
|
79
|
-
exports.
|
|
82
|
+
exports.User = User;
|
|
83
|
+
/**
|
|
84
|
+
* Extract args from user session
|
|
85
|
+
*/
|
|
86
|
+
function Session() {
|
|
87
|
+
return (0, http_1.Route)((0, http_1.Parameter)('SessionArg'));
|
|
88
|
+
}
|
|
89
|
+
exports.Session = Session;
|
|
80
90
|
//# sourceMappingURL=decorators.js.map
|
|
@@ -0,0 +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;;GAEG;AACH,SAAgB,IAAI;IAClB,OAAO,IAAA,YAAK,EAAC,IAAA,gBAAS,EAAC,SAAS,CAAC,CAAC,CAAC;AACrC,CAAC;AAFD,oBAEC;AAED;;GAEG;AACH,SAAgB,OAAO;IACrB,OAAO,IAAA,YAAK,EAAC,IAAA,gBAAS,EAAC,YAAY,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,0BAEC"}
|
|
@@ -16,10 +16,10 @@ exports.LoginDtoSchema = {
|
|
|
16
16
|
title: 'User login DTO',
|
|
17
17
|
type: 'object',
|
|
18
18
|
properties: {
|
|
19
|
-
Login: { type: 'string',
|
|
19
|
+
Login: { type: 'string', format: 'email' },
|
|
20
20
|
Password: { type: 'string', maxLength: 32 },
|
|
21
21
|
},
|
|
22
|
-
required: ['
|
|
22
|
+
required: ['Email', 'Password'],
|
|
23
23
|
};
|
|
24
24
|
let LoginDto = class LoginDto {
|
|
25
25
|
constructor(data) {
|
|
@@ -0,0 +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,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"}
|
|
@@ -3,6 +3,11 @@ export declare const PasswordDtoSchema: {
|
|
|
3
3
|
title: string;
|
|
4
4
|
type: string;
|
|
5
5
|
properties: {
|
|
6
|
+
OldPassword: {
|
|
7
|
+
type: string;
|
|
8
|
+
maxLength: number;
|
|
9
|
+
minLength: number;
|
|
10
|
+
};
|
|
6
11
|
Password: {
|
|
7
12
|
type: string;
|
|
8
13
|
maxLength: number;
|
|
@@ -17,6 +22,7 @@ export declare const PasswordDtoSchema: {
|
|
|
17
22
|
required: string[];
|
|
18
23
|
};
|
|
19
24
|
export declare class PasswordDto {
|
|
25
|
+
OldPassword: string;
|
|
20
26
|
Password: string;
|
|
21
27
|
ConfirmPassword: string;
|
|
22
28
|
constructor(data: any);
|
|
@@ -16,10 +16,11 @@ exports.PasswordDtoSchema = {
|
|
|
16
16
|
title: 'User password DTO',
|
|
17
17
|
type: 'object',
|
|
18
18
|
properties: {
|
|
19
|
+
OldPassword: { type: 'string', maxLength: 32, minLength: 6 },
|
|
19
20
|
Password: { type: 'string', maxLength: 32, minLength: 6 },
|
|
20
21
|
ConfirmPassword: { type: 'string', maxLength: 32, minLength: 6 },
|
|
21
22
|
},
|
|
22
|
-
required: ['Password', 'ConfirmPassword'],
|
|
23
|
+
required: ['OldPassword', 'Password', 'ConfirmPassword'],
|
|
23
24
|
};
|
|
24
25
|
let PasswordDto = class PasswordDto {
|
|
25
26
|
constructor(data) {
|
|
@@ -0,0 +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,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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export declare const UserDtoSchema: {
|
|
2
|
+
$schema: string;
|
|
3
|
+
title: string;
|
|
4
|
+
type: string;
|
|
5
|
+
properties: {
|
|
6
|
+
Email: {
|
|
7
|
+
type: string;
|
|
8
|
+
format: string;
|
|
9
|
+
maxLength: number;
|
|
10
|
+
};
|
|
11
|
+
Login: {
|
|
12
|
+
type: string;
|
|
13
|
+
maxLength: number;
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
};
|
|
17
|
+
export declare class UserDto {
|
|
18
|
+
Email: string;
|
|
19
|
+
Login: string;
|
|
20
|
+
constructor(data: any);
|
|
21
|
+
}
|
|
@@ -16,14 +16,9 @@ exports.UserDtoSchema = {
|
|
|
16
16
|
title: 'User DTO',
|
|
17
17
|
type: 'object',
|
|
18
18
|
properties: {
|
|
19
|
-
Id: { type: 'number' },
|
|
20
19
|
Email: { type: 'string', format: 'email', maxLength: 64 },
|
|
21
20
|
Login: { type: 'string', maxLength: 64 },
|
|
22
|
-
ConfirmPassword: { type: 'string', maxLength: 32, minLength: 6 },
|
|
23
|
-
Password: { type: 'string', maxLength: 32, minLength: 6 },
|
|
24
|
-
NiceName: { type: 'string', maxLength: 64 },
|
|
25
21
|
},
|
|
26
|
-
required: ['Email', 'NiceName'],
|
|
27
22
|
};
|
|
28
23
|
let UserDto = class UserDto {
|
|
29
24
|
constructor(data) {
|
|
@@ -0,0 +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,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"}
|
|
@@ -3,6 +3,6 @@ export * from './interfaces';
|
|
|
3
3
|
export * from './middlewares';
|
|
4
4
|
export * from './policies';
|
|
5
5
|
export * from './controllers/LoginController';
|
|
6
|
-
export * from './controllers/
|
|
6
|
+
export * from './controllers/UserController';
|
|
7
7
|
export * from './transformers';
|
|
8
8
|
export * from './route-args';
|
|
@@ -19,7 +19,7 @@ __exportStar(require("./interfaces"), exports);
|
|
|
19
19
|
__exportStar(require("./middlewares"), exports);
|
|
20
20
|
__exportStar(require("./policies"), exports);
|
|
21
21
|
__exportStar(require("./controllers/LoginController"), exports);
|
|
22
|
-
__exportStar(require("./controllers/
|
|
22
|
+
__exportStar(require("./controllers/UserController"), exports);
|
|
23
23
|
__exportStar(require("./transformers"), exports);
|
|
24
24
|
__exportStar(require("./route-args"), exports);
|
|
25
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +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,+DAA6C;AAC7C,iDAA+B;AAC/B,+CAA6B"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
|
+
import { User, ISession } from '@spinajs/rbac';
|
|
1
2
|
export declare type PermissionType = 'readAny' | 'readOwn' | 'updateAny' | 'updateOwn' | 'deleteAny' | 'deleteOwn' | 'createAny' | 'createOwn';
|
|
3
|
+
declare module '@spinajs/http' {
|
|
4
|
+
interface IActionLocalStoregeContext {
|
|
5
|
+
user: User | null;
|
|
6
|
+
session: ISession;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
2
9
|
export interface IRbacDescriptor {
|
|
3
10
|
/**
|
|
4
11
|
* Resource name
|
|
File without changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/interfaces.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { SessionProvider } from '@spinajs/rbac';
|
|
2
|
+
import 'reflect-metadata';
|
|
3
|
+
import * as express from 'express';
|
|
4
|
+
import { Request as sRequest, ServerMiddleware } from '@spinajs/http';
|
|
5
|
+
export declare class RbacMiddleware extends ServerMiddleware {
|
|
6
|
+
protected CoockieSecret: string;
|
|
7
|
+
protected SessionProvider: SessionProvider;
|
|
8
|
+
resolveAsync(): Promise<void>;
|
|
9
|
+
before(): (req: sRequest, res: express.Response, next: express.NextFunction) => void;
|
|
10
|
+
after(): (req: sRequest, res: express.Response, next: express.NextFunction) => void;
|
|
11
|
+
}
|
|
@@ -32,15 +32,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
32
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.
|
|
35
|
+
exports.RbacMiddleware = void 0;
|
|
36
36
|
const rbac_1 = require("@spinajs/rbac");
|
|
37
37
|
const di_1 = require("@spinajs/di");
|
|
38
38
|
require("reflect-metadata");
|
|
39
39
|
const configuration_1 = require("@spinajs/configuration");
|
|
40
40
|
const cs = __importStar(require("cookie-signature"));
|
|
41
|
-
const luxon_1 = require("luxon");
|
|
42
41
|
const http_1 = require("@spinajs/http");
|
|
43
|
-
let
|
|
42
|
+
let RbacMiddleware = class RbacMiddleware extends http_1.ServerMiddleware {
|
|
44
43
|
async resolveAsync() {
|
|
45
44
|
if (!this.CoockieSecret) {
|
|
46
45
|
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
|
|
|
52
51
|
if (req.cookies.ssid) {
|
|
53
52
|
const ssid = cs.unsign(req.cookies.ssid, this.CoockieSecret);
|
|
54
53
|
if (ssid) {
|
|
55
|
-
const session =
|
|
54
|
+
const session = await this.SessionProvider.restore(ssid);
|
|
56
55
|
if (session) {
|
|
57
|
-
req.storage.user = new rbac_1.User(session.Data);
|
|
58
|
-
|
|
59
|
-
if (liveTimeDiff.minutes < 30) {
|
|
60
|
-
await this.SessionProvider.refreshSession(session);
|
|
61
|
-
}
|
|
56
|
+
req.storage.user = new rbac_1.User(session.Data.get('User'));
|
|
57
|
+
req.storage.session = session;
|
|
62
58
|
}
|
|
63
59
|
else {
|
|
64
60
|
req.storage.user = null;
|
|
@@ -82,13 +78,13 @@ let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.S
|
|
|
82
78
|
__decorate([
|
|
83
79
|
(0, configuration_1.Config)('http.cookie.secret'),
|
|
84
80
|
__metadata("design:type", String)
|
|
85
|
-
],
|
|
81
|
+
], RbacMiddleware.prototype, "CoockieSecret", void 0);
|
|
86
82
|
__decorate([
|
|
87
83
|
(0, di_1.Autoinject)(),
|
|
88
84
|
__metadata("design:type", rbac_1.SessionProvider)
|
|
89
|
-
],
|
|
90
|
-
|
|
85
|
+
], RbacMiddleware.prototype, "SessionProvider", void 0);
|
|
86
|
+
RbacMiddleware = __decorate([
|
|
91
87
|
(0, di_1.Injectable)(http_1.ServerMiddleware)
|
|
92
|
-
],
|
|
93
|
-
exports.
|
|
88
|
+
], RbacMiddleware);
|
|
89
|
+
exports.RbacMiddleware = RbacMiddleware;
|
|
94
90
|
//# sourceMappingURL=middlewares.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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"}
|
|
File without changes
|
|
@@ -44,7 +44,7 @@ function checkUserPermission(user, resource, permission) {
|
|
|
44
44
|
if (!user) {
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
|
-
return ac.can(user.Role
|
|
47
|
+
return ac.can(user.Role)[permission](resource);
|
|
48
48
|
}
|
|
49
49
|
exports.checkUserPermission = checkUserPermission;
|
|
50
50
|
function checkRoutePermission(req, resource, permission) {
|
|
@@ -0,0 +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,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"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
import { RouteArgs, IRouteParameter, ParameterType, IRouteCall } from '@spinajs/http';
|
|
2
|
-
import
|
|
2
|
+
import { Request } from '@spinajs/http';
|
|
3
3
|
export declare class UserArg extends RouteArgs {
|
|
4
4
|
get SupportedType(): ParameterType;
|
|
5
|
-
extract(callData: IRouteCall, _param: IRouteParameter, req:
|
|
5
|
+
extract(callData: IRouteCall, _param: IRouteParameter, req: Request): Promise<{
|
|
6
6
|
CallData: IRouteCall;
|
|
7
7
|
Args: import("@spinajs/rbac/lib").User;
|
|
8
8
|
}>;
|
|
9
9
|
}
|
|
10
|
+
export declare class SessionArg extends RouteArgs {
|
|
11
|
+
get SupportedType(): string;
|
|
12
|
+
extract(callData: IRouteCall, param: IRouteParameter, req: Request): Promise<{
|
|
13
|
+
CallData: IRouteCall;
|
|
14
|
+
Args: unknown;
|
|
15
|
+
}>;
|
|
16
|
+
}
|
|
@@ -6,19 +6,31 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.UserArg = void 0;
|
|
9
|
+
exports.SessionArg = exports.UserArg = void 0;
|
|
10
10
|
const http_1 = require("@spinajs/http");
|
|
11
11
|
const di_1 = require("@spinajs/di");
|
|
12
12
|
let UserArg = class UserArg extends http_1.RouteArgs {
|
|
13
13
|
get SupportedType() {
|
|
14
|
-
return http_1.ParameterType.
|
|
14
|
+
return http_1.ParameterType.Other;
|
|
15
15
|
}
|
|
16
16
|
async extract(callData, _param, req) {
|
|
17
|
-
return { CallData: callData, Args: req.
|
|
17
|
+
return { CallData: callData, Args: req.storage.user };
|
|
18
18
|
}
|
|
19
19
|
};
|
|
20
20
|
UserArg = __decorate([
|
|
21
21
|
(0, di_1.Injectable)()
|
|
22
22
|
], UserArg);
|
|
23
23
|
exports.UserArg = UserArg;
|
|
24
|
+
let SessionArg = class SessionArg extends http_1.RouteArgs {
|
|
25
|
+
get SupportedType() {
|
|
26
|
+
throw new Error('Method not implemented.');
|
|
27
|
+
}
|
|
28
|
+
async extract(callData, param, req) {
|
|
29
|
+
return { CallData: callData, Args: req.storage.session ? req.storage.session.Data.get(param.Name) : undefined };
|
|
30
|
+
}
|
|
31
|
+
};
|
|
32
|
+
SessionArg = __decorate([
|
|
33
|
+
(0, di_1.Injectable)()
|
|
34
|
+
], SessionArg);
|
|
35
|
+
exports.SessionArg = SessionArg;
|
|
24
36
|
//# sourceMappingURL=route-args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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"}
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../../../src/transformers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAgD;AAChD,oDAAuB;AACvB,oCAAyC;AASzC,IAAa,mBAAmB,GAAhC,MAAa,mBAAuB,SAAQ,sBAA6C;IACvF,IAAI,IAAI;QACN,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,SAAS,CAAC,IAAiB,EAAE,QAAyB;QAC3D,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC7C;aAAM;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;SAC3B;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAdY,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CAc/B;AAdY,kDAAmB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/rbac-http",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "2.0.12",
|
|
4
4
|
"description": "HTTP API for user session & permissions",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -38,18 +38,19 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@spinajs/configuration": "^
|
|
42
|
-
"@spinajs/di": "^
|
|
43
|
-
"@spinajs/exceptions": "^
|
|
44
|
-
"@spinajs/log": "^
|
|
45
|
-
"@spinajs/orm": "^
|
|
46
|
-
"@spinajs/
|
|
47
|
-
"@spinajs/
|
|
41
|
+
"@spinajs/configuration": "^2.0.12",
|
|
42
|
+
"@spinajs/di": "^2.0.12",
|
|
43
|
+
"@spinajs/exceptions": "^2.0.12",
|
|
44
|
+
"@spinajs/log": "^2.0.12",
|
|
45
|
+
"@spinajs/orm": "^2.0.12",
|
|
46
|
+
"@spinajs/orm-http": "^2.0.12",
|
|
47
|
+
"@spinajs/rbac": "^2.0.12",
|
|
48
|
+
"@spinajs/reflection": "^2.0.12",
|
|
48
49
|
"accesscontrol": "^2.2.1",
|
|
49
50
|
"luxon": "^2.4.0"
|
|
50
51
|
},
|
|
51
52
|
"devDependencies": {
|
|
52
|
-
"@spinajs/orm-sqlite": "^
|
|
53
|
+
"@spinajs/orm-sqlite": "^2.0.12"
|
|
53
54
|
},
|
|
54
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "d7910d799995df6fa9eb8174d4a9b65c81db8352"
|
|
55
56
|
}
|
package/lib/augumentation.d.ts
DELETED
package/lib/augumentation.js
DELETED
package/lib/augumentation.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"augumentation.js","sourceRoot":"","sources":["../src/augumentation.ts"],"names":[],"mappings":";;AAAA,yBAAuB"}
|
|
@@ -1 +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"}
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { PasswordDto } from './../dto/password-dto';
|
|
2
|
-
import { UserDto } from './../dto/user-dto';
|
|
3
|
-
import * as express from 'express';
|
|
4
|
-
import { BaseController, Ok, NotFound } from '@spinajs/http';
|
|
5
|
-
import { UserDataTransformer, IUserResult } from '../transformers';
|
|
6
|
-
import { SORT_ORDER } from '@spinajs/orm/lib/enums';
|
|
7
|
-
export declare class UsersController extends BaseController {
|
|
8
|
-
protected DataTransformer: UserDataTransformer<IUserResult>;
|
|
9
|
-
listUsers(search: string, page: number, perPage: number, order: string, orderDirection: SORT_ORDER, request: express.Request): Promise<NotFound | Ok>;
|
|
10
|
-
getUser(id: number): Promise<Ok>;
|
|
11
|
-
addUser(user: UserDto): Promise<Ok>;
|
|
12
|
-
deleteUser(id: number): Promise<Ok>;
|
|
13
|
-
updateUser(id: number, user: UserDto): Promise<Ok>;
|
|
14
|
-
updateUserPassword(id: number, pwd: PasswordDto): Promise<Ok>;
|
|
15
|
-
}
|