@social-mail/social-mail-web-server 1.8.407 → 1.8.411
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/WebServer.js +1 -1
- package/dist/WebServer.js.map +1 -1
- package/dist/server/services/UserAuthorizationService.d.ts +7 -0
- package/dist/server/services/UserAuthorizationService.d.ts.map +1 -1
- package/dist/server/services/UserAuthorizationService.js +6 -2
- package/dist/server/services/UserAuthorizationService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/WebServer.ts +1 -1
- package/src/server/services/UserAuthorizationService.ts +6 -2
package/dist/WebServer.js
CHANGED
|
@@ -196,7 +196,7 @@ export default class WebServer {
|
|
|
196
196
|
ServiceCollection.register("Singleton", ReportWorkflowContext);
|
|
197
197
|
ServiceCollection.register("Scoped", ReadOnlySocialMailContext);
|
|
198
198
|
ServiceCollection.registerMultiple("Scoped", [AppDbContext, SocialMailContext], SocialMailContext);
|
|
199
|
-
ServiceCollection.registerMultiple("
|
|
199
|
+
ServiceCollection.registerMultiple("Singleton", [UserInfoProvider, AuthorizationService], UserInfoProvider);
|
|
200
200
|
ServiceCollection.registerMultiple("Singleton", [AppSocketService, SocketService], AppSocketService);
|
|
201
201
|
ServiceCollection.registerMultiple("Singleton", [AppKeyProvider, KeyProvider], AppKeyProvider);
|
|
202
202
|
ServiceCollection.registerMultiple("Singleton", [ContextEvents], SocialMailContextEvents);
|
package/dist/WebServer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../src/WebServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../src/WebServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,13 @@ export default class UserAuthorizationService extends AuthorizationService {
|
|
|
10
10
|
loadUserSessionFromCookie(cookie: string, user: SessionUser): Promise<void>;
|
|
11
11
|
setAuthCookie(user: SessionUser, authCookie: IAuthorizationCookie): Promise<ICookie>;
|
|
12
12
|
loadSessionFromDb(sessionID: any): Promise<{
|
|
13
|
+
sessionID: any;
|
|
14
|
+
userID?: undefined;
|
|
15
|
+
expiry?: undefined;
|
|
16
|
+
roles?: undefined;
|
|
17
|
+
fileAccessList?: undefined;
|
|
18
|
+
invalid?: undefined;
|
|
19
|
+
} | {
|
|
13
20
|
sessionID: any;
|
|
14
21
|
userID: number;
|
|
15
22
|
expiry: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAuthorizationService.d.ts","sourceRoot":"","sources":["../../../src/server/services/UserAuthorizationService.ts"],"names":[],"mappings":"AACA,OAAO,oBAAoB,EAAE,EAAE,OAAO,EAAE,MAAM,mEAAmE,CAAC;AAGlH,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;
|
|
1
|
+
{"version":3,"file":"UserAuthorizationService.d.ts","sourceRoot":"","sources":["../../../src/server/services/UserAuthorizationService.ts"],"names":[],"mappings":"AACA,OAAO,oBAAoB,EAAE,EAAE,OAAO,EAAE,MAAM,mEAAmE,CAAC;AAGlH,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AACnF,OAAO,aAAa,MAAM,+BAA+B,CAAC;AAG1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mEAAmE,CAAC;AACzG,OAAO,gBAAgB,MAAM,sCAAsC,CAAC;AAGpE,MAAM,CAAC,OAAO,OAAO,wBAAyB,SAAQ,oBAAoB;IAEtE,SAAS,gBAIN;IAGH,EAAE,EAAE,gBAAgB,CAAC;;IASf,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IAqB3D,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAWpF,iBAAiB,CAAC,SAAS,EAAE,GAAG;;;;;;;;;;;;;;;;;;YAmCxB,UAAU;CAiB3B"}
|
|
@@ -63,7 +63,6 @@ import Inject, { RegisterSingleton, ServiceProvider } from "@entity-access/entit
|
|
|
63
63
|
import AuthorizationService from "@entity-access/server-pages/dist/services/AuthorizationService.js";
|
|
64
64
|
import SocialMailContext from "../model/SocialMailContext.js";
|
|
65
65
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
66
|
-
import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
|
|
67
66
|
import BaseDiskCache from "../../common/BaseDiskCache.js";
|
|
68
67
|
import { join } from "path";
|
|
69
68
|
import { globalEnv } from "../../common/globalEnv.js";
|
|
@@ -87,6 +86,11 @@ let UserAuthorizationService = class UserAuthorizationService extends Authorizat
|
|
|
87
86
|
return await this.loadSessionFromDb(sessionID);
|
|
88
87
|
});
|
|
89
88
|
user.sessionID = info.sessionID;
|
|
89
|
+
if (!info.userID) {
|
|
90
|
+
// delete cache. cache is invalid...
|
|
91
|
+
await this.diskCache.deleteAt(keyPath);
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
90
94
|
user.userID = info.userID;
|
|
91
95
|
user.roles = info.roles;
|
|
92
96
|
user.expiry = info.expiry;
|
|
@@ -120,7 +124,7 @@ let UserAuthorizationService = class UserAuthorizationService extends Authorizat
|
|
|
120
124
|
])
|
|
121
125
|
.first();
|
|
122
126
|
if (!session?.user) {
|
|
123
|
-
|
|
127
|
+
return { sessionID };
|
|
124
128
|
}
|
|
125
129
|
// extend session...
|
|
126
130
|
await db.loginSessions.where({ sessionID }, (p) => (x) => x.sessionID === p.sessionID)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAuthorizationService.js","sourceRoot":"","sources":["../../../src/server/services/UserAuthorizationService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACxG,OAAO,oBAAiC,MAAM,mEAAmE,CAAC;AAClH,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAE/D,OAAO,
|
|
1
|
+
{"version":3,"file":"UserAuthorizationService.js","sourceRoot":"","sources":["../../../src/server/services/UserAuthorizationService.ts"],"names":[],"mappings":"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"}
|