@social-mail/social-mail-web-server 1.4.706 → 1.4.708
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/entities/UserPin.d.ts.map +1 -1
- package/dist/server/model/entities/UserPin.js +11 -1
- package/dist/server/model/entities/UserPin.js.map +1 -1
- package/dist/server/services/store/StoreConfigService.js +1 -1
- package/dist/server/services/store/StoreConfigService.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/wwwroot/routes/index.d.ts.map +1 -1
- package/dist/wwwroot/routes/index.js +20 -2
- package/dist/wwwroot/routes/index.js.map +1 -1
- package/package.json +1 -1
- package/src/server/model/entities/UserPin.ts +10 -0
- package/src/server/services/store/StoreConfigService.ts +1 -1
- package/src/wwwroot/routes/index.tsx +22 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/wwwroot/routes/index.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,mCAAmC,CAAC;AAEzD,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAG3E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,MAAM,EAAE,QAAQ,CAAC;IAGjB,cAAc,EAAE,cAAc,CAAC;IAE/B,GAAG,EAAE,GAAG,CAAC;IAEH,GAAG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/wwwroot/routes/index.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,mCAAmC,CAAC;AAEzD,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAG3E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAG5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,MAAM,EAAE,QAAQ,CAAC;IAGjB,cAAc,EAAE,cAAc,CAAC;IAE/B,GAAG,EAAE,GAAG,CAAC;IAEH,GAAG;CAkGZ"}
|
|
@@ -25,21 +25,39 @@ export default class default_1 extends Page {
|
|
|
25
25
|
if (webSite) {
|
|
26
26
|
// this is a static web site...
|
|
27
27
|
// if path is empty... load /index.html....
|
|
28
|
+
let notFound = false;
|
|
28
29
|
let path = this.childPath;
|
|
29
30
|
if (!file) {
|
|
30
31
|
path = ["index.html"];
|
|
31
32
|
}
|
|
32
|
-
|
|
33
|
+
let appFile = await this.websiteService.getSnapshotFile(webSite, path);
|
|
33
34
|
if (!appFile) {
|
|
34
35
|
if (file === "favicon.ico") {
|
|
35
36
|
this.cacheControl = "public, max-age=8600";
|
|
36
37
|
return new FileResult(ImagesFolder.file("favicon.ico"));
|
|
37
38
|
}
|
|
38
|
-
|
|
39
|
+
if (file === "robots.txt") {
|
|
40
|
+
return this.notFound();
|
|
41
|
+
}
|
|
42
|
+
appFile = await this.websiteService.getSnapshotFile(webSite, ["index.html"]);
|
|
43
|
+
if (appFile === null) {
|
|
44
|
+
return this.notFound();
|
|
45
|
+
}
|
|
46
|
+
notFound = true;
|
|
39
47
|
}
|
|
40
48
|
delete appFile.fileContent;
|
|
41
49
|
const tfs = ServiceProvider.resolve(this, TempFileService);
|
|
42
50
|
const localFile = await tfs.downloadAppFile(appFile);
|
|
51
|
+
if (notFound) {
|
|
52
|
+
const body = await localFile.readAsText();
|
|
53
|
+
console.error(`404: ${this.request?.URL?.toString()}`);
|
|
54
|
+
return this.content({
|
|
55
|
+
body,
|
|
56
|
+
contentType: "text/html",
|
|
57
|
+
suppressLog: true,
|
|
58
|
+
status: 404
|
|
59
|
+
});
|
|
60
|
+
}
|
|
43
61
|
return new TempFileResult(localFile, {
|
|
44
62
|
contentDisposition: forceDownload
|
|
45
63
|
? "attachment"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/wwwroot/routes/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AACrF,OAAO,QAAQ,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,cAAc,MAAM,+CAA+C,CAAC;AAC3E,OAAO,eAAe,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACzF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAE5E,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAU7B,KAAK,CAAC,GAAG;QAEL,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAErC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAE/B,kDAAkD;QAClD,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,OAAO,EAAE,CAAC;YACV,+BAA+B;YAC/B,2CAA2C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/wwwroot/routes/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,8 +4,18 @@ import Table from "@entity-access/entity-access/dist/decorators/Table.js";
|
|
|
4
4
|
import { User } from "./User.js";
|
|
5
5
|
import AppFile from "./AppFile.js";
|
|
6
6
|
import Mailbox from "./Mailbox.js";
|
|
7
|
+
import Index from "@entity-access/entity-access/dist/decorators/Index.js";
|
|
7
8
|
|
|
8
9
|
@Table("UserPins")
|
|
10
|
+
@Index({
|
|
11
|
+
name: "IX_UserPins_UseID",
|
|
12
|
+
columns: [
|
|
13
|
+
{ name: (x) => x.userID, descending: false },
|
|
14
|
+
{ name: (x) => x.appFileID, descending: false},
|
|
15
|
+
{ name: (x) => x.mailboxID, descending: false},
|
|
16
|
+
],
|
|
17
|
+
unique: true
|
|
18
|
+
})
|
|
9
19
|
export default class UserPin {
|
|
10
20
|
|
|
11
21
|
@Column({ dataType: "BigInt", key: true, generated: "identity"})
|
|
@@ -34,7 +34,7 @@ export default class StoreConfigService {
|
|
|
34
34
|
const db = scope.resolve(SocialMailContext);
|
|
35
35
|
return await db.appFiles.where({ host, folderID }, (p) => (x) =>
|
|
36
36
|
x.appFileID === p.folderID
|
|
37
|
-
&& x.
|
|
37
|
+
&& x.stores.some((s) => s.storeWebsites.some((w) => w.website.hosts.some((h) => h.host === p.host)))
|
|
38
38
|
).first();
|
|
39
39
|
}
|
|
40
40
|
|
|
@@ -29,21 +29,41 @@ export default class extends Page {
|
|
|
29
29
|
if (webSite) {
|
|
30
30
|
// this is a static web site...
|
|
31
31
|
// if path is empty... load /index.html....
|
|
32
|
+
|
|
33
|
+
let notFound = false;
|
|
34
|
+
|
|
32
35
|
let path = this.childPath;
|
|
33
36
|
if (!file) {
|
|
34
37
|
path = ["index.html"];
|
|
35
38
|
}
|
|
36
|
-
|
|
39
|
+
let appFile = await this.websiteService.getSnapshotFile(webSite, path);
|
|
37
40
|
if (!appFile) {
|
|
38
41
|
if (file === "favicon.ico") {
|
|
39
42
|
this.cacheControl = "public, max-age=8600";
|
|
40
43
|
return new FileResult(ImagesFolder.file("favicon.ico"));
|
|
41
44
|
}
|
|
42
|
-
|
|
45
|
+
if (file === "robots.txt") {
|
|
46
|
+
return this.notFound();
|
|
47
|
+
}
|
|
48
|
+
appFile = await this.websiteService.getSnapshotFile(webSite, ["index.html"]);
|
|
49
|
+
if (appFile === null) {
|
|
50
|
+
return this.notFound();
|
|
51
|
+
}
|
|
52
|
+
notFound = true;
|
|
43
53
|
}
|
|
44
54
|
delete appFile.fileContent;
|
|
45
55
|
const tfs = ServiceProvider.resolve(this, TempFileService);
|
|
46
56
|
const localFile = await tfs.downloadAppFile(appFile);
|
|
57
|
+
if (notFound) {
|
|
58
|
+
const body = await localFile.readAsText();
|
|
59
|
+
console.error(`404: ${this.request?.URL?.toString()}`);
|
|
60
|
+
return this.content({
|
|
61
|
+
body,
|
|
62
|
+
contentType: "text/html",
|
|
63
|
+
suppressLog: true,
|
|
64
|
+
status: 404
|
|
65
|
+
});
|
|
66
|
+
}
|
|
47
67
|
return new TempFileResult(
|
|
48
68
|
localFile,
|
|
49
69
|
{
|