@spinajs/rbac-http 1.2.146 → 1.2.147
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/middlewares.js +19 -13
- package/lib/middlewares.js.map +1 -1
- package/package.json +2 -2
package/lib/middlewares.js
CHANGED
|
@@ -47,22 +47,28 @@ let UserFromSessionMiddleware = class UserFromSessionMiddleware extends http_1.S
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
before() {
|
|
50
|
-
return async (req, _res,
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
50
|
+
return async (req, _res, next) => {
|
|
51
|
+
try {
|
|
52
|
+
if (req.cookies.ssid) {
|
|
53
|
+
const ssid = cs.unsign(req.cookies.ssid, this.CoockieSecret);
|
|
54
|
+
if (ssid) {
|
|
55
|
+
const session = (await this.SessionProvider.restoreSession(ssid));
|
|
56
|
+
if (session) {
|
|
57
|
+
req.storage.user = new rbac_1.User(session.Data);
|
|
58
|
+
const liveTimeDiff = session.Expiration.diff(luxon_1.DateTime.now());
|
|
59
|
+
if (liveTimeDiff.minutes < 30) {
|
|
60
|
+
await this.SessionProvider.refreshSession(session);
|
|
61
|
+
}
|
|
60
62
|
}
|
|
61
63
|
}
|
|
64
|
+
else {
|
|
65
|
+
req.storage.user = null;
|
|
66
|
+
}
|
|
62
67
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
68
|
+
next();
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
next(err);
|
|
66
72
|
}
|
|
67
73
|
};
|
|
68
74
|
}
|
package/lib/middlewares.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAmE;AACnE,oCAAqD;AACrD,4BAA0B;AAE1B,0DAAgD;AAChD,qDAAuC;AACvC,iCAAiC;AACjC,wCAAsE;AAGtE,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,uBAAgB;IAOtD,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,
|
|
1
|
+
{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAmE;AACnE,oCAAqD;AACrD,4BAA0B;AAE1B,0DAAgD;AAChD,qDAAuC;AACvC,iCAAiC;AACjC,wCAAsE;AAGtE,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,uBAAgB;IAOtD,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,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAgB,CAAC;wBACjF,IAAI,OAAO,EAAE;4BACX,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,WAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;4BAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;4BAC7D,IAAI,YAAY,CAAC,OAAO,GAAG,EAAE,EAAE;gCAC7B,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;6BACpD;yBACF;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;AAtCC;IADC,IAAA,sBAAM,EAAC,oBAAoB,CAAC;;gEACG;AAGhC;IADC,IAAA,eAAU,GAAE;8BACc,sBAAe;kEAAC;AALhC,yBAAyB;IADrC,IAAA,eAAU,EAAC,uBAAgB,CAAC;GAChB,yBAAyB,CAwCrC;AAxCY,8DAAyB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/rbac-http",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.147",
|
|
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.140"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "96bd0af5e8a2af7515ba3a930aae6681daccfdf2"
|
|
55
55
|
}
|