From 9780566c85c24fd4a67d15aecd931b0c897dd52c Mon Sep 17 00:00:00 2001 From: T_DaMER Date: Fri, 20 Oct 2023 23:39:19 +0300 Subject: [PATCH 1/5] Invite code instead of signup code in ketl email --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5de9ec2..e28af3c 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@big-whale-labs/constants": "^0.2.15", - "@big-whale-labs/ketl-email": "^0.2.3", + "@big-whale-labs/ketl-email": "^0.2.4", "@big-whale-labs/seal-cred-email": "^1.1.2", "@hapi/boom": "^10.0.0", "@koa/cors": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 4ff73d0..4dfb025 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,9 +40,9 @@ __metadata: languageName: node linkType: hard -"@big-whale-labs/ketl-email@npm:^0.2.3": - version: 0.2.3 - resolution: "@big-whale-labs/ketl-email@npm:0.2.3" +"@big-whale-labs/ketl-email@npm:^0.2.4": + version: 0.2.4 + resolution: "@big-whale-labs/ketl-email@npm:0.2.4" dependencies: envalid: ^7.3.1 mjml: ^4.13.0 @@ -51,7 +51,7 @@ __metadata: react: ^18.2.0 react-dom: ^18.2.0 source-map-support: ^0.5.21 - checksum: 196b325d03958bda4cffc0d9c3d150997c280b2881ded31c33aebcc59b1b3a5d94ef5e727f90b557963bfc43a703a5a9ef89772f81cfc870d493e4719b99ccc8 + checksum: 39f3614120a99ca67a61cde0d9b7b571a1f2d8f8d7d37eaefd4c6a2918c3d6feafeb4b94f9ae74f6122444167d5deeb1c52124d65750ad81fd47a35e6958e898 languageName: node linkType: hard @@ -1740,7 +1740,7 @@ __metadata: dependencies: "@big-whale-labs/bwl-eslint-backend": ^1.0.3 "@big-whale-labs/constants": ^0.2.15 - "@big-whale-labs/ketl-email": ^0.2.3 + "@big-whale-labs/ketl-email": ^0.2.4 "@big-whale-labs/prettier-config": ^1.1.3 "@big-whale-labs/seal-cred-email": ^1.1.2 "@hapi/boom": ^10.0.0 From 4b822285ff1c7f7d5ea56ac2358b3d6b45ce92cb Mon Sep 17 00:00:00 2001 From: T_DaMER Date: Thu, 26 Oct 2023 17:34:47 +0300 Subject: [PATCH 2/5] move activate button to top in email --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e28af3c..02ccee7 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@big-whale-labs/constants": "^0.2.15", - "@big-whale-labs/ketl-email": "^0.2.4", + "@big-whale-labs/ketl-email": "^0.2.5", "@big-whale-labs/seal-cred-email": "^1.1.2", "@hapi/boom": "^10.0.0", "@koa/cors": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 4dfb025..024b0b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,9 +40,9 @@ __metadata: languageName: node linkType: hard -"@big-whale-labs/ketl-email@npm:^0.2.4": - version: 0.2.4 - resolution: "@big-whale-labs/ketl-email@npm:0.2.4" +"@big-whale-labs/ketl-email@npm:^0.2.5": + version: 0.2.5 + resolution: "@big-whale-labs/ketl-email@npm:0.2.5" dependencies: envalid: ^7.3.1 mjml: ^4.13.0 @@ -51,7 +51,7 @@ __metadata: react: ^18.2.0 react-dom: ^18.2.0 source-map-support: ^0.5.21 - checksum: 39f3614120a99ca67a61cde0d9b7b571a1f2d8f8d7d37eaefd4c6a2918c3d6feafeb4b94f9ae74f6122444167d5deeb1c52124d65750ad81fd47a35e6958e898 + checksum: cf5180a320d3f48c09129f5790607ed9d8c61171ae1a4b5b433e187804ec305e569b1fe49e10c8b1f3755ead4112316abd9b1d2cbb14d2aaad80fc415c78daea languageName: node linkType: hard @@ -1740,7 +1740,7 @@ __metadata: dependencies: "@big-whale-labs/bwl-eslint-backend": ^1.0.3 "@big-whale-labs/constants": ^0.2.15 - "@big-whale-labs/ketl-email": ^0.2.4 + "@big-whale-labs/ketl-email": ^0.2.5 "@big-whale-labs/prettier-config": ^1.1.3 "@big-whale-labs/seal-cred-email": ^1.1.2 "@hapi/boom": ^10.0.0 From 7b9756244c52c199d0c765870c14894fe11a4fa3 Mon Sep 17 00:00:00 2001 From: T_DaMER Date: Thu, 26 Oct 2023 22:22:14 +0300 Subject: [PATCH 3/5] use latest --- package.json | 2 +- src/helpers/sendEmail.ts | 4 ++-- yarn.lock | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 02ccee7..a5c040a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@big-whale-labs/constants": "^0.2.15", - "@big-whale-labs/ketl-email": "^0.2.5", + "@big-whale-labs/ketl-email": "^0.3.0", "@big-whale-labs/seal-cred-email": "^1.1.2", "@hapi/boom": "^10.0.0", "@koa/cors": "^4.0.0", diff --git a/src/helpers/sendEmail.ts b/src/helpers/sendEmail.ts index 0df9237..2b125ea 100644 --- a/src/helpers/sendEmail.ts +++ b/src/helpers/sendEmail.ts @@ -1,8 +1,8 @@ import * as mg from 'nodemailer-mailgun-transport' import { createTransport } from 'nodemailer' +import { inviteCode } from '@big-whale-labs/ketl-email' import { generateTokenHtml as scEmail } from '@big-whale-labs/seal-cred-email' import env from '@/helpers/env' -import ketlEmail from '@big-whale-labs/ketl-email' const user = env.SMTP_USER const pass = env.SMTP_PASS @@ -41,7 +41,7 @@ export default async function ({ }) { try { const { html } = forKetl - ? ketlEmail({ domain, secret }) + ? inviteCode({ domain, secret }) : scEmail({ domain, secret }) const from = forKetl ? 'Ketl' : 'SealCred' diff --git a/yarn.lock b/yarn.lock index 024b0b2..1666f4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,10 +40,11 @@ __metadata: languageName: node linkType: hard -"@big-whale-labs/ketl-email@npm:^0.2.5": - version: 0.2.5 - resolution: "@big-whale-labs/ketl-email@npm:0.2.5" +"@big-whale-labs/ketl-email@npm:^0.3.0": + version: 0.3.0 + resolution: "@big-whale-labs/ketl-email@npm:0.3.0" dependencies: + dotenv: ^16.3.1 envalid: ^7.3.1 mjml: ^4.13.0 mjml-react: ^2.0.8 @@ -51,7 +52,7 @@ __metadata: react: ^18.2.0 react-dom: ^18.2.0 source-map-support: ^0.5.21 - checksum: cf5180a320d3f48c09129f5790607ed9d8c61171ae1a4b5b433e187804ec305e569b1fe49e10c8b1f3755ead4112316abd9b1d2cbb14d2aaad80fc415c78daea + checksum: 05779c44a8b3b1d111f8001573a0f680de4b92075135bf71a4031b417bc42f13cd783cbb108d78ffceb28263b0283ce2d53b27be93d9297ba21beddc6e96eba4 languageName: node linkType: hard @@ -1740,7 +1741,7 @@ __metadata: dependencies: "@big-whale-labs/bwl-eslint-backend": ^1.0.3 "@big-whale-labs/constants": ^0.2.15 - "@big-whale-labs/ketl-email": ^0.2.5 + "@big-whale-labs/ketl-email": ^0.3.0 "@big-whale-labs/prettier-config": ^1.1.3 "@big-whale-labs/seal-cred-email": ^1.1.2 "@hapi/boom": ^10.0.0 @@ -2681,6 +2682,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^16.3.1": + version: 16.3.1 + resolution: "dotenv@npm:16.3.1" + checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd + languageName: node + linkType: hard + "duplexer@npm:~0.1.1": version: 0.1.2 resolution: "duplexer@npm:0.1.2" From bdb17745113101c3acc0a22279498ede8389be1e Mon Sep 17 00:00:00 2001 From: T_DaMER Date: Fri, 27 Oct 2023 20:38:46 +0300 Subject: [PATCH 4/5] upd --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index a5c040a..b0c0a9d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "@big-whale-labs/constants": "^0.2.15", - "@big-whale-labs/ketl-email": "^0.3.0", + "@big-whale-labs/ketl-email": "^0.3.1", "@big-whale-labs/seal-cred-email": "^1.1.2", "@hapi/boom": "^10.0.0", "@koa/cors": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 1666f4c..c5cb319 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,9 +40,9 @@ __metadata: languageName: node linkType: hard -"@big-whale-labs/ketl-email@npm:^0.3.0": - version: 0.3.0 - resolution: "@big-whale-labs/ketl-email@npm:0.3.0" +"@big-whale-labs/ketl-email@npm:^0.3.1": + version: 0.3.1 + resolution: "@big-whale-labs/ketl-email@npm:0.3.1" dependencies: dotenv: ^16.3.1 envalid: ^7.3.1 @@ -52,7 +52,7 @@ __metadata: react: ^18.2.0 react-dom: ^18.2.0 source-map-support: ^0.5.21 - checksum: 05779c44a8b3b1d111f8001573a0f680de4b92075135bf71a4031b417bc42f13cd783cbb108d78ffceb28263b0283ce2d53b27be93d9297ba21beddc6e96eba4 + checksum: 6b99f253a4c01c489497cf553b2a81e299a27c0dde9256d1c95e08cd8fb541847a06519ca048bb467cf5feed80b62ddf626eeea98d34dbf91da0c52d79c47240 languageName: node linkType: hard @@ -1741,7 +1741,7 @@ __metadata: dependencies: "@big-whale-labs/bwl-eslint-backend": ^1.0.3 "@big-whale-labs/constants": ^0.2.15 - "@big-whale-labs/ketl-email": ^0.3.0 + "@big-whale-labs/ketl-email": ^0.3.1 "@big-whale-labs/prettier-config": ^1.1.3 "@big-whale-labs/seal-cred-email": ^1.1.2 "@hapi/boom": ^10.0.0 From 6fa9c2ad5c74fb2b57b4e3ec99f66fb716b33849 Mon Sep 17 00:00:00 2001 From: T_DaMER Date: Fri, 27 Oct 2023 20:50:30 +0300 Subject: [PATCH 5/5] constants --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b0c0a9d..37e1572 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "docker-update-image": "docker build -t bigwhalelabs/attestor -f Dockerfile.backend.production . && docker push bigwhalelabs/attestor" }, "dependencies": { - "@big-whale-labs/constants": "^0.2.15", + "@big-whale-labs/constants": "^0.2.25", "@big-whale-labs/ketl-email": "^0.3.1", "@big-whale-labs/seal-cred-email": "^1.1.2", "@hapi/boom": "^10.0.0", diff --git a/yarn.lock b/yarn.lock index 5171421..9f173fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -33,7 +33,7 @@ __metadata: languageName: node linkType: hard -"@big-whale-labs/constants@npm:^0.2.15": +"@big-whale-labs/constants@npm:^0.2.25": version: 0.2.26 resolution: "@big-whale-labs/constants@npm:0.2.26" checksum: 78cf8ad50032104184f8483d58ad0223dff3b4ab431192f833ca5053f9bfccd3785a16c8a74d1f508839b8a6d019718c5af48bc0d9e2fd5e6907731bc6cfc815 @@ -1740,7 +1740,7 @@ __metadata: resolution: "attestor@workspace:." dependencies: "@big-whale-labs/bwl-eslint-backend": ^1.0.3 - "@big-whale-labs/constants": ^0.2.15 + "@big-whale-labs/constants": ^0.2.25 "@big-whale-labs/ketl-email": ^0.3.1 "@big-whale-labs/prettier-config": ^1.1.3 "@big-whale-labs/seal-cred-email": ^1.1.2