@spinajs/rbac 1.2.135 → 1.2.140
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/auth.js +5 -2
- package/lib/auth.js.map +1 -1
- package/lib/index.d.ts +3 -0
- package/lib/index.js +3 -7
- package/lib/index.js.map +1 -1
- package/lib/password.js +13 -2
- package/lib/password.js.map +1 -1
- package/lib/session.d.ts +1 -1
- package/lib/session.js +8 -5
- package/lib/session.js.map +1 -1
- package/package.json +7 -7
package/lib/auth.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.SimpleDbAuthProvider = void 0;
|
|
|
13
13
|
const interfaces_1 = require("./interfaces");
|
|
14
14
|
const User_1 = require("./models/User");
|
|
15
15
|
const di_1 = require("@spinajs/di");
|
|
16
|
-
class SimpleDbAuthProvider {
|
|
16
|
+
let SimpleDbAuthProvider = class SimpleDbAuthProvider {
|
|
17
17
|
async exists(user) {
|
|
18
18
|
const result = await User_1.User.where('Email', user instanceof User_1.User ? user.Email : user).first();
|
|
19
19
|
if (result) {
|
|
@@ -38,10 +38,13 @@ class SimpleDbAuthProvider {
|
|
|
38
38
|
}
|
|
39
39
|
return null;
|
|
40
40
|
}
|
|
41
|
-
}
|
|
41
|
+
};
|
|
42
42
|
__decorate([
|
|
43
43
|
(0, di_1.Autoinject)(di_1.Container),
|
|
44
44
|
__metadata("design:type", Object)
|
|
45
45
|
], SimpleDbAuthProvider.prototype, "Container", void 0);
|
|
46
|
+
SimpleDbAuthProvider = __decorate([
|
|
47
|
+
(0, di_1.Injectable)(interfaces_1.AuthProvider)
|
|
48
|
+
], SimpleDbAuthProvider);
|
|
46
49
|
exports.SimpleDbAuthProvider = SimpleDbAuthProvider;
|
|
47
50
|
//# sourceMappingURL=auth.js.map
|
package/lib/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8D;AAC9D,wCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8D;AAC9D,wCAAqC;AACrC,oCAA4E;AAG5E,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAIxB,KAAK,CAAC,MAAM,CAAC,IAAmB;QACrC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,YAAY,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3F,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,QAAgB;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAgB,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC;YAC9B,KAAK,EAAE,KAAK;SACb,CAAC;aACC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC;aAC3B,QAAQ,CAAC,UAAU,CAAC;aACpB,KAAK,EAAE,CAAC;QAEX,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA/BC;IADC,IAAA,eAAU,EAAC,cAAS,CAAC;;uDACU;AAFrB,oBAAoB;IADhC,IAAA,eAAU,EAAC,yBAAY,CAAC;GACZ,oBAAoB,CAiChC;AAjCY,oDAAoB"}
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -22,10 +22,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
22
22
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
23
|
exports.RbacBootstrapper = exports.AccessControl = void 0;
|
|
24
24
|
const di_1 = require("@spinajs/di");
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const session_1 = require("./session");
|
|
25
|
+
require("./auth");
|
|
26
|
+
require("./password");
|
|
27
|
+
require("./session");
|
|
29
28
|
const accesscontrol_1 = require("accesscontrol");
|
|
30
29
|
__exportStar(require("./interfaces"), exports);
|
|
31
30
|
__exportStar(require("./auth"), exports);
|
|
@@ -37,9 +36,6 @@ var accesscontrol_2 = require("accesscontrol");
|
|
|
37
36
|
Object.defineProperty(exports, "AccessControl", { enumerable: true, get: function () { return accesscontrol_2.AccessControl; } });
|
|
38
37
|
let RbacBootstrapper = class RbacBootstrapper extends di_1.Bootstrapper {
|
|
39
38
|
bootstrap() {
|
|
40
|
-
di_1.DI.register(password_1.BasicPasswordProvider).as(interfaces_1.PasswordProvider);
|
|
41
|
-
di_1.DI.register(auth_1.SimpleDbAuthProvider).as(interfaces_1.AuthProvider);
|
|
42
|
-
di_1.DI.register(session_1.MemorySessionProvider).as(interfaces_1.SessionProvider);
|
|
43
39
|
const ac = new accesscontrol_1.AccessControl();
|
|
44
40
|
di_1.DI.register(ac).as('AccessControl');
|
|
45
41
|
ac.grant('admin.users').createAny('users').updateAny('users').deleteAny('users').readAny('users');
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAA2D;AAC3D,kBAAgB;AAChB,sBAAoB;AACpB,qBAAmB;AACnB,iDAA8C;AAE9C,+CAA6B;AAC7B,yCAAuB;AACvB,6CAA2B;AAC3B,4CAA0B;AAC1B,gDAA8B;AAC9B,wDAAsC;AACtC,+CAA8C;AAArC,8GAAA,aAAa,OAAA;AAGtB,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,iBAAY;IACzC,SAAS;QACd,MAAM,EAAE,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC/B,OAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;QAEpC,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QAChF,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AATY,gBAAgB;IAD5B,IAAA,eAAU,EAAC,iBAAY,CAAC;GACZ,gBAAgB,CAS5B;AATY,4CAAgB"}
|
package/lib/password.js
CHANGED
|
@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
|
+
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;
|
|
22
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
|
+
};
|
|
18
24
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
25
|
if (mod && mod.__esModule) return mod;
|
|
20
26
|
var result = {};
|
|
@@ -24,13 +30,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
30
|
};
|
|
25
31
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
32
|
exports.BasicPasswordProvider = void 0;
|
|
33
|
+
const interfaces_1 = require("./interfaces");
|
|
27
34
|
// tslint:disable-next-line: no-var-requires
|
|
28
35
|
const { Entropy, charset32 } = require('entropy-string');
|
|
29
36
|
const argon = __importStar(require("argon2"));
|
|
37
|
+
const di_1 = require("@spinajs/di");
|
|
30
38
|
/**
|
|
31
39
|
* Simple password service that use argon2 hash alghoritm and entropy-string to generate password
|
|
32
40
|
*/
|
|
33
|
-
class BasicPasswordProvider {
|
|
41
|
+
let BasicPasswordProvider = class BasicPasswordProvider {
|
|
34
42
|
async hash(input) {
|
|
35
43
|
// uses default argon settings, no need to tweak
|
|
36
44
|
return await argon.hash(input);
|
|
@@ -50,6 +58,9 @@ class BasicPasswordProvider {
|
|
|
50
58
|
const random = new Entropy({ charset: charset32 });
|
|
51
59
|
return random.string(60);
|
|
52
60
|
}
|
|
53
|
-
}
|
|
61
|
+
};
|
|
62
|
+
BasicPasswordProvider = __decorate([
|
|
63
|
+
(0, di_1.Injectable)(interfaces_1.PasswordProvider)
|
|
64
|
+
], BasicPasswordProvider);
|
|
54
65
|
exports.BasicPasswordProvider = BasicPasswordProvider;
|
|
55
66
|
//# sourceMappingURL=password.js.map
|
package/lib/password.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.js","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAgD;AAEhD,4CAA4C;AAC5C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACzD,8CAAgC;AAChC,oCAAyC;AAEzC;;GAEG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IACzB,KAAK,CAAC,IAAI,CAAC,KAAa;QAC7B,gDAAgD;QAChD,OAAO,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,QAAgB;QAChD,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEM,QAAQ;QACb,0EAA0E;QAC1E,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;CACF,CAAA;AAtBY,qBAAqB;IADjC,IAAA,eAAU,EAAC,6BAAgB,CAAC;GAChB,qBAAqB,CAsBjC;AAtBY,sDAAqB"}
|
package/lib/session.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export declare class Session implements UserSession {
|
|
|
21
21
|
/**
|
|
22
22
|
* Simple session storage in memory
|
|
23
23
|
*/
|
|
24
|
-
export declare class
|
|
24
|
+
export declare class MemorySessionStore<T = UserSession> extends SessionProvider<T> {
|
|
25
25
|
protected Configuration: Configuration;
|
|
26
26
|
protected Sessions: Map<string, UserSession>;
|
|
27
27
|
restoreSession(sessionId: string): Promise<T>;
|
package/lib/session.js
CHANGED
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.MemorySessionStore = exports.Session = void 0;
|
|
13
13
|
const luxon_1 = require("luxon");
|
|
14
14
|
const interfaces_1 = require("./interfaces");
|
|
15
15
|
const di_1 = require("@spinajs/di");
|
|
@@ -55,7 +55,7 @@ exports.Session = Session;
|
|
|
55
55
|
/**
|
|
56
56
|
* Simple session storage in memory
|
|
57
57
|
*/
|
|
58
|
-
class
|
|
58
|
+
let MemorySessionStore = class MemorySessionStore extends interfaces_1.SessionProvider {
|
|
59
59
|
constructor() {
|
|
60
60
|
super(...arguments);
|
|
61
61
|
this.Sessions = new Map();
|
|
@@ -87,10 +87,13 @@ class MemorySessionProvider extends interfaces_1.SessionProvider {
|
|
|
87
87
|
session.extend(this.Configuration.get('acl.session.expiration', 10));
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
}
|
|
90
|
+
};
|
|
91
91
|
__decorate([
|
|
92
92
|
(0, di_1.Autoinject)(),
|
|
93
93
|
__metadata("design:type", configuration_1.Configuration)
|
|
94
|
-
],
|
|
95
|
-
|
|
94
|
+
], MemorySessionStore.prototype, "Configuration", void 0);
|
|
95
|
+
MemorySessionStore = __decorate([
|
|
96
|
+
(0, di_1.Injectable)(interfaces_1.SessionProvider)
|
|
97
|
+
], MemorySessionStore);
|
|
98
|
+
exports.MemorySessionStore = MemorySessionStore;
|
|
96
99
|
//# sourceMappingURL=session.js.map
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,6CAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,6CAA6E;AAC7E,oCAAkE;AAClE,0DAA+D;AAC/D,+BAAoC;AAEpC;;GAEG;AAEH,IAAa,OAAO,GAApB,MAAa,OAAO;IAYlB,YAAY,IAAsB;QAChC,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC3B;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAA,SAAM,GAAE,CAAC;SAC3B;QAED;;WAEG;QACH,IAAI,CAAC,UAAU,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAE/E,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC;SAChC;IACH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAe;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AArCC;IADC,IAAA,sBAAM,EAAC,yBAAyB,CAAC;;sDACM;AAF7B,OAAO;IADnB,IAAA,gBAAW,GAAE;;GACD,OAAO,CAuCnB;AAvCY,0BAAO;AAyCpB;;GAEG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAoC,SAAQ,4BAAkB;IAA3E;;QAIY,aAAQ,GAA6B,IAAI,GAAG,EAAuB,CAAC;IAqChF,CAAC;IAnCQ,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7C,IAAI,OAAO,CAAC,UAAU,IAAI,gBAAQ,CAAC,GAAG,EAAE,EAAE;gBACxC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACtC,OAAO,IAAI,CAAC;aACb;YAED,OAAO,OAAc,CAAC;SACvB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qCAAqC;IAC9B,KAAK,CAAC,YAAY,KAAI,CAAC;IAEvB,KAAK,CAAC,aAAa,CAAC,SAAiB;QAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACjC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAoB;QAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,EAAE,EAAE,CAAC,CAAC,CAAC;SAC9E;IACH,CAAC;CACF,CAAA;AAvCC;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;yDAAC;AAF5B,kBAAkB;IAD9B,IAAA,eAAU,EAAC,4BAAe,CAAC;GACf,kBAAkB,CAyC9B;AAzCY,gDAAkB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/rbac",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.140",
|
|
4
4
|
"description": "Role and Attribute based Access Control for SpinaJS framework",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -38,12 +38,12 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@spinajs/configuration": "^1.2.
|
|
41
|
+
"@spinajs/configuration": "^1.2.137",
|
|
42
42
|
"@spinajs/di": "^1.2.127",
|
|
43
43
|
"@spinajs/exceptions": "^1.2.127",
|
|
44
|
-
"@spinajs/log": "^1.2.
|
|
45
|
-
"@spinajs/orm": "^1.2.
|
|
46
|
-
"@spinajs/reflection": "^1.2.
|
|
44
|
+
"@spinajs/log": "^1.2.137",
|
|
45
|
+
"@spinajs/orm": "^1.2.140",
|
|
46
|
+
"@spinajs/reflection": "^1.2.137",
|
|
47
47
|
"accesscontrol": "^2.2.1",
|
|
48
48
|
"argon2": "^0.28.5",
|
|
49
49
|
"entropy-string": "^4.2.0",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"uuid": "^8.1.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@spinajs/orm-sqlite": "^1.2.
|
|
55
|
+
"@spinajs/orm-sqlite": "^1.2.140"
|
|
56
56
|
},
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "4e24f37f4f53b6b4d14981f8a46b4351f98f4ab3"
|
|
58
58
|
}
|