@social-mail/social-mail-web-server 1.14.21 → 1.14.22
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/.tsbuildinfo +1 -1
- package/dist/common/ApexDomain.d.ts +7 -1
- package/dist/common/ApexDomain.d.ts.map +1 -1
- package/dist/common/ApexDomain.js +5 -5
- package/dist/common/ApexDomain.js.map +1 -1
- package/dist/server/model/events/WebSiteHostEvents.js +1 -1
- package/dist/server/model/events/WebSiteHostEvents.js.map +1 -1
- package/dist/server/services/cert/SocialSecureContextService.js +1 -1
- package/dist/server/services/cert/SocialSecureContextService.js.map +1 -1
- package/package.json +1 -1
- package/src/common/ApexDomain.ts +5 -5
- package/src/server/model/events/WebSiteHostEvents.ts +1 -1
- package/src/server/services/cert/SocialSecureContextService.ts +1 -1
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
export default class ApexDomain {
|
|
2
|
-
static getApexDomain(host: string, replace?: boolean):
|
|
2
|
+
static getApexDomain(host: string, replace?: boolean): {
|
|
3
|
+
domain: string;
|
|
4
|
+
subdomain?: undefined;
|
|
5
|
+
} | {
|
|
6
|
+
domain: string;
|
|
7
|
+
subdomain: string;
|
|
8
|
+
};
|
|
3
9
|
}
|
|
4
10
|
//# sourceMappingURL=ApexDomain.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApexDomain.d.ts","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAO
|
|
1
|
+
{"version":3,"file":"ApexDomain.d.ts","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAO;;;;;;;CAiBpD"}
|
|
@@ -4,17 +4,17 @@ export default class ApexDomain {
|
|
|
4
4
|
try {
|
|
5
5
|
host = host.toLocaleLowerCase();
|
|
6
6
|
if (/((^localhost)|(\.localhost))$/.test(host)) {
|
|
7
|
-
return host.split(".").slice(-2).join(".");
|
|
7
|
+
return { domain: host.split(".").slice(-2).join(".") };
|
|
8
8
|
}
|
|
9
9
|
if (/^\d+\.\d+\.\d+\.\d+$/.test(host)) {
|
|
10
|
-
return null;
|
|
10
|
+
return { domain: null };
|
|
11
11
|
}
|
|
12
|
-
const { domain } = parse(host);
|
|
13
|
-
return domain;
|
|
12
|
+
const { domain, subdomain } = parse(host);
|
|
13
|
+
return { domain, subdomain };
|
|
14
14
|
}
|
|
15
15
|
catch (error) {
|
|
16
16
|
console.error(`Failed to get apex domain for ${host}`);
|
|
17
|
-
return null;
|
|
17
|
+
return { domain: null };
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApexDomain.js","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,OAAO,GAAG,IAAI;QAC7C,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,IAAI,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ApexDomain.js","sourceRoot":"","sources":["../../src/common/ApexDomain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,MAAM,CAAC,OAAO,OAAO,UAAU;IAE3B,MAAM,CAAC,aAAa,CAAC,IAAY,EAAE,OAAO,GAAG,IAAI;QAC7C,IAAI,CAAC;YACD,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChC,IAAI,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3D,CAAC;YACD,IAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;YAC5B,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAI,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3C,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;YACvD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC5B,CAAC;IACL,CAAC;CAEJ"}
|
|
@@ -36,7 +36,7 @@ export class WebSiteHostEvents extends AuthenticatedEvents {
|
|
|
36
36
|
async afterInsert(entity, entry) {
|
|
37
37
|
const wc = ServiceProvider.resolve(this, AppWorkflowContext);
|
|
38
38
|
const eas = ServiceProvider.resolve(this, EmailAddressService);
|
|
39
|
-
const domain = ApexDomain.getApexDomain(entity.host);
|
|
39
|
+
const { domain } = ApexDomain.getApexDomain(entity.host);
|
|
40
40
|
const zoneID = await eas.getOrCreateDomain(domain);
|
|
41
41
|
await SyncDnsZoneRecordsWorkflow.enqueue(wc, zoneID);
|
|
42
42
|
const vs = ServiceProvider.resolve(this, WebSiteVersionService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSiteHostEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,0BAA0B,MAAM,mDAAmD,CAAC;AAE3F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,qBAAqB,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,MAAM,OAAO,iBAAkB,SAAQ,mBAAgC;IAEnE,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAE,CAAC,CAAC;IAChH,CAAC;IAED,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAE,CAAC,CAAC;IAClH,CAAC;IAED,YAAY,CAAC,MAAmB,EAAE,KAA+B;QAC7D,aAAa;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAmB,EAAE,KAA+B;QAClE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSiteHostEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAG7E,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,0BAA0B,MAAM,mDAAmD,CAAC;AAE3F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAC3D,OAAO,qBAAqB,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,MAAM,OAAO,iBAAkB,SAAQ,mBAAgC;IAEnE,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAE,CAAC,CAAC;IAChH,CAAC;IAED,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAE,CAAC,CAAC;IAClH,CAAC;IAED,YAAY,CAAC,MAAmB,EAAE,KAA+B;QAC7D,aAAa;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAmB,EAAE,KAA+B;QAClE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAE/D,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,0BAA0B,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,aAAa,CAAC,KAAgC,EAAE,IAAU,EAAE,GAAY;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
|
|
@@ -85,7 +85,7 @@ let SocialSecureContextService = class SocialSecureContextService extends Secure
|
|
|
85
85
|
try {
|
|
86
86
|
const scope = __addDisposableResource(env_1, ServiceProvider.createScope(this), false);
|
|
87
87
|
const db = scope.resolve(SocialMailContext);
|
|
88
|
-
const root = ApexDomain.getApexDomain(host);
|
|
88
|
+
const { domain: root } = ApexDomain.getApexDomain(host);
|
|
89
89
|
const wildCard = `*.${root}`;
|
|
90
90
|
const record = await db.hostedZoneRecords
|
|
91
91
|
.where({ wildCard, host }, (x, p) => x.hosted === true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocialSecureContextService.js","sourceRoot":"","sources":["../../../../src/server/services/cert/SocialSecureContextService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,oBAAoB,MAAM,8DAA8D,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAmB,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAGhC,IAAM,0BAA0B,GAAhC,MAAM,0BACjB,SAAQ,oBAAoB;IAK5B;QACI,KAAK,EAAE,CAAC;QAHZ,UAAK,GAA4C,IAAI,WAAW,CAAC,EAAE,GAAC,KAAK,CAAC,CAAC;QAIvE,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAC,IAAS;QAC5B,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE;YAC5D,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;SACvE,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC,EAAE,IAAI,EAAG,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAC,IAAY;;;YAC1B,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAEhD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,MAAM,IAAI,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SocialSecureContextService.js","sourceRoot":"","sources":["../../../../src/server/services/cert/SocialSecureContextService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,oBAAoB,MAAM,8DAA8D,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAmB,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,gBAAgB,MAAM,uCAAuC,CAAC;AACrE,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAGhC,IAAM,0BAA0B,GAAhC,MAAM,0BACjB,SAAQ,oBAAoB;IAK5B;QACI,KAAK,EAAE,CAAC;QAHZ,UAAK,GAA4C,IAAI,WAAW,CAAC,EAAE,GAAC,KAAK,CAAC,CAAC;QAIvE,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAC,IAAS;QAC5B,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE;YAC5D,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;SACvE,CAAC,CAAC;QACH,OAAO,mBAAmB,CAAC,EAAE,IAAI,EAAG,GAAG,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAC,IAAY;;;YAC1B,MAAM,KAAK,kCAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,QAAA,CAAC;YAEhD,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAE5C,MAAM,EAAE,MAAM,EAAC,IAAI,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE,CAAC;YAE7B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,iBAAiB;iBACpC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAChC,CAAC,CAAC,MAAM,KAAK,IAAI;mBACd,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;iBACnD,iBAAiB,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,QAAQ,CAAC;iBAChE,KAAK,EAAE,CAAC;YAEb,OAAO,MAAM,EAAE,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC;;;;;;;;;KACzC;IAEO,QAAQ;QACZ,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACtC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC3B,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;CAEJ,CAAA;AArCS;IADL,QAAQ,EAAE;;;;kEAOV;AAGK;IADL,QAAQ,EAAE;;;;6DAiBV;AArCgB,0BAA0B;IAD9C,iBAAiB;;GACG,0BAA0B,CAiD9C;eAjDoB,0BAA0B"}
|
package/package.json
CHANGED
package/src/common/ApexDomain.ts
CHANGED
|
@@ -6,16 +6,16 @@ export default class ApexDomain {
|
|
|
6
6
|
try {
|
|
7
7
|
host = host.toLocaleLowerCase();
|
|
8
8
|
if (/((^localhost)|(\.localhost))$/.test(host)) {
|
|
9
|
-
return host.split(".").slice(-2).join(".");
|
|
9
|
+
return { domain: host.split(".").slice(-2).join(".") };
|
|
10
10
|
}
|
|
11
11
|
if(/^\d+\.\d+\.\d+\.\d+$/.test(host)) {
|
|
12
|
-
return null;
|
|
12
|
+
return { domain: null };
|
|
13
13
|
}
|
|
14
|
-
const { domain } = parse(host);
|
|
15
|
-
return domain;
|
|
14
|
+
const { domain, subdomain } = parse(host);
|
|
15
|
+
return { domain, subdomain };
|
|
16
16
|
} catch (error) {
|
|
17
17
|
console.error(`Failed to get apex domain for ${host}`);
|
|
18
|
-
return null;
|
|
18
|
+
return { domain: null };
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
|
|
@@ -45,7 +45,7 @@ export class WebSiteHostEvents extends AuthenticatedEvents<WebSiteHost> {
|
|
|
45
45
|
const wc = ServiceProvider.resolve(this, AppWorkflowContext);
|
|
46
46
|
const eas = ServiceProvider.resolve(this, EmailAddressService);
|
|
47
47
|
|
|
48
|
-
const domain = ApexDomain.getApexDomain(entity.host);
|
|
48
|
+
const { domain } = ApexDomain.getApexDomain(entity.host);
|
|
49
49
|
|
|
50
50
|
const zoneID = await eas.getOrCreateDomain(domain);
|
|
51
51
|
|
|
@@ -34,7 +34,7 @@ export default class SocialSecureContextService
|
|
|
34
34
|
|
|
35
35
|
const db = scope.resolve(SocialMailContext);
|
|
36
36
|
|
|
37
|
-
const root = ApexDomain.getApexDomain(host);
|
|
37
|
+
const { domain:root } = ApexDomain.getApexDomain(host);
|
|
38
38
|
const wildCard = `*.${root}`;
|
|
39
39
|
|
|
40
40
|
const record = await db.hostedZoneRecords
|