From d864732c0f5915862208eb59ee285919a41b292e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 26 Dec 2022 16:32:22 +0100 Subject: [PATCH 1/4] fix config - [x] `ENV_NAME` present in config but never used - [x] `FEDERATION_DHT_SEED` has a trailing space - [x] `v14.2022-11-22` should be `v14.2022-12-22` - [x] Check if versions are all correctly configured in all configs --- backend/.env.dist | 2 +- backend/src/config/index.ts | 2 +- deployment/bare_metal/.env.dist | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/.env.dist b/backend/.env.dist index b238388f6..ba5b89fa9 100644 --- a/backend/.env.dist +++ b/backend/.env.dist @@ -66,5 +66,5 @@ EVENT_PROTOCOL_DISABLED=false # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen # on an hash created from this topic # FEDERATION_DHT_TOPIC=GRADIDO_HUB -# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f +# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f # FEDERATION_COMMUNITY_URL=http://localhost:4000/api diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 698b17e67..4779e5b21 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -17,7 +17,7 @@ const constants = { LOG_LEVEL: process.env.LOG_LEVEL || 'info', CONFIG_VERSION: { DEFAULT: 'DEFAULT', - EXPECTED: 'v14.2022-11-22', + EXPECTED: 'v14.2022-12-22', CURRENT: '', }, } diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index a5f6996d7..e816c9236 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -27,11 +27,10 @@ COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community" COMMUNITY_SUPPORT_MAIL=support@supportmail.com # backend -BACKEND_CONFIG_VERSION=v13.2022-12-20 +BACKEND_CONFIG_VERSION=v14.2022-12-22 JWT_EXPIRES_IN=10m GDT_API_URL=https://gdt.gradido.net -ENV_NAME=stage1 TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log @@ -64,7 +63,7 @@ EVENT_PROTOCOL_DISABLED=false # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen # on an hash created from this topic # FEDERATION_DHT_TOPIC=GRADIDO_HUB -# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f +# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f # database DATABASE_CONFIG_VERSION=v1.2022-03-18 From f6f253a40a7aa3770d70cab3814021837a04de31 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 27 Dec 2022 02:55:48 +0100 Subject: [PATCH 2/4] include new scopes for lint pr: - federation - workflow - docker --- .github/workflows/lint_pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/lint_pr.yml b/.github/workflows/lint_pr.yml index 2f9229737..24e66bd20 100644 --- a/.github/workflows/lint_pr.yml +++ b/.github/workflows/lint_pr.yml @@ -29,6 +29,9 @@ jobs: admin database release + federation + workflow + docker other # Configure that a scope must always be provided. requireScope: true From 68bd762cd19cd4a6af0fd71d6d7576e3580d4f25 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 2 Jan 2023 14:42:27 +0100 Subject: [PATCH 3/4] fix logger middleware to not throw errors when variables cannot be parsed properly --- backend/src/server/plugins.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts index 24df45baa..7ecbedf2a 100644 --- a/backend/src/server/plugins.ts +++ b/backend/src/server/plugins.ts @@ -23,8 +23,8 @@ const setHeadersPlugin = { const filterVariables = (variables: any) => { const vars = clonedeep(variables) - if (vars.password) vars.password = '***' - if (vars.passwordNew) vars.passwordNew = '***' + if (vars && vars.password) vars.password = '***' + if (vars && vars.passwordNew) vars.passwordNew = '***' return vars } From 9bbb401428101c1a9534861caa5906b44aa305f3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 8 Jan 2023 13:53:16 +0100 Subject: [PATCH 4/4] fixed email text --- backend/src/emails/sendEmailVariants.test.ts | 10 ++++++---- backend/src/locales/en.json | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 6dbde1196..1015f2cb5 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -327,18 +327,20 @@ describe('sendEmailVariants', () => { to: 'Peter Lustig ', from: 'Gradido (do not answer) ', attachments: [], - subject: 'Gradido: Your common good contribution was confirmed', + subject: 'Gradido: Your contribution to the common good was confirmed', html: expect.any(String), - text: expect.stringContaining('GRADIDO: YOUR COMMON GOOD CONTRIBUTION WAS CONFIRMED'), + text: expect.stringContaining( + 'GRADIDO: YOUR CONTRIBUTION TO THE COMMON GOOD WAS CONFIRMED', + ), }), }) expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain('') expect(result.originalMessage.html).toContain( - 'Gradido: Your common good contribution was confirmed', + 'Gradido: Your contribution to the common good was confirmed', ) expect(result.originalMessage.html).toContain( - '>Gradido: Your common good contribution was confirmed', + '>Gradido: Your contribution to the common good was confirmed', ) expect(result.originalMessage.html).toContain('Hello Peter Lustig') expect(result.originalMessage.html).toContain( diff --git a/backend/src/locales/en.json b/backend/src/locales/en.json index 6131bb501..ac1ad380f 100644 --- a/backend/src/locales/en.json +++ b/backend/src/locales/en.json @@ -21,7 +21,7 @@ }, "contributionConfirmed": { "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.", - "subject": "Gradido: Your common good contribution was confirmed" + "subject": "Gradido: Your contribution to the common good was confirmed" }, "contributionRejected": { "commonGoodContributionRejected": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",