@social-mail/social-mail-web-server 1.4.765 → 1.4.767

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.
Files changed (10) hide show
  1. package/dist/tsconfig.tsbuildinfo +1 -1
  2. package/dist/wwwroot/routes/api/site/asset/index.d.ts.map +1 -1
  3. package/dist/wwwroot/routes/api/site/asset/index.js +7 -7
  4. package/dist/wwwroot/routes/api/site/asset/index.js.map +1 -1
  5. package/dist/wwwroot/routes/api/site/draft/index.d.ts.map +1 -1
  6. package/dist/wwwroot/routes/api/site/draft/index.js +4 -0
  7. package/dist/wwwroot/routes/api/site/draft/index.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/wwwroot/routes/api/site/asset/index.ts +9 -6
  10. package/src/wwwroot/routes/api/site/draft/index.ts +3 -0
package/dist/wwwroot/routes/api/site/asset/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/asset/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAI5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAI9B,OAAO,CAAC,YAAY,CAAe;IAGnC,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,WAAW,CAAqB;IAGxC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;CAiDZ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/asset/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAI9B,OAAO,CAAC,YAAY,CAAe;IAGnC,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,WAAW,CAAqB;IAGxC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;CAmDZ"}
package/dist/wwwroot/routes/api/site/asset/index.js CHANGED
@@ -11,13 +11,13 @@ import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di
11
11
  import SocialMailContext from "../../../../../server/model/SocialMailContext.js";
12
12
  import WebSiteService from "../../../../../server/services/files/WebSiteService.js";
13
13
  import TempFileService from "../../../../../server/storage/TempFileService.js";
14
- import mime from "mime-types";
15
14
  import ImageConverterService from "../../../../../server/services/image-converter/ImageConverterService.js";
16
15
  import { TempFileResult } from "@entity-access/server-pages/dist/Content.js";
17
16
  import Page from "@entity-access/server-pages/dist/Page.js";
18
17
  import RateLimiterService from "../../../../../server/services/rate-limiter/RateLimiterService.js";
19
18
  import CacheService from "../../../../../server/services/cache/CacheService.js";
20
19
  import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
