@spinajs/rbac-http-admin 2.0.247 → 2.0.249
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/cjs/config/rbac-http-admin.js +1 -1
- package/lib/cjs/config/rbac-http-admin.js.map +1 -1
- package/lib/cjs/controllers/UserAdminController.d.ts.map +1 -1
- package/lib/cjs/controllers/UserAdminController.js +5 -3
- package/lib/cjs/controllers/UserAdminController.js.map +1 -1
- package/lib/mjs/config/rbac-http-admin.js +1 -1
- package/lib/mjs/config/rbac-http-admin.js.map +1 -1
- package/lib/mjs/controllers/UserAdminController.d.ts.map +1 -1
- package/lib/mjs/controllers/UserAdminController.js +6 -4
- package/lib/mjs/controllers/UserAdminController.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +11 -11
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const path_1 = require("path");
|
|
4
4
|
function dir(path) {
|
|
5
5
|
const inCommonJs = typeof module !== 'undefined';
|
|
6
|
-
return (0, path_1.resolve)((0, path_1.normalize)((0, path_1.join)(process.cwd(), 'node_modules', '@spinajs', 'rbac-http-
|
|
6
|
+
return (0, path_1.resolve)((0, path_1.normalize)((0, path_1.join)(process.cwd(), 'node_modules', '@spinajs', 'rbac-http-admin', 'lib', inCommonJs ? 'cjs' : 'mjs', path)));
|
|
7
7
|
}
|
|
8
8
|
const rbacHttpAdmin = {
|
|
9
9
|
system: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rbac-http-admin.js","sourceRoot":"","sources":["../../../src/config/rbac-http-admin.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;IACjD,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"rbac-http-admin.js","sourceRoot":"","sources":["../../../src/config/rbac-http-admin.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;IACjD,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACzI,CAAC;AAED,MAAM,aAAa,GAAG;IACpB,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACjC,OAAO,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzB,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACtB;KACF;CACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAdminController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"UserAdminController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,EAAE,EAAiB,MAAM,eAAe,CAAC;AACjF,OAAO,EAA8B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAwCjG,qBAEa,mBAAoB,SAAQ,cAAc;IAExC,IAAI,CACN,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAQzB,OAAO,CAAC,EAAE,MAAM,EAAE,EAElB,MAAM,CAAC,EAAE,OAAO,EAAE;CAwDrB"}
|
|
@@ -16,6 +16,7 @@ exports.UserAdminController = void 0;
|
|
|
16
16
|
const http_1 = require("@spinajs/http");
|
|
17
17
|
const orm_http_1 = require("@spinajs/orm-http");
|
|
18
18
|
const rbac_1 = require("@spinajs/rbac");
|
|
19
|
+
const rbac_http_1 = require("@spinajs/rbac-http");
|
|
19
20
|
/**
|
|
20
21
|
* User model filter
|
|
21
22
|
* We declare it here to not include orm-http in rbac module
|
|
@@ -57,9 +58,9 @@ let UserAdminController = class UserAdminController extends http_1.BaseControlle
|
|
|
57
58
|
.populate(include)
|
|
58
59
|
.take(pagination?.limit ?? 10)
|
|
59
60
|
.skip(pagination?.limit * pagination?.page ?? 0)
|
|
60
|
-
.order(order?.column ?? '
|
|
61
|
+
.order(order?.column ?? 'CreatedAt', order?.order ?? 'DESC')
|
|
61
62
|
.filter(filter);
|
|
62
|
-
const { count } = await rbac_1.User.query().count('*', 'count').filter(filter).asRaw();
|
|
63
|
+
const { count } = await rbac_1.User.query().count('*', 'count').filter(filter).takeFirst().asRaw();
|
|
63
64
|
return new http_1.Ok(result.map((x) => x.dehydrateWithRelations()), {
|
|
64
65
|
Headers: [
|
|
65
66
|
{
|
|
@@ -89,6 +90,7 @@ __decorate([
|
|
|
89
90
|
__metadata("design:returntype", Promise)
|
|
90
91
|
], UserAdminController.prototype, "list", null);
|
|
91
92
|
exports.UserAdminController = UserAdminController = __decorate([
|
|
92
|
-
(0, http_1.BasePath)('users')
|
|
93
|
+
(0, http_1.BasePath)('users'),
|
|
94
|
+
(0, http_1.Policy)(rbac_http_1.LoggedPolicy)
|
|
93
95
|
], UserAdminController);
|
|
94
96
|
//# sourceMappingURL=UserAdminController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAdminController.js","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"UserAdminController.js","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAiF;AACjF,gDAAiG;AACjG,wCAAqC;AACrC,kDAAkD;AAElD;;;;GAIG;AACH,MAAM,WAAW,GAAyB;IACxC;QACE,KAAK,EAAE,MAAM;QACb,SAAS,EAAE,CAAC,IAAI,CAAC;KAClB;IACD;QACE,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;KAC1B;IACD;QACE,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC;KAC1B;IACD;QACE,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;KAC5C;IACD;QACE,KAAK,EAAE,aAAa;QACpB,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;KAC5C;IACD;QACE,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC;KACjE;IACD;QACE,KAAK,EAAE,UAAU;QACjB,SAAS,EAAE,CAAC,IAAI,CAAC;KAClB;CACF,CAAC;AAIK,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,qBAAc;IAExC,AAAN,KAAK,CAAC,IAAI,CACN,UAA0B,EAC1B,KAAgB,EAQzB,OAAkB,EAElB,MAAkB;QAElB,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,MAAM,EAAE;aAC/B,QAAQ,CAAC,OAAO,CAAC;aACjB,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC;aAC7B,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,UAAU,EAAE,IAAI,IAAI,CAAC,CAAC;aAC/C,KAAK,CAAC,KAAK,EAAE,MAAM,IAAI,WAAW,EAAE,KAAK,EAAE,KAAK,IAAI,MAAM,CAAC;aAC3D,MAAM,CAAC,MAAM,CAAC,CAAC;QAElB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,WAAI,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,EAAqB,CAAC;QAE/G,OAAO,IAAI,SAAE,CACX,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,EAC7C;YACE,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,KAAK;iBACb;aACF;SACF,CACF,CAAC;IACJ,CAAC;CAkCF,CAAA;AAtEY,kDAAmB;AAEjB;IADZ,IAAA,UAAG,EAAC,GAAG,CAAC;IAEN,WAAA,IAAA,YAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAK,EAAC;QACL,IAAI,EAAE,OAAO;QACb,KAAK,EAAE;YACL,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,UAAU,CAAC;SACnB;KACF,CAAC,CAAA;IAED,WAAA,IAAA,iBAAM,EAAC,WAAW,CAAC,CAAA;;qCAVE,wBAAa;QAClB,mBAAQ;;+CAgC1B;8BApCU,mBAAmB;IAF/B,IAAA,eAAQ,EAAC,OAAO,CAAC;IACjB,IAAA,aAAM,EAAC,wBAAY,CAAC;GACR,mBAAmB,CAsE/B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { join, normalize, resolve } from 'path';
|
|
2
2
|
function dir(path) {
|
|
3
3
|
const inCommonJs = typeof module !== 'undefined';
|
|
4
|
-
return resolve(normalize(join(process.cwd(), 'node_modules', '@spinajs', 'rbac-http-
|
|
4
|
+
return resolve(normalize(join(process.cwd(), 'node_modules', '@spinajs', 'rbac-http-admin', 'lib', inCommonJs ? 'cjs' : 'mjs', path)));
|
|
5
5
|
}
|
|
6
6
|
const rbacHttpAdmin = {
|
|
7
7
|
system: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rbac-http-admin.js","sourceRoot":"","sources":["../../../src/config/rbac-http-admin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;IACjD,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"rbac-http-admin.js","sourceRoot":"","sources":["../../../src/config/rbac-http-admin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,MAAM,UAAU,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;IACjD,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACzI,CAAC;AAED,MAAM,aAAa,GAAG;IACpB,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACjC,OAAO,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACzB,KAAK,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACtB;KACF;CACF,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAdminController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"UserAdminController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,EAAE,EAAiB,MAAM,eAAe,CAAC;AACjF,OAAO,EAA8B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAwCjG,qBAEa,mBAAoB,SAAQ,cAAc;IAExC,IAAI,CACN,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAQzB,OAAO,CAAC,EAAE,MAAM,EAAE,EAElB,MAAM,CAAC,EAAE,OAAO,EAAE;CAwDrB"}
|
|
@@ -10,9 +10,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
|
-
import { BaseController, BasePath, Get, Ok, Query } from '@spinajs/http';
|
|
13
|
+
import { BaseController, BasePath, Get, Ok, Policy, Query } from '@spinajs/http';
|
|
14
14
|
import { Filter, OrderDTO, PaginationDTO } from '@spinajs/orm-http';
|
|
15
15
|
import { User } from '@spinajs/rbac';
|
|
16
|
+
import { LoggedPolicy } from "@spinajs/rbac-http";
|
|
16
17
|
/**
|
|
17
18
|
* User model filter
|
|
18
19
|
* We declare it here to not include orm-http in rbac module
|
|
@@ -54,9 +55,9 @@ let UserAdminController = class UserAdminController extends BaseController {
|
|
|
54
55
|
.populate(include)
|
|
55
56
|
.take(pagination?.limit ?? 10)
|
|
56
57
|
.skip(pagination?.limit * pagination?.page ?? 0)
|
|
57
|
-
.order(order?.column ?? '
|
|
58
|
+
.order(order?.column ?? 'CreatedAt', order?.order ?? 'DESC')
|
|
58
59
|
.filter(filter);
|
|
59
|
-
const { count } = await User.query().count('*', 'count').filter(filter).asRaw();
|
|
60
|
+
const { count } = await User.query().count('*', 'count').filter(filter).takeFirst().asRaw();
|
|
60
61
|
return new Ok(result.map((x) => x.dehydrateWithRelations()), {
|
|
61
62
|
Headers: [
|
|
62
63
|
{
|
|
@@ -85,7 +86,8 @@ __decorate([
|
|
|
85
86
|
__metadata("design:returntype", Promise)
|
|
86
87
|
], UserAdminController.prototype, "list", null);
|
|
87
88
|
UserAdminController = __decorate([
|
|
88
|
-
BasePath('users')
|
|
89
|
+
BasePath('users'),
|
|
90
|
+
Policy(LoggedPolicy)
|
|
89
91
|
], UserAdminController);
|
|
90
92
|
export { UserAdminController };
|
|
91
93
|
//# sourceMappingURL=UserAdminController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAdminController.js","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"UserAdminController.js","sourceRoot":"","sources":["../../../src/controllers/UserAdminController.ts"],"names":[],"mappings":"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"}
|