@social-mail/social-mail-web-server 1.8.424 → 1.8.425
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/files/WebSiteContentService.d.ts +4 -0
- package/dist/server/services/files/WebSiteContentService.d.ts.map +1 -1
- package/dist/server/services/files/WebSiteContentService.js +13 -0
- package/dist/server/services/files/WebSiteContentService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.d.ts +0 -2
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.js +1 -6
- package/dist/wwwroot/routes/social-mail/site/draft/[eFileID]/index.js.map +1 -1
- package/package.json +1 -1
- package/src/server/services/files/WebSiteContentService.ts +9 -0
- package/src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts +1 -4
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
|
|
2
1
|
import TempFileService from "../../../../../../server/storage/TempFileService.js";
|
|
3
2
|
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
4
3
|
import SessionSecurity from "@entity-access/server-pages/dist/services/SessionSecurity.js";
|
|
5
4
|
import PreviewDraftService from "../../../../../../server/services/html/PreviewDraftService.js";
|
|
6
5
|
import WebSiteContentService from "../../../../../../server/services/files/WebSiteContentService.js";
|
|
7
6
|
export default class extends Page {
|
|
8
|
-
db: SocialMailContext;
|
|
9
7
|
websiteService: WebSiteContentService;
|
|
10
8
|
tfs: TempFileService;
|
|
11
9
|
eFileID: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,qDAAqD,CAAC;AAElF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAC3F,OAAO,mBAAmB,MAAM,+DAA+D,CAAC;AAChG,OAAO,qBAAqB,MAAM,kEAAkE,CAAC;AAGrG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAI7B,cAAc,EAAE,qBAAqB,CAAC;IAGtC,GAAG,EAAE,eAAe,CAAC;IAGrB,OAAO,EAAE,MAAM,CAAC;IAGhB,eAAe,EAAE,eAAe,CAAC;IAGjC,mBAAmB,EAAE,mBAAmB,CAAC;IAEnC,GAAG;CA6FZ"}
|
|
@@ -9,7 +9,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
/* eslint-disable no-console */
|
|
11
11
|
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
12
|
-
import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
|
|
13
12
|
import TempFileService from "../../../../../../server/storage/TempFileService.js";
|
|
14
13
|
import { StatusResult, TempFileResult } from "@entity-access/server-pages/dist/Content.js";
|
|
15
14
|
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
@@ -30,7 +29,7 @@ let default_1 = class extends Page {
|
|
|
30
29
|
}
|
|
31
30
|
const keys = this.sessionSecurity.decryptKey(siteID);
|
|
32
31
|
// draft is only visible to logged in user
|
|
33
|
-
const site = await this.
|
|
32
|
+
const site = await this.websiteService.getWebSiteFolder(keys.appFileID);
|
|
34
33
|
if (path.length === 0) {
|
|
35
34
|
path.push("index.html");
|
|
36
35
|
}
|
|
@@ -87,10 +86,6 @@ let default_1 = class extends Page {
|
|
|
87
86
|
});
|
|
88
87
|
}
|
|
89
88
|
};
|
|
90
|
-
__decorate([
|
|
91
|
-
Inject,
|
|
92
|
-
__metadata("design:type", SocialMailContext)
|
|
93
|
-
], default_1.prototype, "db", void 0);
|
|
94
89
|
__decorate([
|
|
95
90
|
Inject,
|
|
96
91
|
__metadata("design:type", WebSiteContentService)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft/[eFileID]/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -12,6 +12,9 @@ import EncryptionService from "../encryption/EncryptionService.js";
|
|
|
12
12
|
import { hash } from "crypto";
|
|
13
13
|
import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* We cannot read from replica as relative path can change anytime, only absolute file content id can be read from replica.
|
|
17
|
+
*/
|
|
15
18
|
@RegisterScoped
|
|
16
19
|
export default class WebSiteContentService
|
|
17
20
|
extends ServiceObject
|
|
@@ -64,6 +67,12 @@ export default class WebSiteContentService
|
|
|
64
67
|
} as ISiteFolder;
|
|
65
68
|
}
|
|
66
69
|
|
|
70
|
+
@cacheFor()
|
|
71
|
+
async getWebSiteFolder(folderID) {
|
|
72
|
+
return this.db.websiteFolders.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
|
|
73
|
+
.first();
|
|
74
|
+
}
|
|
75
|
+
|
|
67
76
|
@cacheFor()
|
|
68
77
|
async getWebSite(host) {
|
|
69
78
|
const folder = await this.db.websiteFolders.where({ host }, (p) => (x) => x.hosts.some((s) => s.host === p.host))
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/* eslint-disable no-console */
|
|
2
2
|
import Inject from "@entity-access/entity-access/dist/di/di.js";
|
|
3
|
-
import SocialMailContext from "../../../../../../server/model/SocialMailContext.js";
|
|
4
3
|
import TempFileService from "../../../../../../server/storage/TempFileService.js";
|
|
5
4
|
import { StatusResult, TempFileResult } from "@entity-access/server-pages/dist/Content.js";
|
|
6
5
|
import Page from "@entity-access/server-pages/dist/Page.js";
|
|
@@ -15,8 +14,6 @@ import WebSiteContentService from "../../../../../../server/services/files/WebSi
|
|
|
15
14
|
@Prepare.authorize
|
|
16
15
|
export default class extends Page {
|
|
17
16
|
|
|
18
|
-
@Inject
|
|
19
|
-
db: SocialMailContext;
|
|
20
17
|
|
|
21
18
|
@Inject
|
|
22
19
|
websiteService: WebSiteContentService;
|
|
@@ -48,7 +45,7 @@ export default class extends Page {
|
|
|
48
45
|
|
|
49
46
|
// draft is only visible to logged in user
|
|
50
47
|
|
|
51
|
-
const site = await this.
|
|
48
|
+
const site = await this.websiteService.getWebSiteFolder(keys.appFileID);
|
|
52
49
|
|
|
53
50
|
if(path.length === 0) {
|
|
54
51
|
path.push("index.html");
|