@social-mail/social-mail-web-server 1.8.466 → 1.8.467

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 (9) hide show
  1. package/dist/server/services/files/WebSiteContentService.js +2 -2
  2. package/dist/server/services/files/WebSiteContentService.js.map +1 -1
  3. package/dist/tsconfig.tsbuildinfo +1 -1
  4. package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.d.ts.map +1 -1
  5. package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js +2 -1
  6. package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js.map +1 -1
  7. package/package.json +1 -1
  8. package/src/server/services/files/WebSiteContentService.ts +2 -2
  9. package/src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx +2 -1
package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,OAAO,aAAa,MAAM,4DAA4D,CAAC;AAGvF,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAIlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,MAAM,MAAC;IAGP,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,iBAAiB,CAAC;IAGvB,aAAa,EAAE,aAAa,CAAC;IAEvB,GAAG;CAqBZ"}
1
+ {"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,OAAO,aAAa,MAAM,4DAA4D,CAAC;AAGvF,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAKlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,MAAM,MAAC;IAGP,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,iBAAiB,CAAC;IAGvB,aAAa,EAAE,aAAa,CAAC;IAEvB,GAAG;CAqBZ"}
package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js CHANGED
@@ -17,6 +17,7 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
17
17
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
18
18
  import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
19
19
  import { globalEnv } from "../../../../../../common/globalEnv.js";
20
+ import { Base36 } from "../../../../../../common/Base36.js";
20
21
  let default_1 = class extends Page {
21
22
  async run() {
22
23
  const site = await this.replicaReader.query((db) => db.websiteFolders.filtered("read").where(this, (p) => (x) => x.folderID === p.siteID)
@@ -29,7 +30,7 @@ let default_1 = class extends Page {
29
30
  if (!path) {
30
31
  path = "index.html";
31
32
  }
32
- const encoded = this.ecs.general.encrypt(`${site.folderID.toString(36)}-${time.msSinceEpoch.toString(36)}`, "hex");
33
+ const encoded = this.ecs.general.encrypt(`${Base36.encode(site.folderID)}-${time.msSinceEpoch.toString(36)}`, "hex");
33
34
  const host = `${globalEnv.serverID}-${encoded}`;
34
35
  return this.redirect(`https://${host}.sites.${globalEnv.wildcardDomain}/${path}`);
35
36
  }
package/dist/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,aAAa,MAAM,4DAA4D,CAAC;AACvF,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAGnD,gBAAA,KAAM,SAAQ,IAAI;IAc7B,KAAK,CAAC,GAAG;QAEL,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,MAAM,CAAC;aACpI,KAAK,EAAE,CAAC,CAAC;QAEd,IAAG,CAAC,IAAI,EAAE,CAAC;YACP,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAEjF,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,IAAG,CAAC,IAAI,EAAE,CAAC;YACP,IAAI,GAAG,YAAY,CAAC;QACxB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACnH,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC;QAEhD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,UAAU,SAAS,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC,CAAC;IACtF,CAAC;CACJ,CAAA;AAhCG;IADC,KAAK,CAAC,QAAQ,CAAC;;yCACT;AAGP;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGtB;IADC,MAAM;8BACF,iBAAiB;sCAAC;AAGvB;IADC,MAAM;8BACQ,aAAa;gDAAC;AAZlB;IADd,OAAO,CAAC,SAAS;aAoCjB"}
1
+ {"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,4CAA4C,CAAC;AAChE,OAAO,EAAE,KAAK,EAAE,MAAM,gDAAgD,CAAC;AACvE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAC;AACjF,OAAO,aAAa,MAAM,4DAA4D,CAAC;AACvF,OAAO,iBAAiB,MAAM,+DAA+D,CAAC;AAC9F,OAAO,QAAQ,MAAM,qDAAqD,CAAC;AAC3E,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAG7C,gBAAA,KAAM,SAAQ,IAAI;IAc7B,KAAK,CAAC,GAAG;QAEL,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,MAAM,CAAC;aACpI,KAAK,EAAE,CAAC,CAAC;QAEd,IAAG,CAAC,IAAI,EAAE,CAAC;YACP,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QAEjF,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpC,IAAG,CAAC,IAAI,EAAE,CAAC;YACP,IAAI,GAAG,YAAY,CAAC;QACxB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACrH,MAAM,IAAI,GAAG,GAAG,SAAS,CAAC,QAAQ,IAAI,OAAO,EAAE,CAAC;QAEhD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,UAAU,SAAS,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC,CAAC;IACtF,CAAC;CACJ,CAAA;AAhCG;IADC,KAAK,CAAC,QAAQ,CAAC;;yCACT;AAGP;IADC,MAAM;8BACH,iBAAiB;qCAAC;AAGtB;IADC,MAAM;8BACF,iBAAiB;sCAAC;AAGvB;IADC,MAAM;8BACQ,aAAa;gDAAC;AAZlB;IADd,OAAO,CAAC,SAAS;aAoCjB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@social-mail/social-mail-web-server",
3
- "version": "1.8.466",
3
+ "version": "1.8.467",
4
4
  "description": "## Phase 1",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/server/services/files/WebSiteContentService.ts CHANGED
@@ -74,11 +74,11 @@ export default class WebSiteContentService
74
74
  }
75
75
 
76
76
  site = await this.replicaReader.query((db) => db.websiteFolders.where({ folderID }, (p) => (x) =>
77
- x.folderID === p.folderID as any
78
- && x.isSuspended === false)
77
+ x.folderID === p.folderID as any)
79
78
  .first());
80
79
 
81
80
  if (!site) {
81
+ console.warn(`Site ${folderID} not found`);
82
82
  return null;
83
83
  }
84
84
 
package/src/wwwroot/routes/social-mail/site/draft-url/[siteID]/get.tsx CHANGED
@@ -8,6 +8,7 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
8
8
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
9
9
  import EncryptionService from "../../../../../../server/services/encryption/EncryptionService.js";
10
10
  import { globalEnv } from "../../../../../../common/globalEnv.js";
11
+ import { Base36 } from "../../../../../../common/Base36.js";
11
12
 
12
13
  @Prepare.authorize
13
14
  export default class extends Page {
@@ -40,7 +41,7 @@ export default class extends Page {
40
41
  path = "index.html";
41
42
  }
42
43
 
43
- const encoded = this.ecs.general.encrypt(`${site.folderID.toString(36)}-${time.msSinceEpoch.toString(36)}`, "hex");
44
+ const encoded = this.ecs.general.encrypt(`${Base36.encode(site.folderID)}-${time.msSinceEpoch.toString(36)}`, "hex");
44
45
  const host = `${globalEnv.serverID}-${encoded}`;
45
46
 
46
47
  return this.redirect(`https://${host}.sites.${globalEnv.wildcardDomain}/${path}`);