20
+ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
21
21
  export default class default_1 extends Page {
22
22
  async run() {
23
23
  const [type, siteID, assetID, fileContentID, fileName] = this.childPath;
@@ -25,19 +25,19 @@ export default class default_1 extends Page {
25
25
  // draft is only visible to logged in user
26
26
  this.db.verifyFilters = false;
27
27
  this.db.raiseEvents = false;
28
- const site = await this.db.websiteFolders.where({ siteID }, (p) => (x) => x.folderID === p.siteID)
29
- .firstOrFail();
28
+ const path = `${siteID}/%`;
30
29
  const fileVersion = await this.db.fileVersions
31
- .where({ assetID, fileContentID }, (p) => (x) => x.fileID === p.assetID && x.fileContentID === p.fileContentID)
32
- .include((x) => x.fileContent)
30
+ .where({ assetID, fileContentID, path }, (p) => (x) => x.fileID === p.assetID
31
+ && x.fileContentID === p.fileContentID
32
+ && Sql.text.like(x.file.path, p.path))
33
+ .include((x) => [x.fileContent, x.file])
33
34
  .first();
34
35
  if (!fileVersion) {
35
36
  return this.notFound();
36
37
  }
37
38
  const { fileContent } = fileVersion;
38
39
  this.cacheControl = "public, max-age=2592000, immutable";
39
- const contentType = mime.lookup(fileName) || "application/octet-data";
40
- let file = await this.tfs.downloadFileContent(fileContent, { name: fileName, contentType });
40
+ let file = await this.tfs.downloadFileContent(fileContent, fileVersion.file);
41
41
  // transform here...
42
42
  if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
43
43
  // resize...
package/dist/wwwroot/routes/api/site/asset/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/asset/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/asset/index.ts"],"names":[],"mappings":"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"}
package/dist/wwwroot/routes/api/site/draft/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/draft/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;CA6DZ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/draft/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,GAAG,CAAkB;IAEvB,GAAG;CAgEZ"}
package/dist/wwwroot/routes/api/site/draft/index.js CHANGED
@@ -58,6 +58,10 @@ let default_1 = class extends Page {
58
58
  }
59
59
  body = `<!DOCTYPE HTML>${document.documentElement.outerHTML}`;
60
60
  }
61
+ else {
62
+ // we will overwrite base
63
+ body = body.split(/\<\/head\>/i).join(`<base href="/api/site/draft/${siteID}/"/></head>`);
64
+ }
61
65
  return this.content({ body, contentType: "text/html" });
62
66
  }
63
67
  return new TempFileResult(localFile, {
package/dist/wwwroot/routes/api/site/draft/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/draft/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/wwwroot/routes/api/site/draft/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+BAA+B;AAC/B,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AACjF,OAAO,cAAc,MAAM,wDAAwD,CAAC;AACpF,OAAO,eAAe,MAAM,kDAAkD,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGf,gBAAA,KAAM,SAAQ,IAAI;IAW7B,KAAK,CAAC,GAAG;QAEL,MAAM,CAAC,MAAM,EAAE,GAAI,IAAI,CAAC,GAAG,IAAI,CAAC,SAAkB,CAAC;QAEnD,0CAA0C;QAE1C,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,MAAM,CAAC;aAC5G,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;iBACpH,WAAW,EAAE,CAAC;QACnB,CAAC;QAED,IAAG,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5B,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAEvD,+CAA+C;QAC/C,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YACvC,IAAI,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;YACxC,IAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,oBAAoB;gBACpB,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjD,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;gBACpD,KAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;oBAClE,IAAI,GAAG,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;oBAChC,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;wBACtB,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC3B,CAAC;oBACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;oBACvF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;oBAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,MAAM,WAAW,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,CAAC;oBACnF,KAAI,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC/C,EAAE,CAAC,MAAM,EAAE,CAAC;wBACZ,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;oBACxC,CAAC;oBACD,CAAC,CAAC,MAAM,EAAE,CAAC;gBACf,CAAC;gBACD,IAAI,GAAG,kBAAkB,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACJ,yBAAyB;gBACzB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,+BAA+B,MAAM,aAAa,CAAC,CAAC;YAC9F,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,IAAI,cAAc,CACrB,SAAS,EACT;YACI,kBAAkB,EAAE,QAAQ;YAC5B,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,CAAC;SACZ,CACJ,CAAC;IAEN,CAAC;CAEJ,CAAA;AAxEW;IADP,MAAM;8BACK,iBAAiB;qCAAC;AAGtB;IADP,MAAM;8BACiB,cAAc;iDAAC;AAG/B;IADP,MAAM;8BACM,eAAe;sCAAC;AATlB;IADd,OAAO,CAAC,SAAS;aA4EjB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.4.765",
3
+ "version": "1.4.767",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/wwwroot/routes/api/site/asset/index.ts CHANGED
@@ -9,6 +9,7 @@ import Page from "@entity-access/server-pages/dist/Page.js";
9
9
  import RateLimiterService from "../../../../../server/services/rate-limiter/RateLimiterService.js";
10
10
  import CacheService from "../../../../../server/services/cache/CacheService.js";
11
11
  import TimeSpan from "@entity-access/entity-access/dist/types/TimeSpan.js";
12
+ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
12
13
  export default class extends Page {
13
14
 
14
15
  @Inject
@@ -36,20 +37,22 @@ export default class extends Page {
36
37
  // draft is only visible to logged in user
37
38
  this.db.verifyFilters = false;
38
39
  this.db.raiseEvents = false;
39
- const site = await this.db.websiteFolders.where({ siteID }, (p) => (x) => x.folderID === p.siteID)
40
- .firstOrFail();
40
+
41
+ const path = `${siteID}/%`;
41
42
 
42
43
  const fileVersion = await this.db.fileVersions
43
- .where({ assetID, fileContentID }, (p) => (x) => x.fileID === p.assetID && x.fileContentID === p.fileContentID)
44
- .include((x) => x.fileContent)
44
+ .where({ assetID, fileContentID, path }, (p) => (x) =>
45
+ x.fileID === p.assetID
46
+ && x.fileContentID === p.fileContentID
47
+ && Sql.text.like(x.file.path, p.path))
48
+ .include((x) => [x.fileContent, x.file])
45
49
  .first();
46
50
  if (!fileVersion) {
47
51
  return this.notFound();
48
52
  }
49
53
  const { fileContent } = fileVersion;
50
54
  this.cacheControl = "public, max-age=2592000, immutable";
51
- const contentType = mime.lookup(fileName) || "application/octet-data";
52
- let file = await this.tfs.downloadFileContent(fileContent, { name: fileName, contentType });
55
+ let file = await this.tfs.downloadFileContent(fileContent, fileVersion.file);
53
56
 
54
57
  // transform here...
55
58
  if (/^(size|jpg|png|webp|gif|face\-circle)\(/i.test(type)) {
package/src/wwwroot/routes/api/site/draft/index.ts CHANGED
@@ -66,6 +66,9 @@ export default class extends Page {
66
66
  e.remove();
67
67
  }
68
68
  body = `<!DOCTYPE HTML>${document.documentElement.outerHTML}`;
69
+ } else {
70
+ // we will overwrite base
71
+ body = body.split(/\<\/head\>/i).join(`<base href="/api/site/draft/${siteID}/"/></head>`);
69
72
  }
70
73
  return this.content({ body, contentType: "text/html"});
71
74
  }