From 677581b76e8bef2fa8c42450016ce58a32b6fcd1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Mar 2022 03:13:00 +0100
Subject: [PATCH 01/11] enforce config on backend

---
 backend/.env.dist           |  2 ++
 backend/.env.template       |  2 ++
 backend/src/config/index.ts | 17 +++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/backend/.env.dist b/backend/.env.dist
index b1b16972f..85ad886f1 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -1,3 +1,5 @@
+CONFIG_VERSION=v1.2022-03-18
+
 # Server
 PORT=4000
 JWT_SECRET=secret123
diff --git a/backend/.env.template b/backend/.env.template
index b3a5eb4c6..454b25d3c 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -1,3 +1,5 @@
+CONFIG_VERSION=$BACKEND_CONFIG_VERSION
+
 # Server
 JWT_SECRET=$JWT_SECRET
 JWT_EXPIRES_IN=10m
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 79101856c..2a2bd6008 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -12,6 +12,11 @@ Decimal.set({
 const constants = {
   DB_VERSION: '0032-add-transaction-link-to-transaction',
   DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0
+  CONFIG_VERSION: {
+    DEFAULT: 'DEFAULT',
+    EXPECTED: 'v1.2022-03-18',
+    CURRENT: '',
+  },
 }
 
 const server = {
@@ -78,6 +83,18 @@ const webhook = {
 // This is needed by graphql-directive-auth
 process.env.APP_SECRET = server.JWT_SECRET
 
+// Check config version
+constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
+if (
+  ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
+    constants.CONFIG_VERSION.CURRENT,
+  )
+) {
+  throw new Error(
+    `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
+  )
+}
+
 const CONFIG = {
   ...constants,
   ...server,

From c9177bbce3fbaf648fd239f4bb3d4aeb1ff06e5f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Mar 2022 03:13:11 +0100
Subject: [PATCH 02/11] enforce config database

---
 database/.env.dist           |  2 ++
 database/.env.template       |  2 ++
 database/src/config/index.ts | 22 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/database/.env.dist b/database/.env.dist
index 689e4f509..58362a7b9 100644
--- a/database/.env.dist
+++ b/database/.env.dist
@@ -1,3 +1,5 @@
+CONFIG_VERSION=v1.2022-03-18
+
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=root
diff --git a/database/.env.template b/database/.env.template
index 5b8554bcf..f2517a397 100644
--- a/database/.env.template
+++ b/database/.env.template
@@ -1,3 +1,5 @@
+CONFIG_VERSION=$DATABASE_CONFIG_VERSION
+
 DB_HOST=localhost
 DB_PORT=3306
 DB_USER=$DB_USER
diff --git a/database/src/config/index.ts b/database/src/config/index.ts
index 2dde06c96..ba41f11d4 100644
--- a/database/src/config/index.ts
+++ b/database/src/config/index.ts
@@ -3,6 +3,14 @@
 import dotenv from 'dotenv'
 dotenv.config()
 
+const constants = {
+  CONFIG_VERSION: {
+    DEFAULT: 'DEFAULT',
+    EXPECTED: 'v1.2022-03-18',
+    CURRENT: '',
+  },
+}
+
 const database = {
   DB_HOST: process.env.DB_HOST || 'localhost',
   DB_PORT: process.env.DB_PORT ? parseInt(process.env.DB_PORT) : 3306,
@@ -15,6 +23,18 @@ const migrations = {
   MIGRATIONS_TABLE: process.env.MIGRATIONS_TABLE || 'migrations',
 }
 
-const CONFIG = { ...database, ...migrations }
+// Check config version
+constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
+if (
+  ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
+    constants.CONFIG_VERSION.CURRENT,
+  )
+) {
+  throw new Error(
+    `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
+  )
+}
+
+const CONFIG = { ...constants, ...database, ...migrations }
 
 export default CONFIG

From 28588ae25c8ab5b08e2330e554a4c9157aa172c7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 18 Mar 2022 03:17:48 +0100
Subject: [PATCH 03/11] deployment .env.dist config versions

---
 deployment/bare_metal/.env.dist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index 9a9d57b4c..ee0ac3cc3 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -18,6 +18,8 @@ WEBHOOK_GITHUB_SECRET=secret
 WEBHOOK_GITHUB_BRANCH=master
 
 # backend
+BACKEND_CONFIG_VERSION=v1.2022-03-18
+
 EMAIL=true
 EMAIL_USERNAME=peter@lustig.de
 EMAIL_SENDER=peter@lustig.de
@@ -43,6 +45,9 @@ KLICKTIPP_PASSWORD=
 KLICKTIPP_APIKEY_DE=
 KLICKTIPP_APIKEY_EN=
 
+# database
+DATABASE_CONFIG_VERSION=v1.2022-03-18
+
 # frontend
 GRAPHQL_URI=https://stage1.gradido.net/graphql
 ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}

From 703217e9384afa1783c974584705dbaa0b54385b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 22 Mar 2022 13:07:01 +0100
Subject: [PATCH 04/11] enforce config in frontend

---
 frontend/.env.dist           |  2 ++
 frontend/.env.template       |  2 ++
 frontend/src/config/index.js | 61 +++++++++++++++++++++++-------------
 frontend/vue.config.js       | 23 +++++++-------
 4 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/frontend/.env.dist b/frontend/.env.dist
index 0de8c6252..df3c7cd7e 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,3 +1,5 @@
+CONFIG_VERSION=v1.2022-03-18
+
 META_URL=http://localhost
 META_TITLE_DE="Gradido – Dein Dankbarkeitskonto"
 META_TITLE_EN="Gradido - Your gratitude account"
diff --git a/frontend/.env.template b/frontend/.env.template
index 1eef43cef..4e4a86d08 100644
--- a/frontend/.env.template
+++ b/frontend/.env.template
@@ -1,3 +1,5 @@
+CONFIG_VERSION=$FRONTEND_CONFIG_VERSION
+
 META_URL=$META_URL
 META_TITLE_DE=$META_TITLE_DE
 META_TITLE_EN=$META_TITLE_EN
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index eaa1e7f3d..8b2b68a8a 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -4,6 +4,14 @@
 // Load Package Details for some default values
 const pkg = require('../../package')
 
+const constants = {
+  CONFIG_VERSION: {
+    DEFAULT: 'DEFAULT',
+    EXPECTED: 'v1.2022-03-18',
+    CURRENT: '',
+  },
+}
+
 const version = {
   APP_VERSION: pkg.version,
   BUILD_COMMIT: process.env.BUILD_COMMIT || null,
@@ -16,39 +24,50 @@ const environment = {
   DEBUG: process.env.NODE_ENV !== 'production' || false,
   PRODUCTION: process.env.NODE_ENV === 'production' || false,
   DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID || 2896,
+  PORT: process.env.PORT || 3000,
 }
 
-// const meta = {
-//   META_URL: process.env.META_URL || 'http://localhost',
-//   META_TITLE_DE: process.env.META_TITLE_DE || 'Gradido – Dein Dankbarkeitskonto',
-//   META_TITLE_EN: process.env.META_TITLE_EN || 'Gradido - Your gratitude account',
-//   META_DESCRIPTION_DE:
-//     process.env.META_DESCRIPTION_DE ||
-//     'Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Menschen entfalten ihr Potenzial und gestalten eine gute Zukunft für alle.',
-//   META_DESCRIPTION_EN:
-//     process.env.META_DESCRIPTION_EN ||
-//     'Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all.',
-//   META_KEYWORDS_DE:
-//     process.env.META_KEYWORDS_DE ||
-//     'Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem',
-//   META_KEYWORDS_EN:
-//     process.env.META_KEYWORDS_EN ||
-//     'Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System',
-//   META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
-// }
+const meta = {
+  META_URL: process.env.META_URL || 'http://localhost',
+  META_TITLE_DE: process.env.META_TITLE_DE || 'Gradido – Dein Dankbarkeitskonto',
+  META_TITLE_EN: process.env.META_TITLE_EN || 'Gradido - Your gratitude account',
+  META_DESCRIPTION_DE:
+    process.env.META_DESCRIPTION_DE ||
+    'Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Menschen entfalten ihr Potenzial und gestalten eine gute Zukunft für alle.',
+  META_DESCRIPTION_EN:
+    process.env.META_DESCRIPTION_EN ||
+    'Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all.',
+  META_KEYWORDS_DE:
+    process.env.META_KEYWORDS_DE ||
+    'Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem',
+  META_KEYWORDS_EN:
+    process.env.META_KEYWORDS_EN ||
+    'Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System',
+  META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
+}
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost/graphql',
   ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token={token}',
 }
 
-const options = {}
+// Check config version
+constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
+if (
+  ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
+    constants.CONFIG_VERSION.CURRENT,
+  )
+) {
+  throw new Error(
+    `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
+  )
+}
 
 const CONFIG = {
   ...version,
   ...environment,
   ...endpoints,
-  ...options,
+  ...meta,
 }
 
-export default CONFIG
+module.exports = CONFIG
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 4c86a7a6d..573f2a70b 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -3,11 +3,12 @@ const webpack = require('webpack')
 const Dotenv = require('dotenv-webpack')
 const StatsPlugin = require('stats-webpack-plugin')
 const HtmlWebpackPlugin = require('vue-html-webpack-plugin')
+const CONFIG = require('./src/config')
 
 // vue.config.js
 module.exports = {
   devServer: {
-    port: process.env.PORT || 3000,
+    port: CONFIG.PORT,
   },
   pluginOptions: {
     i18n: {
@@ -35,7 +36,7 @@ module.exports = {
         // 'process.env.DOCKER_WORKDIR': JSON.stringify(process.env.DOCKER_WORKDIR),
         // 'process.env.BUILD_DATE': JSON.stringify(process.env.BUILD_DATE),
         // 'process.env.BUILD_VERSION': JSON.stringify(process.env.BUILD_VERSION),
-        'process.env.BUILD_COMMIT': JSON.stringify(process.env.BUILD_COMMIT),
+        'process.env.BUILD_COMMIT': JSON.stringify(CONFIG.BUILD_COMMIT),
         // 'process.env.PORT': JSON.stringify(process.env.PORT),
       }),
       // generate webpack stats to allow analysis of the bundlesize
@@ -44,14 +45,14 @@ module.exports = {
         vue: true,
         template: 'public/index.html',
         meta: {
-          title_de: process.env.META_TITLE_DE,
-          title_en: process.env.META_TITLE_EN,
-          description_de: process.env.META_DESCRIPTION_DE,
-          description_en: process.env.META_DESCRIPTION_EN,
-          keywords_de: process.env.META_KEYWORDS_DE,
-          keywords_en: process.env.META_KEYWORDS_EN,
-          author: process.env.META_AUTHOR,
-          url: process.env.META_URL,
+          title_de: CONFIG.META_TITLE_DE,
+          title_en: CONFIG.META_TITLE_EN,
+          description_de: CONFIG.META_DESCRIPTION_DE,
+          description_en: CONFIG.META_DESCRIPTION_EN,
+          keywords_de: CONFIG.META_KEYWORDS_DE,
+          keywords_en: CONFIG.META_KEYWORDS_EN,
+          author: CONFIG.META_AUTHOR,
+          url: CONFIG.META_URL,
         },
       }),
     ],
@@ -61,7 +62,7 @@ module.exports = {
   },
   css: {
     // Enable CSS source maps.
-    sourceMap: process.env.NODE_ENV !== 'production',
+    sourceMap: CONFIG.NODE_ENV !== 'production',
   },
   outputDir: path.resolve(__dirname, './dist'),
 }

From 1d6dace9f46f7085839fb5bfd658c781a3be23c4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 22 Mar 2022 13:14:13 +0100
Subject: [PATCH 05/11] implement admin config checking

---
 admin/.env.dist           |  2 ++
 admin/.env.template       |  2 ++
 admin/src/config/index.js | 25 ++++++++++++++++++++++---
 admin/vue.config.js       |  7 ++++---
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/admin/.env.dist b/admin/.env.dist
index 66c84dda8..d7044669a 100644
--- a/admin/.env.dist
+++ b/admin/.env.dist
@@ -1,3 +1,5 @@
+CONFIG_VERSION=v1.2022-03-18
+
 GRAPHQL_URI=http://localhost:4000/graphql
 WALLET_AUTH_URL=http://localhost/authenticate?token={token}
 WALLET_URL=http://localhost/login
diff --git a/admin/.env.template b/admin/.env.template
index a965b1bb1..488c9aba4 100644
--- a/admin/.env.template
+++ b/admin/.env.template
@@ -1,3 +1,5 @@
+CONFIG_VERSION=$ADMIN_CONFIG_VERSION
+
 GRAPHQL_URI=$GRAPHQL_URI
 WALLET_AUTH_URL=$WALLET_AUTH_URL
 WALLET_URL=$WALLET_URL
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index f7d361c12..03700b4fa 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -4,11 +4,20 @@
 // Load Package Details for some default values
 const pkg = require('../../package')
 
+const constants = {
+  CONFIG_VERSION: {
+    DEFAULT: 'DEFAULT',
+    EXPECTED: 'v1.2022-03-18',
+    CURRENT: '',
+  },
+}
+
 const version = {
   APP_VERSION: pkg.version,
   BUILD_COMMIT: process.env.BUILD_COMMIT || null,
   // self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code
   BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').substr(0, 7),
+  PORT: process.env.PORT || 8080,
 }
 
 const environment = {
@@ -27,14 +36,24 @@ const debug = {
   DEBUG_DISABLE_AUTH: process.env.DEBUG_DISABLE_AUTH === 'true' || false,
 }
 
-const options = {}
+// Check config version
+constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
+if (
+  ![constants.CONFIG_VERSION.EXPECTED, constants.CONFIG_VERSION.DEFAULT].includes(
+    constants.CONFIG_VERSION.CURRENT,
+  )
+) {
+  throw new Error(
+    `Fatal: Config Version incorrect - expected "${constants.CONFIG_VERSION.EXPECTED}" or "${constants.CONFIG_VERSION.DEFAULT}", but found "${constants.CONFIG_VERSION.CURRENT}"`,
+  )
+}
 
 const CONFIG = {
+  ...constants,
   ...version,
   ...environment,
   ...endpoints,
-  ...options,
   ...debug,
 }
 
-export default CONFIG
+module.exports = CONFIG
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 4492312a0..8cc1e4b89 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -2,11 +2,12 @@ const path = require('path')
 const webpack = require('webpack')
 const Dotenv = require('dotenv-webpack')
 const StatsPlugin = require('stats-webpack-plugin')
+const CONFIG = require('./src/config')
 
 // vue.config.js
 module.exports = {
   devServer: {
-    port: process.env.PORT || 8080,
+    port: CONFIG.PORT,
   },
   pluginOptions: {
     i18n: {
@@ -34,7 +35,7 @@ module.exports = {
         // 'process.env.DOCKER_WORKDIR': JSON.stringify(process.env.DOCKER_WORKDIR),
         // 'process.env.BUILD_DATE': JSON.stringify(process.env.BUILD_DATE),
         // 'process.env.BUILD_VERSION': JSON.stringify(process.env.BUILD_VERSION),
-        'process.env.BUILD_COMMIT': JSON.stringify(process.env.BUILD_COMMIT),
+        'process.env.BUILD_COMMIT': JSON.stringify(CONFIG.BUILD_COMMIT),
         // 'process.env.PORT': JSON.stringify(process.env.PORT),
       }),
       // generate webpack stats to allow analysis of the bundlesize
@@ -46,7 +47,7 @@ module.exports = {
   },
   css: {
     // Enable CSS source maps.
-    sourceMap: process.env.NODE_ENV !== 'production',
+    sourceMap: CONFIG.NODE_ENV !== 'production',
   },
   outputDir: path.resolve(__dirname, './dist'),
 }

From 31c6f77a780216c717d72427457cd3881951a12c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 22 Mar 2022 13:14:26 +0100
Subject: [PATCH 06/11] include constants in the config values

---
 frontend/src/config/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 8b2b68a8a..a542a11f1 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -64,6 +64,7 @@ if (
 }
 
 const CONFIG = {
+  ...constants,
   ...version,
   ...environment,
   ...endpoints,

From 5e41b59fe758f0e89f0a983d716ed7d944d2a179 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 22 Mar 2022 13:18:10 +0100
Subject: [PATCH 07/11] fix deprecation warning: use `slice` instead of
 `substr`

---
 admin/src/config/index.js    | 2 +-
 frontend/src/config/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 03700b4fa..fe373386d 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -16,7 +16,7 @@ const version = {
   APP_VERSION: pkg.version,
   BUILD_COMMIT: process.env.BUILD_COMMIT || null,
   // self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code
-  BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').substr(0, 7),
+  BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').slice(0, 7),
   PORT: process.env.PORT || 8080,
 }
 
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index a542a11f1..3f62012ad 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -16,7 +16,7 @@ const version = {
   APP_VERSION: pkg.version,
   BUILD_COMMIT: process.env.BUILD_COMMIT || null,
   // self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code
-  BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').substr(0, 7),
+  BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT || '0000000').slice(0, 7),
 }
 
 const environment = {

From 9ed400f5119feb17c46c3238f5d1e50efb35223d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 17:27:47 +0100
Subject: [PATCH 08/11] add sender email to transaction received email

---
 backend/src/graphql/resolver/TransactionResolver.ts | 1 +
 backend/src/mailer/sendTransactionReceivedEmail.ts  | 1 +
 backend/src/mailer/text/transactionReceived.ts      | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 03640817f..ed9528b48 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -117,6 +117,7 @@ export const executeTransaction = async (
     recipientFirstName: recipient.firstName,
     recipientLastName: recipient.lastName,
     email: recipient.email,
+    senderEmail: sender.email,
     amount,
     memo,
   })
diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts
index 3b417b10a..934783449 100644
--- a/backend/src/mailer/sendTransactionReceivedEmail.ts
+++ b/backend/src/mailer/sendTransactionReceivedEmail.ts
@@ -8,6 +8,7 @@ export const sendTransactionReceivedEmail = (data: {
   recipientFirstName: string
   recipientLastName: string
   email: string
+  senderEmail: string
   amount: Decimal
   memo: string
 }): Promise<boolean> => {
diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts
index f685c60ae..2ec414a6d 100644
--- a/backend/src/mailer/text/transactionReceived.ts
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -9,6 +9,7 @@ export const transactionReceived = {
       recipientFirstName: string
       recipientLastName: string
       email: string
+      senderEmail: string
       amount: Decimal
       memo: string
     }): string =>
@@ -16,7 +17,7 @@ export const transactionReceived = {
 
 Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
         data.senderLastName
-      } erhalten.
+      } (mailto:${data.senderEmail}) erhalten.
 ${data.senderFirstName} ${data.senderLastName} schreibt:
 
 ${data.memo}

From 17256c27ba9caefa984905a7f1149ce68021a163 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 17:30:52 +0100
Subject: [PATCH 09/11] test presence of sender email in transaction received
 email

---
 backend/src/mailer/sendTransactionReceivedEmail.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
index 5fd013650..5c0d5e842 100644
--- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts
+++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
@@ -17,6 +17,7 @@ describe('sendTransactionReceivedEmail', () => {
       recipientFirstName: 'Peter',
       recipientLastName: 'Lustig',
       email: 'peter@lustig.de',
+      senderEmail: 'bibi@bloxberg.de',
       amount: new Decimal(42.0),
       memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!',
     })
@@ -30,6 +31,7 @@ describe('sendTransactionReceivedEmail', () => {
         expect.stringContaining('Hallo Peter Lustig') &&
         expect.stringContaining('42,00 GDD') &&
         expect.stringContaining('Bibi Bloxberg') &&
+        expect.stringContaining('(mailto:bibi@bloxberg.de)') &&
         expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'),
     })
   })

From 80a8217217692cf63f89b4963d0d4a476aaf0082 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 20:58:57 +0100
Subject: [PATCH 10/11] Update
 backend/src/mailer/sendTransactionReceivedEmail.test.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/mailer/sendTransactionReceivedEmail.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
index 5c0d5e842..1ebc9dae3 100644
--- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts
+++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
@@ -31,7 +31,7 @@ describe('sendTransactionReceivedEmail', () => {
         expect.stringContaining('Hallo Peter Lustig') &&
         expect.stringContaining('42,00 GDD') &&
         expect.stringContaining('Bibi Bloxberg') &&
-        expect.stringContaining('(mailto:bibi@bloxberg.de)') &&
+        expect.stringContaining('(bibi@bloxberg.de)') &&
         expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'),
     })
   })

From 3509087166390008946e5a716c3cc7fdd4537a46 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 23 Mar 2022 20:59:13 +0100
Subject: [PATCH 11/11] Update backend/src/mailer/text/transactionReceived.ts

Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
---
 backend/src/mailer/text/transactionReceived.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts
index 2ec414a6d..520ee43bf 100644
--- a/backend/src/mailer/text/transactionReceived.ts
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -17,7 +17,7 @@ export const transactionReceived = {
 
 Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
         data.senderLastName
-      } (mailto:${data.senderEmail}) erhalten.
+      } (${data.senderEmail}) erhalten.
 ${data.senderFirstName} ${data.senderLastName} schreibt:
 
 ${data.memo}