@goatlab/node-backend 1.1.20 → 1.1.21
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/Cache.d.ts +1 -1
- package/dist/Cache.js +5 -5
- package/dist/Cache.js.map +1 -1
- package/dist/cache/KeyvLrus.js +1 -1
- package/dist/cache/LazyRedisStore.js +1 -1
- package/dist/cache/RedisConnectionPool.js +1 -1
- package/dist/container/Container.js +20 -20
- package/dist/container/Container.js.map +1 -1
- package/dist/container/DistributedCacheInvalidator.js +4 -4
- package/dist/container/examples/batch-operations.example.js +18 -18
- package/dist/container/examples/batch-operations.example.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js +23 -23
- package/dist/server/bootstraps/ExpressTrpcAppConfig.js.map +1 -1
- package/dist/server/bootstraps/getExpressTrpcApp.js +24 -24
- package/dist/server/bootstraps/getExpressTrpcApp.js.map +1 -1
- package/dist/server/consts.js +1 -1
- package/dist/server/context/request.context.js +5 -5
- package/dist/server/context/trpc.context.d.ts +1 -1
- package/dist/server/context/trpc.context.js +1 -1
- package/dist/server/context/trpc.context.js.map +1 -1
- package/dist/server/initOpenApiDocs.d.ts +1 -1
- package/dist/server/initOpenApiDocs.js +2 -2
- package/dist/server/initOpenApiDocs.js.map +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.d.ts +1 -1
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js +3 -3
- package/dist/server/middleware/cloudTaskDecrypt.middleware.js.map +1 -1
- package/dist/server/middleware/error.middleware.js +2 -2
- package/dist/server/middleware/handleRequest.middleware.js +3 -3
- package/dist/server/middleware/handleRequest.middleware.js.map +1 -1
- package/dist/server/middleware/logger/cloudRun.logger.d.ts +2 -2
- package/dist/server/middleware/logger/cloudRun.logger.js +12 -12
- package/dist/server/middleware/logger/cloudRun.logger.js.map +1 -1
- package/dist/server/middleware/logger/logger.service.js +2 -2
- package/dist/server/middleware/logs.middleware.js +6 -6
- package/dist/server/middleware/logs.middleware.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.example.js +7 -7
- package/dist/server/middleware/memoryMonitor.example.js.map +1 -1
- package/dist/server/middleware/memoryMonitor.middleware.js +2 -2
- package/dist/server/middleware/productionError.middleware.js +6 -6
- package/dist/server/middleware/security.middleware.js +11 -11
- package/dist/server/middleware/security.middleware.js.map +1 -1
- package/dist/server/middleware/trpcError.middleware.d.ts +1 -1
- package/dist/server/middleware/trpcError.middleware.js +2 -2
- package/dist/server/middleware/trpcError.middleware.js.map +1 -1
- package/dist/server/schemas/user.schema.js +3 -3
- package/dist/server/sentry/getSentry.d.ts +1 -1
- package/dist/server/sentry/getSentry.js +3 -3
- package/dist/server/sentry/getSentry.js.map +1 -1
- package/dist/server/sentry/sentry.service.js +10 -10
- package/dist/server/services/email/email.model.js +1 -1
- package/dist/server/services/email/email.service.d.ts +2 -2
- package/dist/server/services/email/email.service.js +14 -14
- package/dist/server/services/email/email.service.js.map +1 -1
- package/dist/server/services/secrets/examples/container-preload.example.js +16 -16
- package/dist/server/services/secrets/examples/container-preload.example.js.map +1 -1
- package/dist/server/services/secrets/index.d.ts +1 -1
- package/dist/server/services/secrets/secret.service.js +5 -5
- package/dist/server/services/sendgrid/sendgridApi.service.d.ts +1 -1
- package/dist/server/services/sendgrid/sendgridApi.service.js +16 -14
- package/dist/server/services/sendgrid/sendgridApi.service.js.map +1 -1
- package/dist/server/services/translations/translation.model.js +1 -1
- package/dist/server/services/util/benchmarker.js +3 -3
- package/dist/server/services/util/benchmarker.js.map +1 -1
- package/dist/server/services/util/pagination.d.ts +3 -3
- package/dist/server/services/util/pagination.js +4 -4
- package/dist/server/services/util/pagination.js.map +1 -1
- package/dist/server/services/util/url.service.d.ts +4 -4
- package/dist/server/services/util/url.service.js +7 -7
- package/dist/server/services/util/url.service.js.map +1 -1
- package/dist/server/test/express.mock.js +6 -6
- package/dist/server/test/firebase.mock.js +2 -2
- package/dist/server/test/trpc.mock.d.ts +1 -1
- package/dist/server/test/trpc.mock.js +1 -1
- package/dist/server/test/trpc.mock.js.map +1 -1
- package/dist/server/trpc.js +10 -10
- package/dist/server/zod-compat.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -13,7 +13,7 @@ class EmailService {
|
|
|
13
13
|
emailTransport;
|
|
14
14
|
emailArchive;
|
|
15
15
|
theme;
|
|
16
|
-
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme }) {
|
|
16
|
+
constructor({ fromName, shouldSendEmail, baseDomain, emailTransport, emailArchive, theme, }) {
|
|
17
17
|
this.shouldSendEmail = shouldSendEmail;
|
|
18
18
|
this.fromName = fromName;
|
|
19
19
|
if (baseDomain) {
|
|
@@ -30,18 +30,18 @@ class EmailService {
|
|
|
30
30
|
async compileTemplate(template) {
|
|
31
31
|
const innerContent = await (0, ejs_1.renderFile)(`${consts_1.config.templateDir}/${template.content}`, {
|
|
32
32
|
...template.placeholders,
|
|
33
|
-
theme: this.theme
|
|
33
|
+
theme: this.theme,
|
|
34
34
|
});
|
|
35
35
|
const html = await (0, ejs_1.renderFile)(`${consts_1.config.templateDir}/${template.layout}`, {
|
|
36
36
|
...template.placeholders,
|
|
37
37
|
theme: this.theme,
|
|
38
|
-
content: innerContent
|
|
38
|
+
content: innerContent,
|
|
39
39
|
});
|
|
40
40
|
return html;
|
|
41
41
|
}
|
|
42
42
|
compileMjml(mjml) {
|
|
43
43
|
const compiledMjMl = (0, mjml_1.default)(mjml, {
|
|
44
|
-
keepComments: false
|
|
44
|
+
keepComments: false,
|
|
45
45
|
});
|
|
46
46
|
if (compiledMjMl.errors.length) {
|
|
47
47
|
console.log(compiledMjMl.errors);
|
|
@@ -49,13 +49,13 @@ class EmailService {
|
|
|
49
49
|
}
|
|
50
50
|
return compiledMjMl.html;
|
|
51
51
|
}
|
|
52
|
-
async sendEmailFromTemplate({ template, to, subject, attachments, archive }) {
|
|
52
|
+
async sendEmailFromTemplate({ template, to, subject, attachments, archive, }) {
|
|
53
53
|
if (!this.shouldSendEmail) {
|
|
54
54
|
return {
|
|
55
55
|
isSuccess: true,
|
|
56
56
|
statusCode: 1,
|
|
57
57
|
body: 'Email not sent. No emails are sent in test mode',
|
|
58
|
-
headers: {}
|
|
58
|
+
headers: {},
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
const mjml = await this.compileTemplate(template);
|
|
@@ -63,7 +63,7 @@ class EmailService {
|
|
|
63
63
|
const bcc = [];
|
|
64
64
|
if (archive && this.emailArchive?.length) {
|
|
65
65
|
bcc.push({
|
|
66
|
-
email: this.emailArchive
|
|
66
|
+
email: this.emailArchive,
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
// This will not work if we are running in other environments (AWS/AZURE) check before using any other env
|
|
@@ -85,15 +85,15 @@ class EmailService {
|
|
|
85
85
|
isSuccess: false,
|
|
86
86
|
statusCode: 1,
|
|
87
87
|
body: 'Email not sent. TEST_EMAIL_ADDRESS env variable is missing',
|
|
88
|
-
headers: {}
|
|
88
|
+
headers: {},
|
|
89
89
|
};
|
|
90
90
|
}
|
|
91
91
|
const recipient = shouldSendEmailToRealUser
|
|
92
92
|
? {
|
|
93
|
-
email: to
|
|
93
|
+
email: to,
|
|
94
94
|
}
|
|
95
95
|
: {
|
|
96
|
-
email: process.env.TEST_EMAIL_ADDRESS || ''
|
|
96
|
+
email: process.env.TEST_EMAIL_ADDRESS || '',
|
|
97
97
|
};
|
|
98
98
|
if (!this.emailTransport) {
|
|
99
99
|
throw new Error('No email transport (Sendgrid) defined');
|
|
@@ -107,7 +107,7 @@ class EmailService {
|
|
|
107
107
|
recipients: [recipient],
|
|
108
108
|
attachments,
|
|
109
109
|
categories: template.categories,
|
|
110
|
-
bcc
|
|
110
|
+
bcc,
|
|
111
111
|
});
|
|
112
112
|
}
|
|
113
113
|
async sendEmailTemplateTest(email) {
|
|
@@ -128,10 +128,10 @@ class EmailService {
|
|
|
128
128
|
replyTo: `no_reply@${this.baseDomain}`,
|
|
129
129
|
recipients: [
|
|
130
130
|
{
|
|
131
|
-
email: `${username}@${this.baseDomain}
|
|
132
|
-
}
|
|
131
|
+
email: `${username}@${this.baseDomain}`,
|
|
132
|
+
},
|
|
133
133
|
],
|
|
134
|
-
categories: [email_model_1.EmailCategory.TEST_EMAIL]
|
|
134
|
+
categories: [email_model_1.EmailCategory.TEST_EMAIL],
|
|
135
135
|
});
|
|
136
136
|
}
|
|
137
137
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/server/services/email/email.service.ts"],"names":[],"mappings":";;;AAAA,gDAA2C;AAC3C,6BAAgC;AAChC,+BAA4B;AAC5B,yCAAqC;AAUrC,+CAA6C;AAE7C,MAAa,YAAY;IACf,eAAe,GAAY,IAAI,CAAA;IAC/B,UAAU,GAAW,cAAc,CAAA;IACnC,QAAQ,GAAW,EAAE,CAAA;IACrB,cAAc,CAA6B;IAC3C,YAAY,CAAoB;IAChC,KAAK,CAAmB;IAEhC,YAAY,EACV,QAAQ,EACR,eAAe,EACf,UAAU,EACV,cAAc,EACd,YAAY,EACZ,KAAK,
|
|
1
|
+
{"version":3,"file":"email.service.js","sourceRoot":"","sources":["../../../../src/server/services/email/email.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ const factories = {
|
|
|
33
33
|
async processData(_apiKey) {
|
|
34
34
|
return { processed: true };
|
|
35
35
|
}
|
|
36
|
-
}
|
|
36
|
+
},
|
|
37
37
|
};
|
|
38
38
|
// Create container with preloading pattern
|
|
39
39
|
const container = new Container_1.Container(factories, async (preload, meta) => {
|
|
@@ -42,7 +42,7 @@ const container = new Container_1.Container(factories, async (preload, meta) =>
|
|
|
42
42
|
provider: 'FILE', // or 'VAULT', 'ENV'
|
|
43
43
|
location: meta.secretsLocation,
|
|
44
44
|
encryptionKey: meta.encryptionKey,
|
|
45
|
-
vaultConfig: meta.vaultConfig
|
|
45
|
+
vaultConfig: meta.vaultConfig,
|
|
46
46
|
});
|
|
47
47
|
// Preload secrets before using them
|
|
48
48
|
await secretService.preload();
|
|
@@ -51,16 +51,16 @@ const container = new Container_1.Container(factories, async (preload, meta) =>
|
|
|
51
51
|
const jwtSecret = secretService.getSecretSync('JWT_SECRET');
|
|
52
52
|
// Create other services using the preloaded secrets
|
|
53
53
|
const database = preload.database(meta.tenantId, meta.tenantId, {
|
|
54
|
-
connectionString: dbConnectionString
|
|
54
|
+
connectionString: dbConnectionString,
|
|
55
55
|
});
|
|
56
56
|
const api = preload.api(meta.tenantId, meta.tenantId, {
|
|
57
57
|
database,
|
|
58
|
-
jwtSecret
|
|
58
|
+
jwtSecret,
|
|
59
59
|
});
|
|
60
60
|
return {
|
|
61
61
|
secrets: secretService,
|
|
62
62
|
database,
|
|
63
|
-
api
|
|
63
|
+
api,
|
|
64
64
|
};
|
|
65
65
|
});
|
|
66
66
|
// Usage example
|
|
@@ -80,7 +80,7 @@ async function _multiProviderExample() {
|
|
|
80
80
|
const _devTenant = {
|
|
81
81
|
tenantId: 'dev-tenant',
|
|
82
82
|
secretsLocation: '/secrets/dev.json',
|
|
83
|
-
encryptionKey: 'dev-encryption-key-32chars'
|
|
83
|
+
encryptionKey: 'dev-encryption-key-32chars',
|
|
84
84
|
};
|
|
85
85
|
// VAULT provider for production
|
|
86
86
|
const _prodTenant = {
|
|
@@ -89,14 +89,14 @@ async function _multiProviderExample() {
|
|
|
89
89
|
encryptionKey: 'prod-encryption-key-32chars',
|
|
90
90
|
vaultConfig: {
|
|
91
91
|
endpoint: 'https://vault.company.com',
|
|
92
|
-
token: process.env.VAULT_TOKEN
|
|
93
|
-
}
|
|
92
|
+
token: process.env.VAULT_TOKEN,
|
|
93
|
+
},
|
|
94
94
|
};
|
|
95
95
|
// ENV provider for CI/CD
|
|
96
96
|
const _ciTenant = {
|
|
97
97
|
tenantId: 'ci-tenant',
|
|
98
98
|
secretsLocation: 'CI', // Will look for CI_API_KEY, CI_DB_CONNECTION_STRING, etc.
|
|
99
|
-
encryptionKey: 'ci-encryption-key-32chars'
|
|
99
|
+
encryptionKey: 'ci-encryption-key-32chars',
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
// Example with automatic invalidation (FILE provider)
|
|
@@ -106,7 +106,7 @@ async function _fileWatchingExample() {
|
|
|
106
106
|
provider: 'FILE',
|
|
107
107
|
location: meta.secretsLocation,
|
|
108
108
|
encryptionKey: meta.encryptionKey,
|
|
109
|
-
cacheTTL: 60000 // 1 minute cache
|
|
109
|
+
cacheTTL: 60000, // 1 minute cache
|
|
110
110
|
});
|
|
111
111
|
// Enable automatic reload on file changes
|
|
112
112
|
await secretService.preload();
|
|
@@ -121,18 +121,18 @@ async function _batchTenantProcessing() {
|
|
|
121
121
|
{
|
|
122
122
|
tenantId: 'tenant1',
|
|
123
123
|
secretsLocation: '/secrets/tenant1.json',
|
|
124
|
-
encryptionKey: 'key1'
|
|
124
|
+
encryptionKey: 'key1',
|
|
125
125
|
},
|
|
126
126
|
{
|
|
127
127
|
tenantId: 'tenant2',
|
|
128
128
|
secretsLocation: '/secrets/tenant2.json',
|
|
129
|
-
encryptionKey: 'key2'
|
|
129
|
+
encryptionKey: 'key2',
|
|
130
130
|
},
|
|
131
131
|
{
|
|
132
132
|
tenantId: 'tenant3',
|
|
133
133
|
secretsLocation: '/secrets/tenant3.json',
|
|
134
|
-
encryptionKey: 'key3'
|
|
135
|
-
}
|
|
134
|
+
encryptionKey: 'key3',
|
|
135
|
+
},
|
|
136
136
|
];
|
|
137
137
|
const results = await container.bootstrapBatch(tenants.map(meta => ({
|
|
138
138
|
metadata: meta,
|
|
@@ -142,13 +142,13 @@ async function _batchTenantProcessing() {
|
|
|
142
142
|
const apiKey = secrets.getSecretSync('API_KEY');
|
|
143
143
|
// Process tenant data
|
|
144
144
|
return api.processData(apiKey);
|
|
145
|
-
}
|
|
145
|
+
},
|
|
146
146
|
})), {
|
|
147
147
|
concurrency: 5,
|
|
148
148
|
continueOnError: true,
|
|
149
149
|
onProgress: (completed, total) => {
|
|
150
150
|
console.log(`Processed ${completed}/${total} tenants`);
|
|
151
|
-
}
|
|
151
|
+
},
|
|
152
152
|
});
|
|
153
153
|
// Check results
|
|
154
154
|
for (const result of results) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-preload.example.js","sourceRoot":"","sources":["../../../../../src/server/services/secrets/examples/container-preload.example.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"container-preload.example.js","sourceRoot":"","sources":["../../../../../src/server/services/secrets/examples/container-preload.example.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { SecretProvider, SecretService, SecretServiceConfig, VaultConfig } from './secret.service';
|
|
1
|
+
export { SecretProvider, SecretService, SecretServiceConfig, VaultConfig, } from './secret.service';
|
|
@@ -327,7 +327,7 @@ class SecretService {
|
|
|
327
327
|
try {
|
|
328
328
|
const vaultUrl = `${this.vaultConfig.endpoint}/v1/${this.vaultConfig.mount || 'secret'}/data/${this.location}`;
|
|
329
329
|
const headers = {
|
|
330
|
-
'Content-Type': 'application/json'
|
|
330
|
+
'Content-Type': 'application/json',
|
|
331
331
|
};
|
|
332
332
|
// Add token authentication
|
|
333
333
|
if (this.vaultConfig.token) {
|
|
@@ -339,7 +339,7 @@ class SecretService {
|
|
|
339
339
|
}
|
|
340
340
|
const response = await (0, undici_1.fetch)(vaultUrl, {
|
|
341
341
|
method: 'GET',
|
|
342
|
-
headers
|
|
342
|
+
headers,
|
|
343
343
|
});
|
|
344
344
|
if (!response.ok) {
|
|
345
345
|
throw new Error(`Vault request failed: ${response.status} ${response.statusText}`);
|
|
@@ -376,7 +376,7 @@ class SecretService {
|
|
|
376
376
|
try {
|
|
377
377
|
const vaultUrl = `${this.vaultConfig.endpoint}/v1/${this.vaultConfig.mount || 'secret'}/data/${this.location}`;
|
|
378
378
|
const headers = {
|
|
379
|
-
'Content-Type': 'application/json'
|
|
379
|
+
'Content-Type': 'application/json',
|
|
380
380
|
};
|
|
381
381
|
// Add token authentication
|
|
382
382
|
if (this.vaultConfig.token) {
|
|
@@ -393,12 +393,12 @@ class SecretService {
|
|
|
393
393
|
}
|
|
394
394
|
// For Vault KV v2, data needs to be wrapped in a data object
|
|
395
395
|
const payload = {
|
|
396
|
-
data: dataToStore
|
|
396
|
+
data: dataToStore,
|
|
397
397
|
};
|
|
398
398
|
const response = await (0, undici_1.fetch)(vaultUrl, {
|
|
399
399
|
method: 'POST',
|
|
400
400
|
headers,
|
|
401
|
-
body: JSON.stringify(payload)
|
|
401
|
+
body: JSON.stringify(payload),
|
|
402
402
|
});
|
|
403
403
|
if (!response.ok) {
|
|
404
404
|
throw new Error(`Vault store request failed: ${response.status} ${response.statusText}`);
|
|
@@ -4,7 +4,7 @@ export declare class SendgridService {
|
|
|
4
4
|
sendgridApi: KyInstance | undefined;
|
|
5
5
|
shouldSendEmail: boolean;
|
|
6
6
|
fromEmail: string;
|
|
7
|
-
constructor({ token, shouldSendEmail, fromEmail }: {
|
|
7
|
+
constructor({ token, shouldSendEmail, fromEmail, }: {
|
|
8
8
|
token: string;
|
|
9
9
|
shouldSendEmail?: boolean;
|
|
10
10
|
fromEmail: string;
|
|
@@ -6,17 +6,17 @@ class SendgridService {
|
|
|
6
6
|
sendgridApi = undefined;
|
|
7
7
|
shouldSendEmail = true;
|
|
8
8
|
fromEmail = 'test@example.com';
|
|
9
|
-
constructor({ token, shouldSendEmail = true, fromEmail }) {
|
|
9
|
+
constructor({ token, shouldSendEmail = true, fromEmail, }) {
|
|
10
10
|
this.sendgridApi = js_utils_1.Http.getClient({
|
|
11
11
|
prefixUrl: 'https://api.sendgrid.com/v3/',
|
|
12
12
|
headers: {
|
|
13
|
-
Authorization: `Bearer ${token}
|
|
13
|
+
Authorization: `Bearer ${token}`,
|
|
14
14
|
},
|
|
15
15
|
retry: {
|
|
16
16
|
limit: 3,
|
|
17
17
|
// Sendgrid uses POST
|
|
18
|
-
methods: ['POST']
|
|
19
|
-
}
|
|
18
|
+
methods: ['POST'],
|
|
19
|
+
},
|
|
20
20
|
});
|
|
21
21
|
this.shouldSendEmail = shouldSendEmail;
|
|
22
22
|
this.fromEmail = fromEmail;
|
|
@@ -29,46 +29,48 @@ class SendgridService {
|
|
|
29
29
|
isSuccess: false,
|
|
30
30
|
statusCode: 1,
|
|
31
31
|
body: {},
|
|
32
|
-
headers: {}
|
|
32
|
+
headers: {},
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
const json = {
|
|
36
36
|
personalizations: [
|
|
37
37
|
{
|
|
38
38
|
to: request.recipients,
|
|
39
|
-
bcc: request.bcc?.length ? request.bcc : undefined
|
|
40
|
-
}
|
|
39
|
+
bcc: request.bcc?.length ? request.bcc : undefined,
|
|
40
|
+
},
|
|
41
41
|
],
|
|
42
42
|
subject: request.subject,
|
|
43
43
|
categories: request.categories,
|
|
44
44
|
content: [{ type: 'text/html', value: request.html }],
|
|
45
45
|
from: {
|
|
46
46
|
email: this.fromEmail,
|
|
47
|
-
name: request.fromName
|
|
47
|
+
name: request.fromName,
|
|
48
48
|
},
|
|
49
49
|
reply_to: { email: request.replyTo },
|
|
50
50
|
tracking_settings: {
|
|
51
51
|
click_tracking: {
|
|
52
52
|
enable: true,
|
|
53
|
-
enable_text: true
|
|
53
|
+
enable_text: true,
|
|
54
54
|
},
|
|
55
55
|
open_tracking: {
|
|
56
|
-
enable: true
|
|
57
|
-
}
|
|
56
|
+
enable: true,
|
|
57
|
+
},
|
|
58
58
|
},
|
|
59
|
-
attachments: request.attachments?.length
|
|
59
|
+
attachments: request.attachments?.length
|
|
60
|
+
? request.attachments
|
|
61
|
+
: undefined,
|
|
60
62
|
};
|
|
61
63
|
if (!this.sendgridApi) {
|
|
62
64
|
return {
|
|
63
65
|
isSuccess: false,
|
|
64
66
|
statusCode: 1,
|
|
65
67
|
body: {},
|
|
66
|
-
headers: {}
|
|
68
|
+
headers: {},
|
|
67
69
|
};
|
|
68
70
|
}
|
|
69
71
|
return await this.sendgridApi
|
|
70
72
|
.post('mail/send', {
|
|
71
|
-
json
|
|
73
|
+
json,
|
|
72
74
|
})
|
|
73
75
|
.json();
|
|
74
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendgridApi.service.js","sourceRoot":"","sources":["../../../../src/server/services/sendgrid/sendgridApi.service.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAOpD,MAAa,eAAe;IAC1B,WAAW,GAA2B,SAAS,CAAA;IAC/C,eAAe,GAAY,IAAI,CAAA;IAC/B,SAAS,GAAW,kBAAkB,CAAA;IAEtC,YAAY,EACV,KAAK,EACL,eAAe,GAAG,IAAI,EACtB,SAAS,
|
|
1
|
+
{"version":3,"file":"sendgridApi.service.js","sourceRoot":"","sources":["../../../../src/server/services/sendgrid/sendgridApi.service.ts"],"names":[],"mappings":";;;AAAA,gDAAoD;AAOpD,MAAa,eAAe;IAC1B,WAAW,GAA2B,SAAS,CAAA;IAC/C,eAAe,GAAY,IAAI,CAAA;IAC/B,SAAS,GAAW,kBAAkB,CAAA;IAEtC,YAAY,EACV,KAAK,EACL,eAAe,GAAG,IAAI,EACtB,SAAS,GAKV;QACC,IAAI,CAAC,WAAW,GAAG,eAAI,CAAC,SAAS,CAAC;YAChC,SAAS,EAAE,8BAA8B;YACzC,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,EAAE;aACjC;YACD,KAAK,EAAE;gBACL,KAAK,EAAE,CAAC;gBACR,qBAAqB;gBACrB,OAAO,EAAE,CAAC,MAAM,CAAC;aAClB;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC5B,CAAC;IAED,8DAA8D;IAC9D,KAAK,CAAC,kBAAkB,CACtB,OAAiC;QAEjC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAA;YACzD,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,CAAC;gBACb,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;aACZ,CAAA;QACH,CAAC;QAED,MAAM,IAAI,GAAa;YACrB,gBAAgB,EAAE;gBAChB;oBACE,EAAE,EAAE,OAAO,CAAC,UAAU;oBACtB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS;iBACnD;aACF;YACD,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;YACrD,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI,CAAC,SAAS;gBACrB,IAAI,EAAE,OAAO,CAAC,QAAQ;aACvB;YACD,QAAQ,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE;YACpC,iBAAiB,EAAE;gBACjB,cAAc,EAAE;oBACd,MAAM,EAAE,IAAI;oBACZ,WAAW,EAAE,IAAI;iBAClB;gBACD,aAAa,EAAE;oBACb,MAAM,EAAE,IAAI;iBACb;aACF;YACD,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,MAAM;gBACtC,CAAC,CAAC,OAAO,CAAC,WAAW;gBACrB,CAAC,CAAC,SAAS;SACd,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,OAAO;gBACL,SAAS,EAAE,KAAK;gBAChB,UAAU,EAAE,CAAC;gBACb,IAAI,EAAE,EAAE;gBACR,OAAO,EAAE,EAAE;aACZ,CAAA;QACH,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,WAAW;aAC1B,IAAI,CAAC,WAAW,EAAE;YACjB,IAAI;SACL,CAAC;aACD,IAAI,EAAyB,CAAA;IAClC,CAAC;CACF;AAxFD,0CAwFC"}
|
|
@@ -10,7 +10,7 @@ function analyzeBenchmarkResults(results) {
|
|
|
10
10
|
latencyMed: parseValue(r['Latency med (ns)']),
|
|
11
11
|
throughputAvg: parseValue(r['Throughput avg (ops/s)']),
|
|
12
12
|
throughputMed: parseValue(r['Throughput med (ops/s)']),
|
|
13
|
-
samples: r.Samples
|
|
13
|
+
samples: r.Samples,
|
|
14
14
|
}));
|
|
15
15
|
console.log({ parsedResults });
|
|
16
16
|
// Find the best performers
|
|
@@ -20,14 +20,14 @@ function analyzeBenchmarkResults(results) {
|
|
|
20
20
|
const analysis = parsedResults.map(r => ({
|
|
21
21
|
name: r.name,
|
|
22
22
|
latencyImprovement: ((bestLatency - r.latencyAvg) / bestLatency) * 100, // Lower is better
|
|
23
|
-
throughputImprovement: ((r.throughputAvg - bestThroughput) / bestThroughput) * 100 // Higher is better
|
|
23
|
+
throughputImprovement: ((r.throughputAvg - bestThroughput) / bestThroughput) * 100, // Higher is better
|
|
24
24
|
}));
|
|
25
25
|
// Sort results from best to worst (by latency)
|
|
26
26
|
const sortedAnalysis = analysis.sort((a, b) => b.latencyImprovement - a.latencyImprovement);
|
|
27
27
|
console.table(sortedAnalysis.map(({ name, latencyImprovement, throughputImprovement }) => ({
|
|
28
28
|
'Task Name': name,
|
|
29
29
|
'Latency Improvement (%)': latencyImprovement.toFixed(2),
|
|
30
|
-
'Throughput Improvement (%)': throughputImprovement.toFixed(2)
|
|
30
|
+
'Throughput Improvement (%)': throughputImprovement.toFixed(2),
|
|
31
31
|
})));
|
|
32
32
|
return sortedAnalysis;
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benchmarker.js","sourceRoot":"","sources":["../../../../src/server/services/util/benchmarker.ts"],"names":[],"mappings":";;AAUA,0DA4CC;AA5CD,SAAgB,uBAAuB,CAAC,OAA0B;IAChE,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1C,yBAAyB;IACzB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC;QACpB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC7C,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC7C,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACtD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAC,OAAO;KACnB,CAAC,CAAC,CAAA;IAEH,OAAO,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,CAAA;IAE9B,2BAA2B;IAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA,CAAC,kBAAkB;IACxF,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA,CAAC,mBAAmB;IAE/F,yBAAyB;IACzB,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,kBAAkB,EAAE,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,GAAG,GAAG,EAAE,kBAAkB;QAC1F,qBAAqB,EACnB,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,cAAc,CAAC,GAAG,cAAc,CAAC,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"benchmarker.js","sourceRoot":"","sources":["../../../../src/server/services/util/benchmarker.ts"],"names":[],"mappings":";;AAUA,0DA4CC;AA5CD,SAAgB,uBAAuB,CAAC,OAA0B;IAChE,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAC3C,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1C,yBAAyB;IACzB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC;QACpB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC7C,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;QAC7C,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACtD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC,CAAC,OAAO;KACnB,CAAC,CAAC,CAAA;IAEH,OAAO,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,CAAA;IAE9B,2BAA2B;IAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA,CAAC,kBAAkB;IACxF,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA,CAAC,mBAAmB;IAE/F,yBAAyB;IACzB,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,kBAAkB,EAAE,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,GAAG,GAAG,EAAE,kBAAkB;QAC1F,qBAAqB,EACnB,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,cAAc,CAAC,GAAG,cAAc,CAAC,GAAG,GAAG,EAAE,mBAAmB;KACnF,CAAC,CAAC,CAAA;IAEH,+CAA+C;IAC/C,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,GAAG,CAAC,CAAC,kBAAkB,CACtD,CAAA;IAED,OAAO,CAAC,KAAK,CACX,cAAc,CAAC,GAAG,CAChB,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAAC,CAAC;QACxD,WAAW,EAAE,IAAI;QACjB,yBAAyB,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,4BAA4B,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;KAC/D,CAAC,CACH,CACF,CAAA;IAED,OAAO,cAAc,CAAA;AACvB,CAAC"}
|
|
@@ -24,7 +24,7 @@ declare class PaginationUtility {
|
|
|
24
24
|
* @param perPage The number of items per page, defaults to 10 if not provided.
|
|
25
25
|
* @returns An object with the calculated page number and skip count.
|
|
26
26
|
*/
|
|
27
|
-
calculatePaginationCursor({ cursor, perPage }: {
|
|
27
|
+
calculatePaginationCursor({ cursor, perPage, }: {
|
|
28
28
|
cursor?: number | null;
|
|
29
29
|
perPage?: number | null;
|
|
30
30
|
}): {
|
|
@@ -39,8 +39,8 @@ declare class PaginationUtility {
|
|
|
39
39
|
* @param items The array of items to paginate.
|
|
40
40
|
* @returns The paginated result including metadata.
|
|
41
41
|
*/
|
|
42
|
-
paginate<T>({ cursor, perPage, total, items }: PaginationParams<T>): PaginationResult<T>;
|
|
43
|
-
getNextCursor<T extends ZodTypeAny>({ limit, items, schema }: {
|
|
42
|
+
paginate<T>({ cursor, perPage, total, items, }: PaginationParams<T>): PaginationResult<T>;
|
|
43
|
+
getNextCursor<T extends ZodTypeAny>({ limit, items, schema, }: {
|
|
44
44
|
limit: number;
|
|
45
45
|
items: any[];
|
|
46
46
|
schema: T;
|
|
@@ -11,7 +11,7 @@ class PaginationUtility {
|
|
|
11
11
|
* @param perPage The number of items per page, defaults to 10 if not provided.
|
|
12
12
|
* @returns An object with the calculated page number and skip count.
|
|
13
13
|
*/
|
|
14
|
-
calculatePaginationCursor({ cursor = 1, perPage = 10 }) {
|
|
14
|
+
calculatePaginationCursor({ cursor = 1, perPage = 10, }) {
|
|
15
15
|
const page = Math.max(1, cursor ?? 1);
|
|
16
16
|
const itemsPerPage = Math.max(1, perPage ?? 10);
|
|
17
17
|
const skip = (page - 1) * itemsPerPage;
|
|
@@ -25,7 +25,7 @@ class PaginationUtility {
|
|
|
25
25
|
* @param items The array of items to paginate.
|
|
26
26
|
* @returns The paginated result including metadata.
|
|
27
27
|
*/
|
|
28
|
-
paginate({ cursor = 1, perPage = 10, total, items }) {
|
|
28
|
+
paginate({ cursor = 1, perPage = 10, total, items, }) {
|
|
29
29
|
const page = Math.max(1, cursor ?? 1);
|
|
30
30
|
const itemsPerPage = Math.max(1, perPage || 10);
|
|
31
31
|
const lastPage = Math.ceil(total / itemsPerPage);
|
|
@@ -38,10 +38,10 @@ class PaginationUtility {
|
|
|
38
38
|
lastPage,
|
|
39
39
|
nextPage,
|
|
40
40
|
previousPage,
|
|
41
|
-
data: items
|
|
41
|
+
data: items,
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
getNextCursor({ limit, items, schema }) {
|
|
44
|
+
getNextCursor({ limit, items, schema, }) {
|
|
45
45
|
let nextCursor;
|
|
46
46
|
if (items.length > limit) {
|
|
47
47
|
const nextItem = items.pop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../src/server/services/util/pagination.ts"],"names":[],"mappings":";;;AAmBA;;GAEG;AACH,MAAM,iBAAiB;IACrB;;;;;OAKG;IACH,yBAAyB,CAAC,EACxB,MAAM,GAAG,CAAC,EACV,OAAO,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../../src/server/services/util/pagination.ts"],"names":[],"mappings":";;;AAmBA;;GAEG;AACH,MAAM,iBAAiB;IACrB;;;;;OAKG;IACH,yBAAyB,CAAC,EACxB,MAAM,GAAG,CAAC,EACV,OAAO,GAAG,EAAE,GAIb;QACC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAA;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAA;QAC/C,MAAM,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,YAAY,CAAA;QAEtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IACvB,CAAC;IAED;;;;;;;OAOG;IACH,QAAQ,CAAI,EACV,MAAM,GAAG,CAAC,EACV,OAAO,GAAG,EAAE,EACZ,KAAK,EACL,KAAK,GACe;QACpB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAA;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC,CAAA;QAChD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACvD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAEpD,OAAO;YACL,KAAK;YACL,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,IAAI;YACjB,QAAQ;YACR,QAAQ;YACR,YAAY;YACZ,IAAI,EAAE,KAAK;SACZ,CAAA;IACH,CAAC;IAED,aAAa,CAAuB,EAClC,KAAK,EACL,KAAK,EACL,MAAM,GAKP;QACC,IAAI,UAAkC,CAAA;QAEtC,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;YAE5B,IAAI,QAAQ,EAAE,CAAC;gBACb,gEAAgE;gBAChE,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAA;YAC9C,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;CACF;AAEY,QAAA,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
|
|
@@ -13,7 +13,7 @@ export declare class UrlService {
|
|
|
13
13
|
baseDomain: string;
|
|
14
14
|
backendApiBaseUrl: string;
|
|
15
15
|
environment: Environment;
|
|
16
|
-
constructor({ publicBucketName, privateBucketName, baseDomain, backendApiBaseUrl, environment }: {
|
|
16
|
+
constructor({ publicBucketName, privateBucketName, baseDomain, backendApiBaseUrl, environment, }: {
|
|
17
17
|
publicBucketName: string;
|
|
18
18
|
privateBucketName: string;
|
|
19
19
|
baseDomain: string;
|
|
@@ -29,9 +29,9 @@ export declare class UrlService {
|
|
|
29
29
|
* an HTTPS endpoint to upload assets to the Firebase Emulator
|
|
30
30
|
* @returns
|
|
31
31
|
*/
|
|
32
|
-
getLocalStorageHostUrl: ({ isMobile, useIP }: UrlServiceProps) => Promise<string>;
|
|
32
|
+
getLocalStorageHostUrl: ({ isMobile, useIP, }: UrlServiceProps) => Promise<string>;
|
|
33
33
|
getPublicStorageUrl: ({ isMobile, useIP }: UrlServiceProps) => Promise<string>;
|
|
34
|
-
getPrivateStorageUrl: ({ isMobile, useIP }: UrlServiceProps) => Promise<string>;
|
|
34
|
+
getPrivateStorageUrl: ({ isMobile, useIP, }: UrlServiceProps) => Promise<string>;
|
|
35
35
|
getFrontendUrl: () => string;
|
|
36
36
|
/**
|
|
37
37
|
* Decides where to send the user back after the payment has been completed
|
|
@@ -48,7 +48,7 @@ export declare class UrlService {
|
|
|
48
48
|
* @param origin
|
|
49
49
|
* @returns
|
|
50
50
|
*/
|
|
51
|
-
getBackendRedirectURLForTransBankPayments({ origin, orderId, storeId }: {
|
|
51
|
+
getBackendRedirectURLForTransBankPayments({ origin, orderId, storeId, }: {
|
|
52
52
|
origin?: string;
|
|
53
53
|
orderId?: string;
|
|
54
54
|
storeId?: string;
|
|
@@ -9,7 +9,7 @@ class UrlService {
|
|
|
9
9
|
baseDomain;
|
|
10
10
|
backendApiBaseUrl;
|
|
11
11
|
environment;
|
|
12
|
-
constructor({ publicBucketName, privateBucketName, baseDomain, backendApiBaseUrl, environment }) {
|
|
12
|
+
constructor({ publicBucketName, privateBucketName, baseDomain, backendApiBaseUrl, environment, }) {
|
|
13
13
|
this.publicBucketName = publicBucketName;
|
|
14
14
|
this.privateBucketName = privateBucketName;
|
|
15
15
|
this.baseDomain = baseDomain;
|
|
@@ -33,7 +33,7 @@ class UrlService {
|
|
|
33
33
|
* an HTTPS endpoint to upload assets to the Firebase Emulator
|
|
34
34
|
* @returns
|
|
35
35
|
*/
|
|
36
|
-
getLocalStorageHostUrl = async ({ isMobile, useIP }) => {
|
|
36
|
+
getLocalStorageHostUrl = async ({ isMobile, useIP, }) => {
|
|
37
37
|
if (isMobile || useIP) {
|
|
38
38
|
return `http://${localIpAddress}:9199`;
|
|
39
39
|
}
|
|
@@ -43,7 +43,7 @@ class UrlService {
|
|
|
43
43
|
if (this.environment === 'local') {
|
|
44
44
|
const storageServiceUrl = await this.getLocalStorageHostUrl({
|
|
45
45
|
isMobile,
|
|
46
|
-
useIP
|
|
46
|
+
useIP,
|
|
47
47
|
});
|
|
48
48
|
return `${storageServiceUrl}/${this.publicBucketName}`;
|
|
49
49
|
}
|
|
@@ -52,11 +52,11 @@ class UrlService {
|
|
|
52
52
|
}
|
|
53
53
|
return `https://assets-dev.${this.baseDomain}`;
|
|
54
54
|
};
|
|
55
|
-
getPrivateStorageUrl = async ({ isMobile, useIP }) => {
|
|
55
|
+
getPrivateStorageUrl = async ({ isMobile, useIP, }) => {
|
|
56
56
|
if (this.environment === 'local') {
|
|
57
57
|
const storageServiceUrl = await this.getLocalStorageHostUrl({
|
|
58
58
|
isMobile,
|
|
59
|
-
useIP
|
|
59
|
+
useIP,
|
|
60
60
|
});
|
|
61
61
|
return `${storageServiceUrl}/${this.privateBucketName}`;
|
|
62
62
|
}
|
|
@@ -100,10 +100,10 @@ class UrlService {
|
|
|
100
100
|
* @param origin
|
|
101
101
|
* @returns
|
|
102
102
|
*/
|
|
103
|
-
getBackendRedirectURLForTransBankPayments({ origin, orderId, storeId }) {
|
|
103
|
+
getBackendRedirectURLForTransBankPayments({ origin, orderId, storeId, }) {
|
|
104
104
|
const redirectUrl = this.getBackendUrl({
|
|
105
105
|
useIP: true,
|
|
106
|
-
preferPublicIp: true
|
|
106
|
+
preferPublicIp: true,
|
|
107
107
|
});
|
|
108
108
|
return `${redirectUrl}/payments/process?origin=${origin}&storeId=${storeId}&orderId=${orderId}`;
|
|
109
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.service.js","sourceRoot":"","sources":["../../../../src/server/services/util/url.service.ts"],"names":[],"mappings":";;;AAAA,oDAAyC;AAgBzC,MAAM,cAAc,GAAG,gBAAG,CAAC,iBAAiB,EAAE,CAAA;AAE9C,MAAa,UAAU;IACrB,gBAAgB,CAAQ;IACxB,iBAAiB,CAAQ;IACzB,UAAU,CAAQ;IAClB,iBAAiB,CAAQ;IACzB,WAAW,CAAa;IAExB,YAAY,EACV,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,WAAW,
|
|
1
|
+
{"version":3,"file":"url.service.js","sourceRoot":"","sources":["../../../../src/server/services/util/url.service.ts"],"names":[],"mappings":"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"}
|