@spinajs/rbac-http 1.2.184 → 1.2.188
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.
|
@@ -2,12 +2,10 @@ import { PasswordDto } from './../dto/password-dto';
|
|
|
2
2
|
import { UserDto } from './../dto/user-dto';
|
|
3
3
|
import * as express from 'express';
|
|
4
4
|
import { BaseController, Ok, NotFound } from '@spinajs/http';
|
|
5
|
-
import { IContainer } from '@spinajs/di';
|
|
6
5
|
import { UserDataTransformer, IUserResult } from '../transformers';
|
|
7
6
|
import { SORT_ORDER } from '@spinajs/orm/lib/enums';
|
|
8
7
|
export declare class UsersController extends BaseController {
|
|
9
8
|
protected DataTransformer: UserDataTransformer<IUserResult>;
|
|
10
|
-
protected Container: IContainer;
|
|
11
9
|
listUsers(search: string, page: number, perPage: number, order: string, orderDirection: SORT_ORDER, request: express.Request): Promise<NotFound | Ok>;
|
|
12
10
|
getUser(id: number): Promise<Ok>;
|
|
13
11
|
addUser(user: UserDto): Promise<Ok>;
|
|
@@ -46,6 +46,7 @@ const orm_1 = require("@spinajs/orm");
|
|
|
46
46
|
const di_1 = require("@spinajs/di");
|
|
47
47
|
const transformers_1 = require("../transformers");
|
|
48
48
|
const enums_1 = require("@spinajs/orm/lib/enums");
|
|
49
|
+
const luxon_1 = require("luxon");
|
|
49
50
|
const OrderSchema = {
|
|
50
51
|
type: 'string',
|
|
51
52
|
enum: ['asc', 'desc'],
|
|
@@ -84,12 +85,11 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
84
85
|
})
|
|
85
86
|
.whereNull('DeletedAt')
|
|
86
87
|
.populate('Metadata')
|
|
87
|
-
.populate('Roles')
|
|
88
88
|
.firstOrFail();
|
|
89
89
|
return new http_1.Ok(user);
|
|
90
90
|
}
|
|
91
91
|
async addUser(user) {
|
|
92
|
-
const password = this.
|
|
92
|
+
const password = this._container.resolve(rbac_1.PasswordProvider);
|
|
93
93
|
if (user.Password !== user.ConfirmPassword) {
|
|
94
94
|
throw new exceptions_1.InvalidArgument('password does not match');
|
|
95
95
|
}
|
|
@@ -104,7 +104,8 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
104
104
|
Login: user.Login,
|
|
105
105
|
NiceName: user.NiceName,
|
|
106
106
|
Password: hashedPassword,
|
|
107
|
-
CreatedAt:
|
|
107
|
+
CreatedAt: luxon_1.DateTime.now(),
|
|
108
|
+
Role: user.Role,
|
|
108
109
|
});
|
|
109
110
|
await entity.insert();
|
|
110
111
|
return new http_1.Ok({ Id: entity.Id });
|
|
@@ -115,10 +116,12 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
115
116
|
return new http_1.Ok();
|
|
116
117
|
}
|
|
117
118
|
async updateUser(id, user) {
|
|
119
|
+
var _a;
|
|
118
120
|
const entity = await rbac_1.User.getOrFail(id);
|
|
119
121
|
entity.Email = user.Email;
|
|
120
122
|
entity.NiceName = user.NiceName;
|
|
121
123
|
entity.Login = user.Login;
|
|
124
|
+
entity.Role = (_a = user.Role) !== null && _a !== void 0 ? _a : entity.Role;
|
|
122
125
|
await entity.update();
|
|
123
126
|
return new http_1.Ok();
|
|
124
127
|
}
|
|
@@ -127,7 +130,7 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
127
130
|
throw new exceptions_1.InvalidArgument('password does not match');
|
|
128
131
|
}
|
|
129
132
|
const entity = await rbac_1.User.getOrFail(id);
|
|
130
|
-
const password = this.
|
|
133
|
+
const password = this._container.resolve(rbac_1.PasswordProvider);
|
|
131
134
|
const hashedPassword = await password.hash(pwd.Password);
|
|
132
135
|
entity.Password = hashedPassword;
|
|
133
136
|
await entity.update();
|
|
@@ -138,10 +141,6 @@ __decorate([
|
|
|
138
141
|
(0, di_1.Autoinject)(),
|
|
139
142
|
__metadata("design:type", transformers_1.UserDataTransformer)
|
|
140
143
|
], UsersController.prototype, "DataTransformer", void 0);
|
|
141
|
-
__decorate([
|
|
142
|
-
(0, di_1.Autoinject)(di_1.Container),
|
|
143
|
-
__metadata("design:type", Object)
|
|
144
|
-
], UsersController.prototype, "Container", void 0);
|
|
145
144
|
__decorate([
|
|
146
145
|
(0, http_1.Get)('/'),
|
|
147
146
|
__param(0, (0, http_1.Query)()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UsersController.js","sourceRoot":"","sources":["../../src/controllers/UsersController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAoD;AACpD,gDAA4C;AAC5C,wCAAuD;AACvD,iDAAmC;AACnC,wCAAoH;AACpH,oDAAsD;AACtD,sCAAwC;AACxC,
|
|
1
|
+
{"version":3,"file":"UsersController.js","sourceRoot":"","sources":["../../src/controllers/UsersController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAoD;AACpD,gDAA4C;AAC5C,wCAAuD;AACvD,iDAAmC;AACnC,wCAAoH;AACpH,oDAAsD;AACtD,sCAAwC;AACxC,oCAAyC;AACzC,kDAAmE;AACnE,kDAAoD;AACpD,iCAAiC;AAEjC,MAAM,WAAW,GAAG;IAClB,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,qBAAc;IAK1C,KAAK,CAAC,SAAS,CAAU,MAAc,EAAyC,IAAY,EAAyC,OAAe,EAAW,KAAa,EAAsB,cAA0B,EAAS,OAAwB;QAClQ,MAAM,KAAK,GAAG,WAAI,CAAC,GAAG,EAAE;aACrB,SAAS,CAAC,WAAW,CAAC;aACtB,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;aAC1B,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,KAAK,EAAE,cAAc,CAAC;aAC5B,QAAQ,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,UAAU,GAAG,WAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,IAAI,cAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAEjG,IAAI,MAAM,EAAE;YACV,MAAM,UAAU,GAAG;gBACjB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,MAAM,GAAG,CAAC,CAAC;gBAC3C,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,MAAM,GAAG,CAAC,CAAC;YAClD,CAAC,CAAC;YAEF,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACxB,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SAC9B;QAED,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC;QACtB,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,KAAK,EAA4B,CAAC;QAE7D,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YAClB,OAAO,IAAI,eAAQ,CAAC,8BAA8B,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,SAAE,CACX,IAAI,CAAC,eAAe,CAAC,SAAS,CAC5B;YACE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACjC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;SAClB,EACD,OAAO,CACR,CACF,CAAC;IACJ,CAAC;IAGM,KAAK,CAAC,OAAO,CAAS,EAAU;QACrC,MAAM,IAAI,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC;YAC5B,EAAE,EAAE,EAAE;SACP,CAAC;aACC,SAAS,CAAC,WAAW,CAAC;aACtB,QAAQ,CAAC,UAAU,CAAC;aACpB,WAAW,EAAE,CAAC;QAEjB,OAAO,IAAI,SAAE,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAGM,KAAK,CAAC,OAAO,CAAS,IAAa;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAmB,uBAAgB,CAAC,CAAC;QAC7E,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,eAAe,EAAE;YAC1C,MAAM,IAAI,4BAAe,CAAC,yBAAyB,CAAC,CAAC;SACtD;QAED,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,IAAI,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEjC,IAAI,CAAC,YAAY,EAAE;YACjB,YAAY,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;SACpC;QAED,cAAc,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,WAAI,CAAC;YACtB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,cAAc;YACxB,SAAS,EAAE,gBAAQ,CAAC,GAAG,EAAE;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtB,OAAO,IAAI,SAAE,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IACnC,CAAC;IAGM,KAAK,CAAC,UAAU,CAAS,EAAU;QACxC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;IAGM,KAAK,CAAC,UAAU,CAAS,EAAU,EAAU,IAAa;;QAC/D,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QAExC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAChC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1B,MAAM,CAAC,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,mCAAI,MAAM,CAAC,IAAI,CAAC;QACvC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtB,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;IAGM,KAAK,CAAC,kBAAkB,CAAS,EAAU,EAAU,GAAgB;QAC1E,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,CAAC,eAAe,EAAE;YACxC,MAAM,IAAI,4BAAe,CAAC,yBAAyB,CAAC,CAAC;SACtD;QAED,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAmB,uBAAgB,CAAC,CAAC;QAC7E,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzD,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;QACjC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtB,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;CACF,CAAA;AApHC;IADC,IAAA,eAAU,GAAE;8BACc,kCAAmB;wDAAc;AAG5D;IADC,IAAA,UAAG,EAAC,GAAG,CAAC;IACe,WAAA,IAAA,YAAK,GAAE,CAAA;IAAkB,WAAA,IAAA,YAAK,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;IAAgB,WAAA,IAAA,YAAK,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAA;IAAmB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,EAAC,WAAW,CAAC,CAAA;IAA8B,WAAA,IAAA,UAAG,GAAE,CAAA;;;;gDAoC1O;AAGD;IADC,IAAA,UAAG,EAAC,KAAK,CAAC;IACW,WAAA,IAAA,WAAI,GAAE,CAAA;;;;8CAS3B;AAGD;IADC,IAAA,WAAI,EAAC,GAAG,CAAC;IACY,WAAA,IAAA,WAAI,GAAE,CAAA;;qCAAO,kBAAO;;8CA0BzC;AAGD;IADC,IAAA,UAAG,EAAC,KAAK,CAAC;IACc,WAAA,IAAA,WAAI,GAAE,CAAA;;;;iDAI9B;AAGD;IADC,IAAA,UAAG,EAAC,KAAK,CAAC;IACc,WAAA,IAAA,WAAI,GAAE,CAAA;IAAc,WAAA,IAAA,WAAI,GAAE,CAAA;;6CAAO,kBAAO;;iDAUhE;AAGD;IADC,IAAA,UAAG,EAAC,qBAAqB,CAAC;IACM,WAAA,IAAA,WAAI,GAAE,CAAA;IAAc,WAAA,IAAA,WAAI,GAAE,CAAA;;6CAAM,0BAAW;;yDAY3E;AArHU,eAAe;IAD3B,IAAA,eAAQ,EAAC,OAAO,CAAC;GACL,eAAe,CAsH3B;AAtHY,0CAAe"}
|
package/lib/dto/user-dto.d.ts
CHANGED
package/lib/dto/user-dto.js.map
CHANGED
|
@@ -1 +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;
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/rbac-http",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.188",
|
|
4
4
|
"description": "HTTP API for user session & permissions",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"devDependencies": {
|
|
52
52
|
"@spinajs/orm-sqlite": "^1.2.180"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "08c6108cd37473f9746e2b8d9b4cd4eaa6efd394"
|
|
55
55
|
}
|