From 275279e7b9292035310ed9ea8f10baabf0f95f70 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 12 Mar 2023 03:37:18 +0100 Subject: [PATCH 01/27] use eslint-plugin-promise --- backend/.eslintrc.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index b33a3e480..e10be9228 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -5,7 +5,7 @@ module.exports = { node: true, }, parser: '@typescript-eslint/parser', - plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n'], + plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n', 'promise'], extends: [ 'standard', 'eslint:recommended', @@ -117,6 +117,21 @@ module.exports = { 'n/prefer-global/url-search-params': 'error', 'n/prefer-promises/dns': 'error', 'n/prefer-promises/fs': 'error', + // promise + 'promise/catch-or-return': 'error', + 'promise/no-return-wrap': 'error', + 'promise/param-names': 'error', + 'promise/always-return': 'error', + 'promise/no-native': 'off', + 'promise/no-nesting': 'warn', + 'promise/no-promise-in-callback': 'warn', + 'promise/no-callback-in-promise': 'warn', + 'promise/avoid-new': 'warn', + 'promise/no-new-statics': 'error', + 'promise/no-return-in-finally': 'warn', + 'promise/valid-params': 'warn', + 'promise/prefer-await-to-callbacks': 'error', + 'promise/no-multiple-resolved': 'error', }, overrides: [ // only for ts files From 6eaccacf00eff35bd989ca8b5596ae2c8587fe1d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 12 Mar 2023 03:59:39 +0100 Subject: [PATCH 02/27] refine prettier config --- backend/.prettierrc.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/.prettierrc.js b/backend/.prettierrc.js index bc1d767d7..8d38f2aac 100644 --- a/backend/.prettierrc.js +++ b/backend/.prettierrc.js @@ -1,9 +1,14 @@ module.exports = { - semi: false, printWidth: 100, - singleQuote: true, - trailingComma: "all", tabWidth: 2, + useTabs: false, + semi: false, + singleQuote: true, + quoteProps: "as-needed", + jsxSingleQuote: true, + trailingComma: "all", bracketSpacing: true, + bracketSameLine: false, + arrowParens: "always", endOfLine: "auto", }; From 5aaf9acd987c31b0abe5273fb46208552db0096b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 03/27] align workflow file naming --- .../{test-admin-interface.yml => test_admin_interface.yml} | 0 .github/workflows/{e2e-test.yml => test_e2e.yml} | 0 .github/workflows/{test-nginx.yml => test_nginx.yml} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test-admin-interface.yml => test_admin_interface.yml} (100%) rename .github/workflows/{e2e-test.yml => test_e2e.yml} (100%) rename .github/workflows/{test-nginx.yml => test_nginx.yml} (100%) diff --git a/.github/workflows/test-admin-interface.yml b/.github/workflows/test_admin_interface.yml similarity index 100% rename from .github/workflows/test-admin-interface.yml rename to .github/workflows/test_admin_interface.yml diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/test_e2e.yml similarity index 100% rename from .github/workflows/e2e-test.yml rename to .github/workflows/test_e2e.yml diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test_nginx.yml similarity index 100% rename from .github/workflows/test-nginx.yml rename to .github/workflows/test_nginx.yml From 2cacecdf9730656eac60ff8d5bec5857b5ff5dc4 Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 20:18:13 +0200 Subject: [PATCH 04/27] align workflow file naming --- .github/workflows/{test_dht-node.yml => test_dht_node.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test_dht-node.yml => test_dht_node.yml} (100%) diff --git a/.github/workflows/test_dht-node.yml b/.github/workflows/test_dht_node.yml similarity index 100% rename from .github/workflows/test_dht-node.yml rename to .github/workflows/test_dht_node.yml From d84b9872bd57c82fe6d843886fb6c9ad214f4bfd Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:04:58 +0200 Subject: [PATCH 05/27] use docker-compose file filter unambiguous and only where necessary - change docker-compose file filter name - use new file filter name in workflow files - remove unnecessary docker-compose filtering from build test jobs --- .github/file-filters.yml | 2 +- .github/workflows/test_dht_node.yml | 6 +++--- .github/workflows/test_federation.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 80b7482d9..6690cdb9d 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -33,7 +33,7 @@ admin: &admin dht_node: &dht_node - 'dht-node/**/*' -docker: &docker +docker-compose: &docker-compose - 'docker-compose.*' federation: &federation diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index a57f09399..9ee528da2 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest outputs: dht_node: ${{ steps.changes.outputs.dht_node }} - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - DHT Node - if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker == 'true' + if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fc29a1bf8..fb8a3f48b 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -9,7 +9,7 @@ jobs: name: Detect File Changes - Federation runs-on: ubuntu-latest outputs: - docker: ${{ steps.changes.outputs.docker }} + docker-compose: ${{ steps.changes.outputs.docker-compose }} federation: ${{ steps.changes.outputs.federation }} steps: - uses: actions/checkout@v3.3.0 @@ -27,7 +27,7 @@ jobs: ############################################################################## build: name: Docker Build Test - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.federation == 'true' needs: files-changed runs-on: ubuntu-latest steps: @@ -65,7 +65,7 @@ jobs: ############################################################################## unit_test: name: Unit Tests - Federation - if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.federation == 'true' + if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' needs: [files-changed, build] runs-on: ubuntu-latest steps: From ccf5156f986d6ab6a3b5125df657e86034767e2b Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 27 Mar 2023 21:18:52 +0200 Subject: [PATCH 06/27] remove block comments fron dht node and federation workflow files --- .github/workflows/test_dht_node.yml | 13 +------------ .github/workflows/test_federation.yml | 11 ----------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 9ee528da2..04c08e3bc 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -3,8 +3,6 @@ name: Gradido DHT Node Test CI on: push jobs: - # only (but most important) job from this workflow required for pull requests - # check results serve as run conditions for all other jobs here files-changed: name: Detect File Changes - DHT Node runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-dht-node-test path: /tmp/dht-node.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - DHT Node if: needs.files-changed.outputs.dht_node == 'true' @@ -60,10 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build] diff --git a/.github/workflows/test_federation.yml b/.github/workflows/test_federation.yml index fb8a3f48b..5fd714b00 100644 --- a/.github/workflows/test_federation.yml +++ b/.github/workflows/test_federation.yml @@ -3,8 +3,6 @@ name: Gradido Federation Test CI on: push jobs: - # only (but most important) job from this workflow required for pull requests - # check results serve as run conditions for all other jobs here files-changed: name: Detect File Changes - Federation runs-on: ubuntu-latest @@ -22,9 +20,6 @@ jobs: filters: .github/file-filters.yml list-files: shell - ############################################################################## - # JOB: DOCKER BUILD TEST ##################################################### - ############################################################################## build: name: Docker Build Test - Federation if: needs.files-changed.outputs.federation == 'true' @@ -45,9 +40,6 @@ jobs: name: docker-federation-test path: /tmp/federation.tar - ############################################################################## - # JOB: LINT ################################################################## - ############################################################################## lint: name: Lint - Federation if: needs.files-changed.outputs.federation == 'true' @@ -60,9 +52,6 @@ jobs: - name: Lint run: cd federation && yarn && yarn run lint - ############################################################################## - # JOB: UNIT TEST ############################################################# - ############################################################################## unit_test: name: Unit Tests - Federation if: needs.files-changed.outputs.docker-compose == 'true' || needs.files-changed.outputs.federation == 'true' From 80fa01f000dd50a8a6d2e21a2ae9fc747310abf4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:04:05 +0200 Subject: [PATCH 07/27] log stack trace included --- backend/src/server/LogError.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index b753d204e..1ee4585cd 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -4,6 +4,6 @@ export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - logger.error(msg, ...details) + logger.error(this.stack, ...details) } } From 30b7501a6e217605217050647e672e53b6fb9919 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:31:47 +0200 Subject: [PATCH 08/27] log stack trace --- backend/log4js-config.json | 14 +++++++------- backend/src/server/LogError.ts | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index e595e7c52..81b4c174b 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -8,7 +8,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -21,7 +21,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -34,7 +34,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -60,7 +60,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -77,7 +77,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" } }, "apolloOut": @@ -85,7 +85,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" } } }, diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index 1ee4585cd..8aa2d7d1a 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -1,9 +1,11 @@ +import { LockNotSupportedOnGivenDriverError } from '@dbTools/typeorm' import { backendLogger as logger } from './logger' export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - logger.error(this.stack, ...details) + // logger.setStack(this.stack) + logger.error(msg, ...details) } } From 550e35cb784ba31c48abaab0e255ae1500918003 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 4 Apr 2023 15:33:32 +0200 Subject: [PATCH 09/27] remove unused configs --- backend/src/server/LogError.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/server/LogError.ts b/backend/src/server/LogError.ts index 8aa2d7d1a..b753d204e 100644 --- a/backend/src/server/LogError.ts +++ b/backend/src/server/LogError.ts @@ -1,11 +1,9 @@ -import { LockNotSupportedOnGivenDriverError } from '@dbTools/typeorm' import { backendLogger as logger } from './logger' export default class LogError extends Error { // eslint-disable-next-line @typescript-eslint/no-explicit-any constructor(msg: string, ...details: any[]) { super(msg) - // logger.setStack(this.stack) logger.error(msg, ...details) } } From 417c7b2943564a70c722f1e75dd170bd131fa591 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:24:06 +0200 Subject: [PATCH 10/27] fix config, email_smtp_port is number --- backend/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 23ede1f27..a084f7b32 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -76,7 +76,7 @@ const email = { EMAIL_SENDER: process.env.EMAIL_SENDER || 'info@gradido.net', EMAIL_PASSWORD: process.env.EMAIL_PASSWORD || '', EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'mailserver', - EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '1025', + EMAIL_SMTP_PORT: Number(process.env.EMAIL_SMTP_PORT) || 1025, // eslint-disable-next-line no-unneeded-ternary EMAIL_TLS: process.env.EMAIL_TLS === 'false' ? false : true, EMAIL_LINK_VERIFICATION: From dd86e51121916ab76b9e97bff5ee5ccbe2c22981 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:24:25 +0200 Subject: [PATCH 11/27] email_smtp_port is number --- backend/src/emails/sendEmailTranslated.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index 85074344a..0dcee1469 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -10,7 +10,7 @@ import { sendEmailTranslated } from './sendEmailTranslated' CONFIG.EMAIL = false CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL' -CONFIG.EMAIL_SMTP_PORT = '1234' +CONFIG.EMAIL_SMTP_PORT = 1234 CONFIG.EMAIL_USERNAME = 'user' CONFIG.EMAIL_PASSWORD = 'pwd' CONFIG.EMAIL_TLS = true From c6369d1e0b46c2fe8c34faf76c1f4682fd41a633 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:24:51 +0200 Subject: [PATCH 12/27] dont wait for emails --- backend/src/emails/sendEmailTranslated.ts | 32 +++++++------------ .../resolver/ContributionMessageResolver.ts | 2 +- .../graphql/resolver/TransactionResolver.ts | 4 +-- backend/src/graphql/resolver/UserResolver.ts | 23 +++---------- 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 6d89cc257..f04fd377f 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -16,13 +16,16 @@ export const sendEmailTranslated = async (params: { } template: string locals: Record -}): Promise | null> => { - let resultSend: Record | null = null - +}): Promise => { // TODO: test the calling order of 'i18n.setLocale' for example: language of logging 'en', language of email receiver 'es', reset language of current user 'de' + if (!CONFIG.EMAIL) { + logger.info(`Emails are disabled via config...`) + return null + } + // because language of receiver can differ from language of current user who triggers the sending - const rememberLocaleToRestore = i18n.getLocale() + // const rememberLocaleToRestore = i18n.getLocale() i18n.setLocale('en') // for logging logger.info( @@ -31,10 +34,6 @@ export const sendEmailTranslated = async (params: { `, subject=${i18n.__('emails.' + params.template + '.subject')}`, ) - if (!CONFIG.EMAIL) { - logger.info(`Emails are disabled via config...`) - return null - } if (CONFIG.EMAIL_TEST_MODUS) { logger.info( `Testmodus=ON: change receiver from ${params.receiver.to} to ${CONFIG.EMAIL_TEST_RECEIVER}`, @@ -43,7 +42,7 @@ export const sendEmailTranslated = async (params: { } const transport = createTransport({ host: CONFIG.EMAIL_SMTP_URL, - port: Number(CONFIG.EMAIL_SMTP_PORT), + port: CONFIG.EMAIL_SMTP_PORT, secure: false, // true for 465, false for other ports requireTLS: CONFIG.EMAIL_TLS, auth: { @@ -64,23 +63,16 @@ export const sendEmailTranslated = async (params: { // i18n, // is only needed if you don't install i18n }) - // ATTENTION: await is needed, because otherwise on send the email gets send in the language of the current user, because below the language gets reset - await email + void email .send({ template: path.join(__dirname, 'templates', params.template), message: params.receiver, locals: params.locals, // the 'locale' in here seems not to be used by 'email-template', because it doesn't work if the language isn't set before by 'i18n.setLocale' }) - .then((result: Record) => { - resultSend = result - logger.info('Send email successfully !!!') - logger.info('Result: ', result) - }) .catch((error: unknown) => { - throw new LogError('Error sending notification email', error) + new LogError('Error sending notification email', error) + return false; }) - i18n.setLocale(rememberLocaleToRestore) - - return resultSend + return true; } diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index e0b4e7b96..a59023036 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -146,7 +146,7 @@ export class ContributionMessageResolver { await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution) } - await sendAddedContributionMessageEmail({ + void sendAddedContributionMessageEmail({ firstName: contribution.user.firstName, lastName: contribution.user.lastName, email: contribution.user.emailContact.email, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 4c8ab0061..0d7d7abf5 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -149,7 +149,7 @@ export const executeTransaction = async ( } finally { await queryRunner.release() } - await sendTransactionReceivedEmail({ + void sendTransactionReceivedEmail({ firstName: recipient.firstName, lastName: recipient.lastName, email: recipient.emailContact.email, @@ -160,7 +160,7 @@ export const executeTransaction = async ( transactionAmount: amount, }) if (transactionLink) { - await sendTransactionLinkRedeemedEmail({ + void sendTransactionLinkRedeemedEmail({ firstName: sender.firstName, lastName: sender.lastName, email: sender.emailContact.email, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index d6b1f22bc..d4aa6c8b3 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -245,7 +245,7 @@ export class UserResolver { user.publisherId = publisherId logger.debug('partly faked user', user) - const emailSent = await sendAccountMultiRegistrationEmail({ + void sendAccountMultiRegistrationEmail({ firstName: foundUser.firstName, // this is the real name of the email owner, but just "firstName" would be the name of the new registrant which shall not be passed to the outside lastName: foundUser.lastName, // this is the real name of the email owner, but just "lastName" would be the name of the new registrant which shall not be passed to the outside email, @@ -258,9 +258,6 @@ export class UserResolver { ) /* uncomment this, when you need the activation link on the console */ // In case EMails are disabled log the activation link for the user - if (!emailSent) { - logger.debug(`Email not send!`) - } logger.info('createUser() faked and send multi registration mail...') return user @@ -325,8 +322,7 @@ export class UserResolver { emailContact.emailVerificationCode.toString(), ).replace(/{code}/g, redeemCode ? '/' + redeemCode : '') - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const emailSent = await sendAccountActivationEmail({ + void sendAccountActivationEmail({ firstName, lastName, email, @@ -338,10 +334,6 @@ export class UserResolver { await EVENT_EMAIL_CONFIRMATION(dbUser) - if (!emailSent) { - logger.debug(`Account confirmation link: ${activationLink}`) - } - await queryRunner.commitTransaction() logger.addContext('user', dbUser.id) } catch (e) { @@ -392,8 +384,8 @@ export class UserResolver { }) logger.info(`optInCode for ${email}=${user.emailContact}`) - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const emailSent = await sendResetPasswordEmail({ + + void sendResetPasswordEmail({ firstName: user.firstName, lastName: user.lastName, email, @@ -402,13 +394,6 @@ export class UserResolver { timeDurationObject: getTimeDurationObject(CONFIG.EMAIL_CODE_VALID_TIME), }) - /* uncomment this, when you need the activation link on the console */ - // In case EMails are disabled log the activation link for the user - if (!emailSent) { - logger.debug( - `Reset password link: ${activationLink(user.emailContact.emailVerificationCode)}`, - ) - } logger.info(`forgotPassword(${email}) successful...`) await EVENT_EMAIL_FORGOT_PASSWORD(user) From 136f282e6c867bcf3b1710c92ab216b72015de50 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:44:41 +0200 Subject: [PATCH 13/27] properly destructure params in sendEMailTranslated --- .../src/emails/sendEmailTranslated.test.ts | 14 ++++---- backend/src/emails/sendEmailTranslated.ts | 34 ++++++++++--------- backend/src/graphql/resolver/UserResolver.ts | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index 0dcee1469..ceb66ddc9 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -31,11 +31,11 @@ jest.mock('nodemailer', () => { }) describe('sendEmailTranslated', () => { - let result: Record | null + let result: boolean | null describe('config email is false', () => { - beforeEach(async () => { - result = await sendEmailTranslated({ + beforeEach(() => { + result = sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -57,9 +57,9 @@ describe('sendEmailTranslated', () => { }) describe('config email is true', () => { - beforeEach(async () => { + beforeEach(() => { CONFIG.EMAIL = true - result = await sendEmailTranslated({ + result = sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -117,11 +117,11 @@ describe('sendEmailTranslated', () => { }) describe('with email EMAIL_TEST_MODUS true', () => { - beforeEach(async () => { + beforeEach(() => { jest.clearAllMocks() CONFIG.EMAIL = true CONFIG.EMAIL_TEST_MODUS = true - result = await sendEmailTranslated({ + result = sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index f04fd377f..61554c025 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/restrict-template-expressions */ import path from 'path' import Email from 'email-templates' @@ -6,17 +5,20 @@ import i18n from 'i18n' import { createTransport } from 'nodemailer' import CONFIG from '@/config' -import LogError from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' -export const sendEmailTranslated = async (params: { +export const sendEmailTranslated = ({ + receiver, + template, + locals, +}: { receiver: { to: string cc?: string } template: string locals: Record -}): Promise => { +}): boolean | null => { // TODO: test the calling order of 'i18n.setLocale' for example: language of logging 'en', language of email receiver 'es', reset language of current user 'de' if (!CONFIG.EMAIL) { @@ -29,16 +31,16 @@ export const sendEmailTranslated = async (params: { i18n.setLocale('en') // for logging logger.info( - `send Email: language=${params.locals.locale} to=${params.receiver.to}` + - (params.receiver.cc ? `, cc=${params.receiver.cc}` : '') + - `, subject=${i18n.__('emails.' + params.template + '.subject')}`, + `send Email: language=${locals.locale as string} to=${receiver.to}` + + (receiver.cc ? `, cc=${receiver.cc}` : '') + + `, subject=${i18n.__('emails.' + template + '.subject')}`, ) if (CONFIG.EMAIL_TEST_MODUS) { logger.info( - `Testmodus=ON: change receiver from ${params.receiver.to} to ${CONFIG.EMAIL_TEST_RECEIVER}`, + `Testmodus=ON: change receiver from ${receiver.to} to ${CONFIG.EMAIL_TEST_RECEIVER}`, ) - params.receiver.to = CONFIG.EMAIL_TEST_RECEIVER + receiver.to = CONFIG.EMAIL_TEST_RECEIVER } const transport = createTransport({ host: CONFIG.EMAIL_SMTP_URL, @@ -51,7 +53,7 @@ export const sendEmailTranslated = async (params: { }, }) - i18n.setLocale(params.locals.locale as string) // for email + i18n.setLocale(locals.locale as string) // for email // TESTING: see 'README.md' const email = new Email({ @@ -65,14 +67,14 @@ export const sendEmailTranslated = async (params: { void email .send({ - template: path.join(__dirname, 'templates', params.template), - message: params.receiver, - locals: params.locals, // the 'locale' in here seems not to be used by 'email-template', because it doesn't work if the language isn't set before by 'i18n.setLocale' + template: path.join(__dirname, 'templates', template), + message: receiver, + locals, // the 'locale' in here seems not to be used by 'email-template', because it doesn't work if the language isn't set before by 'i18n.setLocale' }) .catch((error: unknown) => { - new LogError('Error sending notification email', error) - return false; + logger.error('Error sending notification email', error) + return false }) - return true; + return true } diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index d4aa6c8b3..ba230e6c7 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -384,7 +384,7 @@ export class UserResolver { }) logger.info(`optInCode for ${email}=${user.emailContact}`) - + void sendResetPasswordEmail({ firstName: user.firstName, lastName: user.lastName, From 2488fe7b68a03ae917b36feaea90969cf03d91e4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:47:55 +0200 Subject: [PATCH 14/27] corrected email varriant response type --- backend/src/emails/sendEmailVariants.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index b45e7fc67..faf1ba2e0 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -13,7 +13,7 @@ export const sendAddedContributionMessageEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>`, @@ -40,7 +40,7 @@ export const sendAccountActivationEmail = (data: { language: string activationLink: string timeDurationObject: Record -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'accountActivation', @@ -62,7 +62,7 @@ export const sendAccountMultiRegistrationEmail = (data: { lastName: string email: string language: string -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'accountMultiRegistration', @@ -86,7 +86,7 @@ export const sendContributionConfirmedEmail = (data: { senderLastName: string contributionMemo: string contributionAmount: Decimal -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionConfirmed', @@ -113,7 +113,7 @@ export const sendContributionDeletedEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionDeleted', @@ -139,7 +139,7 @@ export const sendContributionDeniedEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionDenied', @@ -164,7 +164,7 @@ export const sendResetPasswordEmail = (data: { language: string resetLink: string timeDurationObject: Record -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'resetPassword', @@ -191,7 +191,7 @@ export const sendTransactionLinkRedeemedEmail = (data: { senderEmail: string transactionMemo: string transactionAmount: Decimal -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'transactionLinkRedeemed', @@ -220,7 +220,7 @@ export const sendTransactionReceivedEmail = (data: { senderLastName: string senderEmail: string transactionAmount: Decimal -}): Promise | null> => { +}): boolean | null => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'transactionReceived', From bbe1167b97fd269073a712419bfba5cf2be3c32d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 02:53:25 +0200 Subject: [PATCH 15/27] emails are not awaitable anymore --- backend/src/emails/sendEmailVariants.test.ts | 36 +++++++++---------- .../resolver/ContributionMessageResolver.ts | 2 +- .../graphql/resolver/ContributionResolver.ts | 6 ++-- .../graphql/resolver/TransactionResolver.ts | 4 +-- backend/src/graphql/resolver/UserResolver.ts | 12 +++---- 5 files changed, 28 insertions(+), 32 deletions(-) diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 44d996fa8..e1f3e7cca 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -50,8 +50,8 @@ describe('sendEmailVariants', () => { let result: any describe('sendAddedContributionMessageEmail', () => { - beforeAll(async () => { - result = await sendAddedContributionMessageEmail({ + beforeAll(() => { + result = sendAddedContributionMessageEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -128,8 +128,8 @@ describe('sendEmailVariants', () => { }) describe('sendAccountActivationEmail', () => { - beforeAll(async () => { - result = await sendAccountActivationEmail({ + beforeAll(() => { + result = sendAccountActivationEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -208,8 +208,8 @@ describe('sendEmailVariants', () => { }) describe('sendAccountMultiRegistrationEmail', () => { - beforeAll(async () => { - result = await sendAccountMultiRegistrationEmail({ + beforeAll(() => { + result = sendAccountMultiRegistrationEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -288,8 +288,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionConfirmedEmail', () => { - beforeAll(async () => { - result = await sendContributionConfirmedEmail({ + beforeAll(() => { + result = sendContributionConfirmedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -368,8 +368,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionDeniedEmail', () => { - beforeAll(async () => { - result = await sendContributionDeniedEmail({ + beforeAll(() => { + result = sendContributionDeniedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -446,8 +446,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionDeletedEmail', () => { - beforeAll(async () => { - result = await sendContributionDeletedEmail({ + beforeAll(() => { + result = sendContributionDeletedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -524,8 +524,8 @@ describe('sendEmailVariants', () => { }) describe('sendResetPasswordEmail', () => { - beforeAll(async () => { - result = await sendResetPasswordEmail({ + beforeAll(() => { + result = sendResetPasswordEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -602,8 +602,8 @@ describe('sendEmailVariants', () => { }) describe('sendTransactionLinkRedeemedEmail', () => { - beforeAll(async () => { - result = await sendTransactionLinkRedeemedEmail({ + beforeAll(() => { + result = sendTransactionLinkRedeemedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -683,8 +683,8 @@ describe('sendEmailVariants', () => { }) describe('sendTransactionReceivedEmail', () => { - beforeAll(async () => { - result = await sendTransactionReceivedEmail({ + beforeAll(() => { + result = sendTransactionReceivedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index a59023036..02e019ea0 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -146,7 +146,7 @@ export class ContributionMessageResolver { await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution) } - void sendAddedContributionMessageEmail({ + sendAddedContributionMessageEmail({ firstName: contribution.user.firstName, lastName: contribution.user.lastName, email: contribution.user.emailContact.email, diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 5969eaef2..1efe9fafa 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -424,7 +424,7 @@ export class ContributionResolver { contribution.amount, ) - void sendContributionDeletedEmail({ + sendContributionDeletedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, @@ -518,7 +518,7 @@ export class ContributionResolver { await queryRunner.commitTransaction() logger.info('creation commited successfuly.') - void sendContributionConfirmedEmail({ + sendContributionConfirmedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, @@ -599,7 +599,7 @@ export class ContributionResolver { contributionToUpdate.amount, ) - void sendContributionDeniedEmail({ + sendContributionDeniedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 0d7d7abf5..a95294f76 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -149,7 +149,7 @@ export const executeTransaction = async ( } finally { await queryRunner.release() } - void sendTransactionReceivedEmail({ + sendTransactionReceivedEmail({ firstName: recipient.firstName, lastName: recipient.lastName, email: recipient.emailContact.email, @@ -160,7 +160,7 @@ export const executeTransaction = async ( transactionAmount: amount, }) if (transactionLink) { - void sendTransactionLinkRedeemedEmail({ + sendTransactionLinkRedeemedEmail({ firstName: sender.firstName, lastName: sender.lastName, email: sender.emailContact.email, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index ba230e6c7..45059a4a7 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -245,7 +245,7 @@ export class UserResolver { user.publisherId = publisherId logger.debug('partly faked user', user) - void sendAccountMultiRegistrationEmail({ + sendAccountMultiRegistrationEmail({ firstName: foundUser.firstName, // this is the real name of the email owner, but just "firstName" would be the name of the new registrant which shall not be passed to the outside lastName: foundUser.lastName, // this is the real name of the email owner, but just "lastName" would be the name of the new registrant which shall not be passed to the outside email, @@ -322,7 +322,7 @@ export class UserResolver { emailContact.emailVerificationCode.toString(), ).replace(/{code}/g, redeemCode ? '/' + redeemCode : '') - void sendAccountActivationEmail({ + sendAccountActivationEmail({ firstName, lastName, email, @@ -385,7 +385,7 @@ export class UserResolver { logger.info(`optInCode for ${email}=${user.emailContact}`) - void sendResetPasswordEmail({ + sendResetPasswordEmail({ firstName: user.firstName, lastName: user.lastName, email, @@ -789,7 +789,7 @@ export class UserResolver { await user.emailContact.save() // eslint-disable-next-line @typescript-eslint/no-unused-vars - const emailSent = await sendAccountActivationEmail({ + sendAccountActivationEmail({ firstName: user.firstName, lastName: user.lastName, email, @@ -798,10 +798,6 @@ export class UserResolver { timeDurationObject: getTimeDurationObject(CONFIG.EMAIL_CODE_VALID_TIME), }) - // In case EMails are disabled log the activation link for the user - if (!emailSent) { - logger.info(`Account confirmation link: ${activationLink}`) - } await EVENT_EMAIL_ADMIN_CONFIRMATION(user, getUser(context)) return true From 493c5befeb228033f9fce3557736254215930a24 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 03:14:16 +0200 Subject: [PATCH 16/27] skip all broken tests --- backend/src/emails/sendEmailTranslated.test.ts | 4 ++-- backend/src/emails/sendEmailVariants.test.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index ceb66ddc9..fb4ceb734 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -85,7 +85,7 @@ describe('sendEmailTranslated', () => { }) describe('call of "sendEmailTranslated"', () => { - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -133,7 +133,7 @@ describe('sendEmailTranslated', () => { }) }) - it('call of "sendEmailTranslated" with faked "to"', () => { + it.skip('call of "sendEmailTranslated" with faked "to"', () => { expect(result).toMatchObject({ envelope: { from: CONFIG.EMAIL_SENDER, diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index e1f3e7cca..da777b7b8 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -83,7 +83,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -159,7 +159,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -235,7 +235,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -401,7 +401,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -479,7 +479,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -555,7 +555,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -639,7 +639,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -718,7 +718,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', From a7add429f8d126fcaadff92dcdf220e0175a6d81 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 5 Apr 2023 03:41:54 +0200 Subject: [PATCH 17/27] missing skip test --- backend/src/emails/sendEmailVariants.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index da777b7b8..fe8ed8c3a 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -323,7 +323,7 @@ describe('sendEmailVariants', () => { }) }) - it('has expected result', () => { + it.skip('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', From aa8b9d017d31b8eaf8e27aabba3723846ae9c2c0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:11:33 +0200 Subject: [PATCH 18/27] return value on then --- backend/src/emails/sendEmailTranslated.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 6d89cc257..f7f2ea40d 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -75,6 +75,7 @@ export const sendEmailTranslated = async (params: { resultSend = result logger.info('Send email successfully !!!') logger.info('Result: ', result) + return result }) .catch((error: unknown) => { throw new LogError('Error sending notification email', error) From d89fca8d1d58d4268ccd99735b38fb3bc0195c9e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:12:49 +0200 Subject: [PATCH 19/27] restructure axios calls to use await --- backend/src/apis/HttpRequest.ts | 56 +++++++++++++++------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts index 278e3732c..78cb4510f 100644 --- a/backend/src/apis/HttpRequest.ts +++ b/backend/src/apis/HttpRequest.ts @@ -9,39 +9,35 @@ import { backendLogger as logger } from '@/server/logger' // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiPost = async (url: string, payload: unknown): Promise => { logger.trace('POST', url, payload) - return axios - .post(url, payload) - .then((result) => { - logger.trace('POST-Response', result) - if (result.status !== 200) { - throw new LogError('HTTP Status Error', result.status) - } - if (result.data.state !== 'success') { - throw new Error(result.data.msg) - } - return { success: true, data: result.data } - }) - .catch((error) => { - return { success: false, data: error.message } - }) + try { + const result = await axios.post(url, payload) + logger.trace('POST-Response', result) + if (result.status !== 200) { + throw new LogError('HTTP Status Error', result.status) + } + if (result.data.state !== 'success') { + throw new LogError(result.data.msg) + } + return { success: true, data: result.data } + } catch (error: unknown) { + return { success: false, data: error.message } + } } // eslint-disable-next-line @typescript-eslint/no-explicit-any export const apiGet = async (url: string): Promise => { logger.trace('GET: url=' + url) - return axios - .get(url) - .then((result) => { - logger.trace('GET-Response', result) - if (result.status !== 200) { - throw new LogError('HTTP Status Error', result.status) - } - if (!['success', 'warning'].includes(result.data.state)) { - throw new Error(result.data.msg) - } - return { success: true, data: result.data } - }) - .catch((error) => { - return { success: false, data: error.message } - }) + try { + const result = await axios.get(url) + logger.trace('GET-Response', result) + if (result.status !== 200) { + throw new LogError('HTTP Status Error', result.status) + } + if (!['success', 'warning'].includes(result.data.state)) { + throw new LogError(result.data.msg) + } + return { success: true, data: result.data } + } catch (error: unknown) { + return { success: false, data: error.message } + } } From 4ca989a3daf33c657cbb76327c28413c5750ee17 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:20:36 +0200 Subject: [PATCH 20/27] stack traces only for errors --- backend/log4js-config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index 81b4c174b..9ab0cec50 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -8,7 +8,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -21,7 +21,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -34,7 +34,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", From 693338975e7a79fa2168efe4e0fe03259761bff7 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 6 Apr 2023 15:37:34 +0200 Subject: [PATCH 21/27] fix problems with compile --- backend/src/apis/HttpRequest.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts index 152b48f21..f40d577bd 100644 --- a/backend/src/apis/HttpRequest.ts +++ b/backend/src/apis/HttpRequest.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ @@ -19,7 +20,7 @@ export const apiPost = async (url: string, payload: unknown): Promise => { throw new LogError(result.data.msg) } return { success: true, data: result.data } - } catch (error: unknown) { + } catch (error: any) { return { success: false, data: error.message } } } @@ -37,7 +38,7 @@ export const apiGet = async (url: string): Promise => { throw new LogError(result.data.msg) } return { success: true, data: result.data } - } catch (error: unknown) { + } catch (error: any) { return { success: false, data: error.message } } } From 3eb95e19b9b63bfc2c4ec94327f8f527d3059c40 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 11 Apr 2023 12:53:59 +0200 Subject: [PATCH 22/27] emails are async again --- backend/src/emails/sendEmailTranslated.ts | 8 ++++---- backend/src/emails/sendEmailVariants.test.ts | 18 +++++++++--------- backend/src/emails/sendEmailVariants.ts | 18 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 61554c025..da8b0c67b 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -7,7 +7,7 @@ import { createTransport } from 'nodemailer' import CONFIG from '@/config' import { backendLogger as logger } from '@/server/logger' -export const sendEmailTranslated = ({ +export const sendEmailTranslated = async ({ receiver, template, locals, @@ -18,7 +18,7 @@ export const sendEmailTranslated = ({ } template: string locals: Record -}): boolean | null => { +}): Promise | boolean | null> => { // TODO: test the calling order of 'i18n.setLocale' for example: language of logging 'en', language of email receiver 'es', reset language of current user 'de' if (!CONFIG.EMAIL) { @@ -65,7 +65,7 @@ export const sendEmailTranslated = ({ // i18n, // is only needed if you don't install i18n }) - void email + const resultSend = await email .send({ template: path.join(__dirname, 'templates', template), message: receiver, @@ -76,5 +76,5 @@ export const sendEmailTranslated = ({ return false }) - return true + return resultSend } diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index fe8ed8c3a..e1f3e7cca 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -83,7 +83,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -159,7 +159,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -235,7 +235,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -323,7 +323,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -401,7 +401,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -479,7 +479,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -555,7 +555,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -639,7 +639,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -718,7 +718,7 @@ describe('sendEmailVariants', () => { }) }) - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index faf1ba2e0..19aa9faf5 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -13,7 +13,7 @@ export const sendAddedContributionMessageEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>`, @@ -40,7 +40,7 @@ export const sendAccountActivationEmail = (data: { language: string activationLink: string timeDurationObject: Record -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'accountActivation', @@ -62,7 +62,7 @@ export const sendAccountMultiRegistrationEmail = (data: { lastName: string email: string language: string -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'accountMultiRegistration', @@ -86,7 +86,7 @@ export const sendContributionConfirmedEmail = (data: { senderLastName: string contributionMemo: string contributionAmount: Decimal -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionConfirmed', @@ -113,7 +113,7 @@ export const sendContributionDeletedEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionDeleted', @@ -139,7 +139,7 @@ export const sendContributionDeniedEmail = (data: { senderFirstName: string senderLastName: string contributionMemo: string -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'contributionDenied', @@ -164,7 +164,7 @@ export const sendResetPasswordEmail = (data: { language: string resetLink: string timeDurationObject: Record -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'resetPassword', @@ -191,7 +191,7 @@ export const sendTransactionLinkRedeemedEmail = (data: { senderEmail: string transactionMemo: string transactionAmount: Decimal -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'transactionLinkRedeemed', @@ -220,7 +220,7 @@ export const sendTransactionReceivedEmail = (data: { senderLastName: string senderEmail: string transactionAmount: Decimal -}): boolean | null => { +}): Promise | boolean | null> => { return sendEmailTranslated({ receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` }, template: 'transactionReceived', From 9c461da0e7d83d4140ac1be7eb0a66ecbded19ab Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 11 Apr 2023 13:01:58 +0200 Subject: [PATCH 23/27] fix emails --- backend/src/emails/sendEmailTranslated.test.ts | 18 +++++++++--------- backend/src/emails/sendEmailTranslated.ts | 2 ++ .../resolver/ContributionMessageResolver.ts | 2 +- .../graphql/resolver/ContributionResolver.ts | 6 +++--- .../graphql/resolver/TransactionResolver.ts | 4 ++-- backend/src/graphql/resolver/UserResolver.ts | 8 ++++---- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index fb4ceb734..74eb0c0f2 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -31,11 +31,11 @@ jest.mock('nodemailer', () => { }) describe('sendEmailTranslated', () => { - let result: boolean | null + let result: Record | boolean | null describe('config email is false', () => { - beforeEach(() => { - result = sendEmailTranslated({ + beforeEach(async () => { + result = await sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -57,9 +57,9 @@ describe('sendEmailTranslated', () => { }) describe('config email is true', () => { - beforeEach(() => { + beforeEach(async () => { CONFIG.EMAIL = true - result = sendEmailTranslated({ + result = await sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -85,7 +85,7 @@ describe('sendEmailTranslated', () => { }) describe('call of "sendEmailTranslated"', () => { - it.skip('has expected result', () => { + it('has expected result', () => { expect(result).toMatchObject({ envelope: { from: 'info@gradido.net', @@ -117,11 +117,11 @@ describe('sendEmailTranslated', () => { }) describe('with email EMAIL_TEST_MODUS true', () => { - beforeEach(() => { + beforeEach(async () => { jest.clearAllMocks() CONFIG.EMAIL = true CONFIG.EMAIL_TEST_MODUS = true - result = sendEmailTranslated({ + result = await sendEmailTranslated({ receiver: { to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -133,7 +133,7 @@ describe('sendEmailTranslated', () => { }) }) - it.skip('call of "sendEmailTranslated" with faked "to"', () => { + it('call of "sendEmailTranslated" with faked "to"', () => { expect(result).toMatchObject({ envelope: { from: CONFIG.EMAIL_SENDER, diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index da8b0c67b..eba8d817d 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/no-unsafe-assignment */ +/* eslint-disable @typescript-eslint/no-unsafe-return */ import path from 'path' import Email from 'email-templates' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 02e019ea0..a59023036 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -146,7 +146,7 @@ export class ContributionMessageResolver { await queryRunner.manager.update(DbContribution, { id: contributionId }, contribution) } - sendAddedContributionMessageEmail({ + void sendAddedContributionMessageEmail({ firstName: contribution.user.firstName, lastName: contribution.user.lastName, email: contribution.user.emailContact.email, diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 1efe9fafa..5969eaef2 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -424,7 +424,7 @@ export class ContributionResolver { contribution.amount, ) - sendContributionDeletedEmail({ + void sendContributionDeletedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, @@ -518,7 +518,7 @@ export class ContributionResolver { await queryRunner.commitTransaction() logger.info('creation commited successfuly.') - sendContributionConfirmedEmail({ + void sendContributionConfirmedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, @@ -599,7 +599,7 @@ export class ContributionResolver { contributionToUpdate.amount, ) - sendContributionDeniedEmail({ + void sendContributionDeniedEmail({ firstName: user.firstName, lastName: user.lastName, email: user.emailContact.email, diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index a95294f76..0d7d7abf5 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -149,7 +149,7 @@ export const executeTransaction = async ( } finally { await queryRunner.release() } - sendTransactionReceivedEmail({ + void sendTransactionReceivedEmail({ firstName: recipient.firstName, lastName: recipient.lastName, email: recipient.emailContact.email, @@ -160,7 +160,7 @@ export const executeTransaction = async ( transactionAmount: amount, }) if (transactionLink) { - sendTransactionLinkRedeemedEmail({ + void sendTransactionLinkRedeemedEmail({ firstName: sender.firstName, lastName: sender.lastName, email: sender.emailContact.email, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 45059a4a7..b8b519a92 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -245,7 +245,7 @@ export class UserResolver { user.publisherId = publisherId logger.debug('partly faked user', user) - sendAccountMultiRegistrationEmail({ + void sendAccountMultiRegistrationEmail({ firstName: foundUser.firstName, // this is the real name of the email owner, but just "firstName" would be the name of the new registrant which shall not be passed to the outside lastName: foundUser.lastName, // this is the real name of the email owner, but just "lastName" would be the name of the new registrant which shall not be passed to the outside email, @@ -322,7 +322,7 @@ export class UserResolver { emailContact.emailVerificationCode.toString(), ).replace(/{code}/g, redeemCode ? '/' + redeemCode : '') - sendAccountActivationEmail({ + void sendAccountActivationEmail({ firstName, lastName, email, @@ -385,7 +385,7 @@ export class UserResolver { logger.info(`optInCode for ${email}=${user.emailContact}`) - sendResetPasswordEmail({ + void sendResetPasswordEmail({ firstName: user.firstName, lastName: user.lastName, email, @@ -789,7 +789,7 @@ export class UserResolver { await user.emailContact.save() // eslint-disable-next-line @typescript-eslint/no-unused-vars - sendAccountActivationEmail({ + void sendAccountActivationEmail({ firstName: user.firstName, lastName: user.lastName, email, From 67a5458a97cb7e610f66601afb10ba55e57a12be Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 11 Apr 2023 13:12:51 +0200 Subject: [PATCH 24/27] fix tests --- backend/src/emails/sendEmailVariants.test.ts | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index e9d4f49a5..fa83996cb 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -50,8 +50,8 @@ describe('sendEmailVariants', () => { let result: any describe('sendAddedContributionMessageEmail', () => { - beforeAll(() => { - result = sendAddedContributionMessageEmail({ + beforeAll(async () => { + result = await sendAddedContributionMessageEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -128,8 +128,8 @@ describe('sendEmailVariants', () => { }) describe('sendAccountActivationEmail', () => { - beforeAll(() => { - result = sendAccountActivationEmail({ + beforeAll(async () => { + result = await sendAccountActivationEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -208,8 +208,8 @@ describe('sendEmailVariants', () => { }) describe('sendAccountMultiRegistrationEmail', () => { - beforeAll(() => { - result = sendAccountMultiRegistrationEmail({ + beforeAll(async () => { + result = await sendAccountMultiRegistrationEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -288,8 +288,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionConfirmedEmail', () => { - beforeAll(() => { - result = sendContributionConfirmedEmail({ + beforeAll(async () => { + result = await sendContributionConfirmedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -368,8 +368,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionDeniedEmail', () => { - beforeAll(() => { - result = sendContributionDeniedEmail({ + beforeAll(async () => { + result = await sendContributionDeniedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -446,8 +446,8 @@ describe('sendEmailVariants', () => { }) describe('sendContributionDeletedEmail', () => { - beforeAll(() => { - result = sendContributionDeletedEmail({ + beforeAll(async () => { + result = await sendContributionDeletedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -524,8 +524,8 @@ describe('sendEmailVariants', () => { }) describe('sendResetPasswordEmail', () => { - beforeAll(() => { - result = sendResetPasswordEmail({ + beforeAll(async () => { + result = await sendResetPasswordEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -602,8 +602,8 @@ describe('sendEmailVariants', () => { }) describe('sendTransactionLinkRedeemedEmail', () => { - beforeAll(() => { - result = sendTransactionLinkRedeemedEmail({ + beforeAll(async () => { + result = await sendTransactionLinkRedeemedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', @@ -683,8 +683,8 @@ describe('sendEmailVariants', () => { }) describe('sendTransactionReceivedEmail', () => { - beforeAll(() => { - result = sendTransactionReceivedEmail({ + beforeAll(async () => { + result = await sendTransactionReceivedEmail({ firstName: 'Peter', lastName: 'Lustig', email: 'peter@lustig.de', From 2892a1f6279bfd9a38813fb823b775c3562fcd1c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 12 Apr 2023 12:29:50 +0200 Subject: [PATCH 25/27] v1.20.0 --- CHANGELOG.md | 64 +++++++++++++++++++++++++++++++++++++++++ admin/package.json | 2 +- backend/package.json | 2 +- database/package.json | 2 +- dht-node/package.json | 2 +- federation/package.json | 10 ++++--- frontend/package.json | 2 +- package.json | 2 +- 8 files changed, 76 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc91f2fa..d52ba760c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,72 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.20.0](https://github.com/gradido/gradido/compare/1.19.1...1.20.0) + +- fix(backend): no await for emails [`#2918`](https://github.com/gradido/gradido/pull/2918) +- fix(frontend): no receiver on send by link [`#2933`](https://github.com/gradido/gradido/pull/2933) +- fix(admin): pagination set currentPage by switch tabs [`#2902`](https://github.com/gradido/gradido/pull/2902) +- fix(federation): correct export of the community url [`#2931`](https://github.com/gradido/gradido/pull/2931) +- fix(frontend): displayed decay duration [`#2927`](https://github.com/gradido/gradido/pull/2927) +- fix(frontend): community tab navigation [`#2928`](https://github.com/gradido/gradido/pull/2928) +- fix(frontend): moderator id missing [`#2925`](https://github.com/gradido/gradido/pull/2925) +- fix(frontend): reset button send coins [`#2924`](https://github.com/gradido/gradido/pull/2924) +- refactor(backend): eslint plugin import export style [`#2908`](https://github.com/gradido/gradido/pull/2908) +- fix(backend): vscode intellisense fixes [`#2919`](https://github.com/gradido/gradido/pull/2919) +- refactor(backend): eslint import-no-cycle enabled [`#2905`](https://github.com/gradido/gradido/pull/2905) +- docs(backend): alias rules and conventions [`#2881`](https://github.com/gradido/gradido/pull/2881) +- refactor(backend): get transaction list [`#2923`](https://github.com/gradido/gradido/pull/2923) +- feat(backend): previous balance in transaction [`#2914`](https://github.com/gradido/gradido/pull/2914) +- refactor(backend): eslint update packages [`#2829`](https://github.com/gradido/gradido/pull/2829) +- feat(frontend): send coins via gradido ID [`#2837`](https://github.com/gradido/gradido/pull/2837) +- refactor(database): cleanup database [`#2808`](https://github.com/gradido/gradido/pull/2808) +- refactor(backend): eslint plugin n + fixes [`#2828`](https://github.com/gradido/gradido/pull/2828) +- feat(frontend): add link to download QR-Code [`#2889`](https://github.com/gradido/gradido/pull/2889) +- fix(other): delete node_modules and /tmp/yarn--* on start.sh [`#2904`](https://github.com/gradido/gradido/pull/2904) +- fix(admin): add confirmation modal for user role change and user (un)deletion [`#2880`](https://github.com/gradido/gradido/pull/2880) +- fix(admin): admin open contribution edit button [`#2811`](https://github.com/gradido/gradido/pull/2811) +- fix(backend): import order [`#2911`](https://github.com/gradido/gradido/pull/2911) +- fix(other): use default values for undefined .env database values [`#2910`](https://github.com/gradido/gradido/pull/2910) +- refactor(backend): eslint plugin import + fixes [`#2827`](https://github.com/gradido/gradido/pull/2827) +- refactor(backend): missing event tests [`#2900`](https://github.com/gradido/gradido/pull/2900) +- refactor(backend): unify event names [`#2799`](https://github.com/gradido/gradido/pull/2799) +- feat(backend): events for users [`#2797`](https://github.com/gradido/gradido/pull/2797) +- fix(backend): subscription get's email and languages from user [`#2885`](https://github.com/gradido/gradido/pull/2885) +- refactor(backend): eslint-plugin-jest + fixes [`#2816`](https://github.com/gradido/gradido/pull/2816) +- fix(frontend): fr change ` and ยด to ' [`#2888`](https://github.com/gradido/gradido/pull/2888) +- feat(backend): events for transaction links [`#2792`](https://github.com/gradido/gradido/pull/2792) +- feat(backend): events for contributions [`#2784`](https://github.com/gradido/gradido/pull/2784) +- feat(backend): events for contribution messages [`#2783`](https://github.com/gradido/gradido/pull/2783) +- refactor(backend): upgrade coverage to 85% [`#2884`](https://github.com/gradido/gradido/pull/2884) +- refactor(backend): add klicktipp-api library [`#2883`](https://github.com/gradido/gradido/pull/2883) +- feat(backend): events for contribution links [`#2780`](https://github.com/gradido/gradido/pull/2780) +- refactor(backend): separate events in own files [`#2777`](https://github.com/gradido/gradido/pull/2777) +- refactor(backend): rename `evenProtocolType` to `eventType` [`#2776`](https://github.com/gradido/gradido/pull/2776) +- refactor(other): add yarn installAll on gradido folder [`#2703`](https://github.com/gradido/gradido/pull/2703) +- docs(federation): describe the technical federation architecture [`#2716`](https://github.com/gradido/gradido/pull/2716) +- refactor(admin): admin list contributions for creation transaction list query [`#2791`](https://github.com/gradido/gradido/pull/2791) +- refactor(workflow): separate workflow with file filter for nginx testing [`#2871`](https://github.com/gradido/gradido/pull/2871) +- feat(backend): read communities data from database [`#2807`](https://github.com/gradido/gradido/pull/2807) +- feat(federation): implement a graphql endpoint to answer getpublickey-request [`#2651`](https://github.com/gradido/gradido/pull/2651) +- refactor(workflow): add file filters to dht node and federation workflows [`#2838`](https://github.com/gradido/gradido/pull/2838) +- refactor(workflow): separate test workflow for end-to-end tests [`#2836`](https://github.com/gradido/gradido/pull/2836) +- refactor(workflow): separate test workflow for frontend [`#2835`](https://github.com/gradido/gradido/pull/2835) +- feat(federation): add federation modul to deployment scripts [`#2733`](https://github.com/gradido/gradido/pull/2733) +- refactor(database): event table [`#2720`](https://github.com/gradido/gradido/pull/2720) +- refactor(workflow): separate test workflow with file change filters for admin interface [`#2734`](https://github.com/gradido/gradido/pull/2734) +- fix(admin): fix translation in menu (english) [`#2814`](https://github.com/gradido/gradido/pull/2814) +- refactor(workflow): configure jest to directly check coverage to schlanken the test workflows [`#2790`](https://github.com/gradido/gradido/pull/2790) +- fix(database): removed commands from package.json not working [`#2805`](https://github.com/gradido/gradido/pull/2805) +- fix(other): repair UserProfile.ChangePassword.feature scenario [`#2782`](https://github.com/gradido/gradido/pull/2782) +- feat(backend): test double redeem transaction links [`#2788`](https://github.com/gradido/gradido/pull/2788) +- feat(backend): admin open creations query [`#2813`](https://github.com/gradido/gradido/pull/2813) +- refactor(backend): eslint-plugin-type-graphql + fixes [`#2745`](https://github.com/gradido/gradido/pull/2745) + #### [1.19.1](https://github.com/gradido/gradido/compare/1.19.0...1.19.1) +> 10 March 2023 + +- chore(other): upgrade version to 1.19.1 [`#2812`](https://github.com/gradido/gradido/pull/2812) - fix(frontend): admin question clickable [`#2810`](https://github.com/gradido/gradido/pull/2810) - refactor(frontend): change b-img to b-icon send [`#2809`](https://github.com/gradido/gradido/pull/2809) - fix(admin): update openCreation in case of tab open. [`#2806`](https://github.com/gradido/gradido/pull/2806) diff --git a/admin/package.json b/admin/package.json index 521f34bfc..04c9a60e8 100644 --- a/admin/package.json +++ b/admin/package.json @@ -3,7 +3,7 @@ "description": "Administraion Interface for Gradido", "main": "index.js", "author": "Moriz Wahl", - "version": "1.19.1", + "version": "1.20.0", "license": "Apache-2.0", "private": false, "scripts": { diff --git a/backend/package.json b/backend/package.json index 1457f97e5..c5e0df3c5 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "gradido-backend", - "version": "1.19.1", + "version": "1.20.0", "description": "Gradido unified backend providing an API-Service for Gradido Transactions", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/backend", diff --git a/database/package.json b/database/package.json index 6dc8acf8c..23e358364 100644 --- a/database/package.json +++ b/database/package.json @@ -1,6 +1,6 @@ { "name": "gradido-database", - "version": "1.19.1", + "version": "1.20.0", "description": "Gradido Database Tool to execute database migrations", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/database", diff --git a/dht-node/package.json b/dht-node/package.json index 15426e606..1f8ba4505 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -1,6 +1,6 @@ { "name": "gradido-dht-node", - "version": "1.0.0", + "version": "1.20.0", "description": "Gradido dht-node module", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/", diff --git a/federation/package.json b/federation/package.json index e7e067435..3173e77ab 100644 --- a/federation/package.json +++ b/federation/package.json @@ -1,6 +1,6 @@ { "name": "gradido-federation", - "version": "1.0.0", + "version": "1.20.0", "description": "Gradido federation module providing Gradido-Hub-Federation and versioned API for inter community communication", "main": "src/index.ts", "repository": "https://github.com/gradido/gradido/federation", @@ -45,14 +45,16 @@ "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-promise": "^5.1.0", "jest": "27.2.4", + "nodemon": "^2.0.7", + "prettier": "^2.3.1", "ts-jest": "27.0.5", "ts-node": "^10.9.1", "tsconfig-paths": "^4.1.1", - "nodemon": "^2.0.7", - "prettier": "^2.3.1", "typescript": "^4.3.4" }, "nodemonConfig": { - "ignore": ["**/*.test.ts"] + "ignore": [ + "**/*.test.ts" + ] } } diff --git a/frontend/package.json b/frontend/package.json index 812735e3e..8515ca209 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-vue-gradido-wallet", - "version": "1.19.1", + "version": "1.20.0", "private": true, "scripts": { "start": "node run/server.js", diff --git a/package.json b/package.json index c91c63532..7845d722b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradido", - "version": "1.19.1", + "version": "1.20.0", "description": "Gradido", "main": "index.js", "repository": "git@github.com:gradido/gradido.git", From a1aa4fad63bf0aa83c9b3fff378f19f682a2c12a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 21 Apr 2023 09:57:50 +0200 Subject: [PATCH 26/27] stacktrace only for errorfile --- backend/log4js-config.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/log4js-config.json b/backend/log4js-config.json index 9ab0cec50..160883eb3 100644 --- a/backend/log4js-config.json +++ b/backend/log4js-config.json @@ -47,7 +47,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -60,7 +60,7 @@ "pattern": "yyyy-MM-dd", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" }, "keepFileExt" : true, "fileNameSep" : "_", @@ -77,7 +77,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" } }, "apolloOut": @@ -85,7 +85,7 @@ "type": "stdout", "layout": { - "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m %s" + "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" } } }, From b9527ae3f94dd4cc8c9b5ee6556f5456736a0606 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 14:41:53 +0200 Subject: [PATCH 27/27] fix test_dht_node.yml --- .github/workflows/test_dht_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_dht_node.yml b/.github/workflows/test_dht_node.yml index 04c08e3bc..bb24f2d2f 100644 --- a/.github/workflows/test_dht_node.yml +++ b/.github/workflows/test_dht_node.yml @@ -52,7 +52,7 @@ jobs: - name: Lint run: cd dht-node && yarn && yarn run lint - unit_test: + unit_test: name: Unit Tests - DHT Node if: needs.files-changed.outputs.dht_node == 'true' || needs.files-changed.outputs.docker-compose == 'true' needs: [files-changed, build]