@spinajs/rbac-http 1.2.183 → 1.2.187
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>;
|
|
@@ -57,7 +57,6 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
57
57
|
.skip((page - 1) * perPage)
|
|
58
58
|
.take(perPage)
|
|
59
59
|
.order(order, orderDirection)
|
|
60
|
-
.populate('Roles')
|
|
61
60
|
.populate('Metadata');
|
|
62
61
|
const countQuery = rbac_1.User.query().select(new orm_1.RawQuery('count(*) as count')).whereNull('DeletedAt');
|
|
63
62
|
if (search) {
|
|
@@ -75,7 +74,7 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
75
74
|
return new http_1.NotFound('no users met search criteria');
|
|
76
75
|
}
|
|
77
76
|
return new http_1.Ok(this.DataTransformer.transform({
|
|
78
|
-
Data: r,
|
|
77
|
+
Data: r.map((u) => u.dehydrate()),
|
|
79
78
|
Total: c[0].count,
|
|
80
79
|
}, request));
|
|
81
80
|
}
|
|
@@ -85,12 +84,11 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
85
84
|
})
|
|
86
85
|
.whereNull('DeletedAt')
|
|
87
86
|
.populate('Metadata')
|
|
88
|
-
.populate('Roles')
|
|
89
87
|
.firstOrFail();
|
|
90
88
|
return new http_1.Ok(user);
|
|
91
89
|
}
|
|
92
90
|
async addUser(user) {
|
|
93
|
-
const password = this.
|
|
91
|
+
const password = this._container.resolve(rbac_1.PasswordProvider);
|
|
94
92
|
if (user.Password !== user.ConfirmPassword) {
|
|
95
93
|
throw new exceptions_1.InvalidArgument('password does not match');
|
|
96
94
|
}
|
|
@@ -128,7 +126,7 @@ let UsersController = class UsersController extends http_1.BaseController {
|
|
|
128
126
|
throw new exceptions_1.InvalidArgument('password does not match');
|
|
129
127
|
}
|
|
130
128
|
const entity = await rbac_1.User.getOrFail(id);
|
|
131
|
-
const password = this.
|
|
129
|
+
const password = this._container.resolve(rbac_1.PasswordProvider);
|
|
132
130
|
const hashedPassword = await password.hash(pwd.Password);
|
|
133
131
|
entity.Password = hashedPassword;
|
|
134
132
|
await entity.update();
|
|
@@ -139,10 +137,6 @@ __decorate([
|
|
|
139
137
|
(0, di_1.Autoinject)(),
|
|
140
138
|
__metadata("design:type", transformers_1.UserDataTransformer)
|
|
141
139
|
], UsersController.prototype, "DataTransformer", void 0);
|
|
142
|
-
__decorate([
|
|
143
|
-
(0, di_1.Autoinject)(di_1.Container),
|
|
144
|
-
__metadata("design:type", Object)
|
|
145
|
-
], UsersController.prototype, "Container", void 0);
|
|
146
140
|
__decorate([
|
|
147
141
|
(0, http_1.Get)('/'),
|
|
148
142
|
__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":"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"}
|
package/lib/transformers.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { DataTransformer } from '@spinajs/http';
|
|
2
|
-
import { User } from '@spinajs/rbac';
|
|
3
2
|
import * as express from 'express';
|
|
4
3
|
export interface IUserResult {
|
|
5
|
-
Data:
|
|
4
|
+
Data: any;
|
|
6
5
|
Total: number;
|
|
7
6
|
}
|
|
8
7
|
export declare class UserDataTransformer<T> extends DataTransformer<IUserResult, IUserResult | T> {
|
package/lib/transformers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformers.js","sourceRoot":"","sources":["../src/transformers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAgD;AAChD,oDAAuB;
|
|
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": "1.2.
|
|
3
|
+
"version": "1.2.187",
|
|
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": "f492c58bdf5ab6805bd54cbbeaf68dae26519331"
|
|
55
55
|
}
|