@puca/puca-core 12.1.4 → 12.1.5
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/core/services/email.service.js +16 -5
- package/dist/core/services/email.service.js.map +1 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +2 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js +20 -7
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -9,19 +9,28 @@ class ElasticMailService {
|
|
|
9
9
|
this.logger = new logger_1.Logger(ElasticMailService.name);
|
|
10
10
|
}
|
|
11
11
|
async startApiEmailService() {
|
|
12
|
-
const { elasticEmail:
|
|
13
|
-
if (!
|
|
12
|
+
const { elasticEmail: elasticEmailSecret } = await this.configService.getSecret();
|
|
13
|
+
if (!elasticEmailSecret) {
|
|
14
|
+
this.logger.warn('Elastic Email secret not found');
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
16
17
|
const config = new elasticemail_client_ts_axios_1.Configuration({
|
|
17
|
-
apiKey:
|
|
18
|
+
apiKey: elasticEmailSecret.apiKey
|
|
18
19
|
});
|
|
19
|
-
|
|
20
|
+
if (!elasticEmailSecret.defaultEmail.endsWith('@puca.app')) {
|
|
21
|
+
this.logger.warn('You should verify your domain on Elastic Email', 'https://app.elasticemail.com/api/settings/domains/domain-verification/verify/');
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
this.logger.warn('Using default email from Elastic Email', 'for better company identification you should use your own domain');
|
|
25
|
+
}
|
|
26
|
+
this.defaultEmail = elasticEmailSecret.defaultEmail;
|
|
20
27
|
this.apiEmail = new elasticemail_client_ts_axios_1.EmailsApi(config);
|
|
21
28
|
}
|
|
22
29
|
async sendEmail(args) {
|
|
30
|
+
var _a;
|
|
23
31
|
try {
|
|
24
32
|
if (!this.apiEmail) {
|
|
33
|
+
this.logger.warn('Trying to send email without starting the service');
|
|
25
34
|
return;
|
|
26
35
|
}
|
|
27
36
|
const recipient = args.recipient.trim();
|
|
@@ -43,10 +52,12 @@ class ElasticMailService {
|
|
|
43
52
|
Subject: args.subject
|
|
44
53
|
}
|
|
45
54
|
};
|
|
55
|
+
this.logger.debug('Sending email', () => args);
|
|
46
56
|
await this.apiEmail.emailsPost(emailMessageData);
|
|
57
|
+
this.logger.debug('Email sent');
|
|
47
58
|
}
|
|
48
59
|
catch (e) {
|
|
49
|
-
this.logger.error(e);
|
|
60
|
+
this.logger.error(((_a = e.response) === null || _a === void 0 ? void 0 : _a.data) || e);
|
|
50
61
|
}
|
|
51
62
|
}
|
|
52
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/core/services/email.service.ts"],"names":[],"mappings":";;;AACA,6FAAwG;AACxG,qCAAkC;AAelC,MAAa,kBAAkB;IAK7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAID,CAAC;IAE9D,KAAK,CAAC,oBAAoB;QACxB,MAAM,EAAE,YAAY,EAAG,
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../src/core/services/email.service.ts"],"names":[],"mappings":";;;AACA,6FAAwG;AACxG,qCAAkC;AAelC,MAAa,kBAAkB;IAK7B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAID,CAAC;IAE9D,KAAK,CAAC,oBAAoB;QACxB,MAAM,EAAE,YAAY,EAAG,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAEnF,IAAI,CAAC,kBAAkB,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACnD,OAAO;SACR;QAED,MAAM,MAAM,GAAG,IAAI,4CAAa,CAAC;YAC/B,MAAM,EAAE,kBAAkB,CAAC,MAAM;SAClC,CAAC,CAAC;QAEH,IAAG,CAAC,kBAAkB,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAEzD,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gDAAgD,EAChD,+EAA+E,CAChF,CAAC;SACH;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wCAAwC,EACxC,kEAAkE,CACnE,CAAC;SACH;QAED,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC,YAAY,CAAA;QACnD,IAAI,CAAC,QAAQ,GAAG,IAAI,wCAAS,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAc;;QAC5B,IAAI;YACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;gBACtE,OAAO;aACR;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAExC,MAAM,gBAAgB,GAAqB;gBACzC,UAAU,EAAE;oBACV;wBACE,KAAK,EAAE,SAAS;qBACjB;iBACF;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE;wBACJ;4BACE,WAAW,EAAE,MAAM;4BACnB,OAAO,EAAE,OAAO;4BAChB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;yBAC3B;qBACF;oBACD,IAAI,EAAE,IAAI,CAAC,YAAY;oBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB;aACF,CAAA;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAA;YAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAEjC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,IAAI,KAAI,CAAC,CAAC,CAAA;SACzC;IACH,CAAC;CACF;AAxED,gDAwEC"}
|
|
@@ -5,10 +5,11 @@ export declare class MultiTenantAdapter<T> {
|
|
|
5
5
|
private readonly onTearDown?;
|
|
6
6
|
private readonly opts?;
|
|
7
7
|
private readonly instances;
|
|
8
|
+
private readonly instancesByLegacyDomainName;
|
|
8
9
|
constructor(getNewInstance: (domain: string) => T, onSetup?: (domain: string, t: T, config: DomainConfig) => Promise<void>, onTearDown?: (domain: string, t: T, config: DomainConfig) => Promise<void>, opts?: {
|
|
9
10
|
priority?: number;
|
|
10
11
|
dependent?: string[];
|
|
11
12
|
className?: string;
|
|
12
13
|
});
|
|
13
|
-
get(
|
|
14
|
+
get(oDomain: string): T;
|
|
14
15
|
}
|
|
@@ -10,10 +10,15 @@ class MultiTenantAdapter {
|
|
|
10
10
|
this.onTearDown = onTearDown;
|
|
11
11
|
this.opts = opts;
|
|
12
12
|
this.instances = new Map();
|
|
13
|
+
this.instancesByLegacyDomainName = new Map();
|
|
13
14
|
puca_hub_service_1.pucaHubService.on('set-up', {
|
|
14
15
|
handleConstructor: (domain, config) => {
|
|
15
16
|
const instance = this.getNewInstance(domain);
|
|
16
17
|
this.instances.set(domain.toLowerCase(), instance);
|
|
18
|
+
const legacyDomainName = config.secret.legacyNamespace;
|
|
19
|
+
if (legacyDomainName) {
|
|
20
|
+
this.instancesByLegacyDomainName.set(legacyDomainName, instance);
|
|
21
|
+
}
|
|
17
22
|
const className = instance.constructor.name;
|
|
18
23
|
return className;
|
|
19
24
|
},
|
|
@@ -32,6 +37,10 @@ class MultiTenantAdapter {
|
|
|
32
37
|
const instance = this.instances.get(domain);
|
|
33
38
|
if (instance) {
|
|
34
39
|
this.instances.delete(domain);
|
|
40
|
+
const legacyDomainName = config.secret.legacyNamespace;
|
|
41
|
+
if (legacyDomainName) {
|
|
42
|
+
this.instancesByLegacyDomainName.delete(legacyDomainName);
|
|
43
|
+
}
|
|
35
44
|
if (this.onTearDown) {
|
|
36
45
|
await this.onTearDown(domain, instance, config);
|
|
37
46
|
}
|
|
@@ -39,16 +48,20 @@ class MultiTenantAdapter {
|
|
|
39
48
|
}
|
|
40
49
|
});
|
|
41
50
|
}
|
|
42
|
-
get(
|
|
43
|
-
if (!
|
|
51
|
+
get(oDomain) {
|
|
52
|
+
if (!oDomain) {
|
|
44
53
|
throw new Error('domain is required');
|
|
45
54
|
}
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
55
|
+
const domain = oDomain.toLowerCase();
|
|
56
|
+
let t = this.instances.get(domain);
|
|
57
|
+
if (t) {
|
|
58
|
+
return t;
|
|
59
|
+
}
|
|
60
|
+
const legacyInstance = this.instancesByLegacyDomainName.get(domain);
|
|
61
|
+
if (legacyInstance) {
|
|
62
|
+
return legacyInstance;
|
|
50
63
|
}
|
|
51
|
-
|
|
64
|
+
throw new Error(`tenant not found for domain ${domain}`);
|
|
52
65
|
}
|
|
53
66
|
}
|
|
54
67
|
exports.MultiTenantAdapter = MultiTenantAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAElE,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"multi-tentant.adapter.js","sourceRoot":"","sources":["../../../src/plugins/multi-tenant/multi-tentant.adapter.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAElE,MAAa,kBAAkB;IAI7B,YACmB,cAAqC,EACrC,OAAuE,EACvE,UAA0E,EAC1E,IAIhB;;QAPgB,mBAAc,GAAd,cAAc,CAAuB;QACrC,YAAO,GAAP,OAAO,CAAgE;QACvE,eAAU,GAAV,UAAU,CAAgE;QAC1E,SAAI,GAAJ,IAAI,CAIpB;QAXc,cAAS,GAAG,IAAI,GAAG,EAAa,CAAC;QACjC,gCAA2B,GAAG,IAAI,GAAG,EAAa,CAAC;QAYlE,iCAAc,CAAC,EAAE,CAAC,QAAQ,EAAE;YAC1B,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;gBAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAChB,MAAM,CAAC,WAAW,EAAE,EACpB,QAAQ,CACT,CAAC;gBAEF,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;gBACvD,IAAI,gBAAgB,EAAE;oBACpB,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;iBAClE;gBAED,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5C,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAClC,IAAI,IAAI,CAAC,OAAO,EAAE;oBAChB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;iBAC9C;YACH,CAAC;YAED,QAAQ,EAAE,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,KAAI,IAAI;YACrC,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,SAAS,KAAI,EAAE;YACrC,SAAS,EAAE,MAAA,IAAI,CAAC,IAAI,0CAAE,SAAS;SAChC,CAAC,CAAC;QAEH,iCAAc,CAAC,EAAE,CAAC,WAAW,EAAE;YAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC5C,IAAI,QAAQ,EAAE;oBACZ,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC9B,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;oBACvD,IAAI,gBAAgB,EAAE;wBACpB,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;qBAC3D;oBACD,IAAI,IAAI,CAAC,UAAU,EAAE;wBACnB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;qBACjD;iBACF;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAGD,GAAG,CAAC,OAAe;QACjB,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QAEpC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,EAAE;YACL,OAAO,CAAC,CAAC;SACV;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,cAAc,EAAE;YAClB,OAAO,cAAc,CAAC;SACvB;QAED,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;IAC3D,CAAC;CAEF;AA/ED,gDA+EC"}
|