@social-mail/social-mail-web-server 1.7.290 → 1.7.291
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/dist/server/services/UserInfoProvider.d.ts +0 -2
- package/dist/server/services/UserInfoProvider.d.ts.map +1 -1
- package/dist/server/services/UserInfoProvider.js +7 -11
- package/dist/server/services/UserInfoProvider.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/server/services/UserInfoProvider.ts +10 -7
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { IAuthCookie } from "@entity-access/server-pages/dist/services/TokenService.js";
|
|
2
2
|
import USP from "@entity-access/server-pages/dist/services/UserSessionProvider.js";
|
|
3
|
-
import SocialMailContext from "../model/SocialMailContext.js";
|
|
4
3
|
export default class UserSessionProvider extends USP {
|
|
5
|
-
db: SocialMailContext;
|
|
6
4
|
getUserSession({ userID, id: sessionID, expiry }: IAuthCookie): Promise<{
|
|
7
5
|
userID: number;
|
|
8
6
|
sessionID: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserInfoProvider.d.ts","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,GAAG,MAAM,kEAAkE,CAAC;
|
|
1
|
+
{"version":3,"file":"UserInfoProvider.d.ts","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,GAAG,MAAM,kEAAkE,CAAC;AAKnF,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,GAAG;IAE1C,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,WAAW;;;;;;;;;;;;CAgCtE"}
|
|
@@ -4,16 +4,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
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;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
|
|
8
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
-
};
|
|
10
|
-
import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
|
|
7
|
+
import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
|
|
11
8
|
import USP from "@entity-access/server-pages/dist/services/UserSessionProvider.js";
|
|
12
9
|
import SocialMailContext from "../model/SocialMailContext.js";
|
|
13
10
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
14
11
|
let UserSessionProvider = class UserSessionProvider extends USP {
|
|
15
12
|
async getUserSession({ userID, id: sessionID, expiry }) {
|
|
16
|
-
|
|
13
|
+
/** The new scope will not interfere with existing DbContext for current request */
|
|
14
|
+
const scope = ServiceProvider.createScope(this);
|
|
15
|
+
const db = scope.resolve(SocialMailContext);
|
|
16
|
+
const session = await db.loginSessions.where({ userID, sessionID }, (p) => (x) => x.userID === p.userID
|
|
17
17
|
&& x.sessionID === p.sessionID && x.invalid === false)
|
|
18
18
|
.include((x) => [x.user.roles, x.user.fileAccessList.forEach((f) => f.file)])
|
|
19
19
|
.first();
|
|
@@ -21,7 +21,7 @@ let UserSessionProvider = class UserSessionProvider extends USP {
|
|
|
21
21
|
return null;
|
|
22
22
|
}
|
|
23
23
|
// extend session...
|
|
24
|
-
await
|
|
24
|
+
await db.loginSessions.where({ sessionID }, (p) => (x) => x.sessionID === p.sessionID)
|
|
25
25
|
.update(void 0, (p) => (x) => ({
|
|
26
26
|
expiry: Sql.date.addDays(x.expiry, 7)
|
|
27
27
|
}));
|
|
@@ -36,12 +36,8 @@ let UserSessionProvider = class UserSessionProvider extends USP {
|
|
|
36
36
|
};
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
-
__decorate([
|
|
40
|
-
Inject,
|
|
41
|
-
__metadata("design:type", SocialMailContext)
|
|
42
|
-
], UserSessionProvider.prototype, "db", void 0);
|
|
43
39
|
UserSessionProvider = __decorate([
|
|
44
|
-
|
|
40
|
+
RegisterSingleton
|
|
45
41
|
], UserSessionProvider);
|
|
46
42
|
export default UserSessionProvider;
|
|
47
43
|
//# sourceMappingURL=UserInfoProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserInfoProvider.js","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UserInfoProvider.js","sourceRoot":"","sources":["../../../src/server/services/UserInfoProvider.ts"],"names":[],"mappings":";;;;;;AAAA,OAAe,EAAkB,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAGxH,OAAO,GAAG,MAAM,kEAAkE,CAAC;AACnF,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAGhD,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,GAAG;IAEhD,KAAK,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAe;QAE/D,mFAAmF;QAEnF,MAAM,KAAK,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAE5C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;eAChG,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;aACrD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC5E,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,oBAAoB;QACpB,MAAM,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAAC;aAChF,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC3B,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SACxC,CAAC,CAAC,CAAC;QAER,OAAO;YACH,MAAM;YACN,SAAS;YACT,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;YAC/B,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ;YAC/B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE;YACvD,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/F,OAAO,EAAE,KAAK;SACjB,CAAC;IACN,CAAC;CAEJ,CAAA;AAlCoB,mBAAmB;IADvC,iBAAiB;GACG,mBAAmB,CAkCvC;eAlCoB,mBAAmB"}
|