@social-mail/social-mail-web-server 1.7.289 → 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/model/events/UserEvents.d.ts +1 -0
- package/dist/server/model/events/UserEvents.d.ts.map +1 -1
- package/dist/server/model/events/UserEvents.js +18 -0
- package/dist/server/model/events/UserEvents.js.map +1 -1
- 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/model/events/UserEvents.ts +14 -0
- package/src/server/services/UserInfoProvider.ts +10 -7
|
@@ -6,6 +6,7 @@ export default class UserEvents extends AuthenticatedEvents<User> {
|
|
|
6
6
|
private db;
|
|
7
7
|
private cryptoService;
|
|
8
8
|
private sessionSecurity;
|
|
9
|
+
createWebSite(user: User, domainName: string, templateID: number): Promise<void>;
|
|
9
10
|
filter(query: IEntityQuery<User>): IEntityQuery<User>;
|
|
10
11
|
modify(query: IEntityQuery<User>): IEntityQuery<User>;
|
|
11
12
|
includeFilter(query: IEntityQuery<User>, type?: any, key?: string): IEntityQuery<User>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAE/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;
|
|
1
|
+
{"version":3,"file":"UserEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAE/F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAazF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,mBAAmB,CAAC,IAAI,CAAC;IAG7D,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,eAAe,CAAkB;IAGnC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAYtE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IAUrD,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC;IASrD,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAa3D,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW;IA0D7C,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC;IAuBlD,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC;IAgEnD,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC;IAiBlD,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,CAAC;IASzD,OAAO,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI;IAa3B,OAAO,CAAC,cAAc;CAOzB"}
|
|
@@ -20,7 +20,19 @@ import AppFile from "../entities/AppFile.js";
|
|
|
20
20
|
import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
|
|
21
21
|
import CreateSocialSiteWorkflow from "../../workflows/site/CreateSocialSiteWorkflow.js";
|
|
22
22
|
import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
|
|
23
|
+
import ExternalInvoke from "@entity-access/server-pages/dist/decorators/ExternalInvoke.js";
|
|
23
24
|
export default class UserEvents extends AuthenticatedEvents {
|
|
25
|
+
async createWebSite(user, domainName, templateID) {
|
|
26
|
+
const userID = user.userID;
|
|
27
|
+
const name = user.displayName;
|
|
28
|
+
const context = ServiceProvider.resolve(this, WorkflowContext);
|
|
29
|
+
await context.queue(CreateSocialSiteWorkflow, {
|
|
30
|
+
userID,
|
|
31
|
+
domainName,
|
|
32
|
+
templateID,
|
|
33
|
+
name
|
|
34
|
+
});
|
|
35
|
+
}
|
|
24
36
|
filter(query) {
|
|
25
37
|
if (this.sessionUser.isAdmin) {
|
|
26
38
|
return query;
|
|
@@ -232,4 +244,10 @@ __decorate([
|
|
|
232
244
|
Inject,
|
|
233
245
|
__metadata("design:type", SessionSecurity)
|
|
234
246
|
], UserEvents.prototype, "sessionSecurity", void 0);
|
|
247
|
+
__decorate([
|
|
248
|
+
ExternalInvoke,
|
|
249
|
+
__metadata("design:type", Function),
|
|
250
|
+
__metadata("design:paramtypes", [User, String, Number]),
|
|
251
|
+
__metadata("design:returntype", Promise)
|
|
252
|
+
], UserEvents.prototype, "createWebSite", null);
|
|
235
253
|
//# sourceMappingURL=UserEvents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,wBAAwB,MAAM,kDAAkD,CAAC;AACxF,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAE3F,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,mBAAyB;
|
|
1
|
+
{"version":3,"file":"UserEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/UserEvents.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|