From 2c88bc03838fa6810edc7fcd41f6e6e133b71d71 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 07:32:39 +0100
Subject: [PATCH 01/17] remove query for checkEmail as it is included in the
 user model now

---
 backend/src/graphql/resolver/AdminResolver.ts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 54fe9335e..80345fb49 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -22,7 +22,6 @@ import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
-import { User as dbUser } from '@entity/User'
 
 @Resolver()
 export class AdminResolver {
@@ -41,7 +40,7 @@ export class AdminResolver {
         adminUser.lastName = user.lastName
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
-        adminUser.emailChecked = await hasActivatedEmail(user.email)
+        adminUser.emailChecked = user.emailChecked
         adminUser.hasElopage = await hasElopageBuys(user.email)
         return adminUser
       }),
@@ -61,8 +60,7 @@ export class AdminResolver {
   ): Promise<number[]> {
     const userRepository = getCustomRepository(UserRepository)
     const user = await userRepository.findByEmail(email)
-    const isActivated = await hasActivatedEmail(user.email)
-    if (!isActivated) {
+    if (user.emailChecked) {
       throw new Error('Creation could not be saved, Email is not activated')
     }
     const creations = await getUserCreations(user.id)
@@ -374,8 +372,3 @@ function isCreationValid(creations: number[], amount: number, creationDate: Date
   }
   return true
 }
-
-async function hasActivatedEmail(email: string): Promise<boolean> {
-  const user = await dbUser.findOne({ email })
-  return user ? user.emailChecked : false
-}

From b3be4f664a8a59530bdcf89dd6184f852aba3cbf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 08:05:25 +0100
Subject: [PATCH 02/17] add date of last email confirmation send to admin user

---
 backend/src/graphql/model/UserAdmin.ts        |  3 +++
 backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 27dfe96f1..11cf384b3 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -22,6 +22,9 @@ export class UserAdmin {
 
   @Field(() => Boolean)
   hasElopage: boolean
+
+  @Field(() => String, { nullable: true })
+  emailConfirmationSend?: string
 }
 
 @ObjectType()
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 80345fb49..e89f20ba6 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -22,6 +22,9 @@ import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
 import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
+import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
+
+const EMAIL_OPT_IN_REGISTER = 1
 
 @Resolver()
 export class AdminResolver {
@@ -42,6 +45,13 @@ export class AdminResolver {
         adminUser.creation = await getUserCreations(user.id)
         adminUser.emailChecked = user.emailChecked
         adminUser.hasElopage = await hasElopageBuys(user.email)
+        if (!user.emailChecked) {
+          const emailOptIn = await LoginEmailOptIn.findOne({
+            userId: user.id,
+            emailOptInTypeId: EMAIL_OPT_IN_REGISTER,
+          })
+          if (emailOptIn) adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()
+        }
         return adminUser
       }),
     )

From 9f51438b610731d233a88ab601eeb059fa721eb8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 08:06:19 +0100
Subject: [PATCH 03/17] fix English time

---
 admin/src/locales/de.json | 2 +-
 admin/src/locales/en.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 327cfd302..733c30572 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -71,7 +71,7 @@
     "info": "Email bestätigen, wiederholt senden an:",
     "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
     "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
-    "text_true": " Die Email wurde am {date} Uhr bestätigt."
+    "text_true": " Die Email wurde bestätigt."
   },
   "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 3f12f10a8..a4dc9fd9b 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -70,8 +70,8 @@
     "error": "Error sending the confirmation link to the user: {message}",
     "info": "Confirm email, send repeatedly to:",
     "success": "Successfully send the confirmation link to the user's email! ({email})",
-    "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
-    "text_true": "The email was confirmed on {date} clock."
+    "text_false": "The last email was sent to the member ({mail}) on {date}.",
+    "text_true": "The email was confirmed."
   },
   "user_search": "User search"
 }

From 26e2ba448a193cf378239be3e996de946f69632a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 08:07:15 +0100
Subject: [PATCH 04/17] long datetime format with long weekday and month

---
 admin/src/i18n.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/i18n.js b/admin/src/i18n.js
index 6291a9c6c..b2bb08074 100644
--- a/admin/src/i18n.js
+++ b/admin/src/i18n.js
@@ -54,9 +54,9 @@ const dateTimeFormats = {
     },
     long: {
       year: 'numeric',
-      month: 'short',
+      month: 'long',
       day: 'numeric',
-      weekday: 'short',
+      weekday: 'long',
       hour: 'numeric',
       minute: 'numeric',
     },
@@ -78,9 +78,9 @@ const dateTimeFormats = {
     },
     long: {
       day: 'numeric',
-      month: 'short',
+      month: 'long',
       year: 'numeric',
-      weekday: 'short',
+      weekday: 'long',
       hour: 'numeric',
       minute: 'numeric',
     },

From 7e54251f71ea13dd9df3be4dfa978b9497e73b01 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 08:08:48 +0100
Subject: [PATCH 05/17] display coorect date when the last confirmation email
 was sent

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 2 +-
 admin/src/components/UserTable.vue                   | 6 +++++-
 admin/src/graphql/searchUsers.js                     | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 635b80939..752f4b2cf 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
+      <div v-if="checked">{{ $t('unregister_mail.text_true') }}</div>
       <div v-else>
         {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
 
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index fb24cf0f1..15fc290aa 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -115,7 +115,11 @@
             <confirm-register-mail-formular
               :checked="row.item.emailChecked"
               :email="row.item.email"
-              :dateLastSend="$d(new Date(), 'long')"
+              :dateLastSend="
+                row.item.emailConfirmationSend
+                  ? $d(new Date(row.item.emailConfirmationSend), 'long')
+                  : ''
+              "
             />
           </template>
           <template #show-transaction-list>
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 68b6efc82..38f3cb5e7 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -17,6 +17,7 @@ export const searchUsers = gql`
         creation
         emailChecked
         hasElopage
+        emailConfirmationSend
       }
     }
   }

From 0a545c5fbed5b0a3f3fb84c503710a5cda03c29a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 10 Feb 2022 08:14:58 +0100
Subject: [PATCH 06/17] fix missing negator

---
 backend/src/graphql/resolver/AdminResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index e89f20ba6..4d42fe6c6 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -70,7 +70,7 @@ export class AdminResolver {
   ): Promise<number[]> {
     const userRepository = getCustomRepository(UserRepository)
     const user = await userRepository.findByEmail(email)
-    if (user.emailChecked) {
+    if (!user.emailChecked) {
       throw new Error('Creation could not be saved, Email is not activated')
     }
     const creations = await getUserCreations(user.id)

From a347b337c697e5b1a1f12519f44600899f2f6fad Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 11 Feb 2022 14:55:31 +0100
Subject: [PATCH 07/17] take createdAt if updatedAt is not present

---
 backend/src/graphql/resolver/AdminResolver.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 4d42fe6c6..2d9b9bfca 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -50,7 +50,13 @@ export class AdminResolver {
             userId: user.id,
             emailOptInTypeId: EMAIL_OPT_IN_REGISTER,
           })
-          if (emailOptIn) adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()
+          if (emailOptIn) {
+            if (emailOptIn.updatedAt) {
+              adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()
+            } else {
+              adminUser.emailConfirmationSend = emailOptIn.createdAt.toISOString()
+            }
+          }
         }
         return adminUser
       }),

From d3136adf33c743511962fa513618eb19c1cf1656 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 11 Feb 2022 15:27:23 +0100
Subject: [PATCH 08/17] linting

---
 admin/src/components/Tables/SearchUserTable.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index f463b000b..df7cacf9a 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -64,10 +64,10 @@
               :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="
-                        row.item.emailConfirmationSend
-                        ? $d(new Date(row.item.emailConfirmationSend), 'long')
-                        : ''
-                        "
+                row.item.emailConfirmationSend
+                  ? $d(new Date(row.item.emailConfirmationSend), 'long')
+                  : ''
+              "
             />
           </template>
           <template #show-transaction-list>

From 65f76f82ed08d860b3840df1e3a3c66a3770ab1f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 13 Feb 2022 12:40:37 +0100
Subject: [PATCH 09/17] migrate database to accept null on all parseInt fields
 on elopageBuys

---
 .../LoginElopageBuys.ts                       |  4 +--
 database/entity/LoginElopageBuys.ts           |  2 +-
 .../0021-elopagebuys_fields_nullable.ts       | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 database/migrations/0021-elopagebuys_fields_nullable.ts

diff --git a/database/entity/0003-login_server_tables/LoginElopageBuys.ts b/database/entity/0003-login_server_tables/LoginElopageBuys.ts
index fc0d6c355..1f94faffe 100644
--- a/database/entity/0003-login_server_tables/LoginElopageBuys.ts
+++ b/database/entity/0003-login_server_tables/LoginElopageBuys.ts
@@ -5,8 +5,8 @@ export class LoginElopageBuys extends BaseEntity {
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
 
-  @Column({ name: 'elopage_user_id', nullable: false })
-  elopageUserId: number
+  @Column({ type: 'int', width: 11, name: 'elopage_user_id', nullable: true, default: null })
+  elopageUserId: number | null
 
   @Column({ name: 'affiliate_program_id', nullable: false })
   affiliateProgramId: number
diff --git a/database/entity/LoginElopageBuys.ts b/database/entity/LoginElopageBuys.ts
index 6a1f3230b..cb0d212fa 100644
--- a/database/entity/LoginElopageBuys.ts
+++ b/database/entity/LoginElopageBuys.ts
@@ -1 +1 @@
-export { LoginElopageBuys } from './0003-login_server_tables/LoginElopageBuys'
+export { LoginElopageBuys } from './0021-elopagebuys_fields_nullable/LoginElopageBuys'
diff --git a/database/migrations/0021-elopagebuys_fields_nullable.ts b/database/migrations/0021-elopagebuys_fields_nullable.ts
new file mode 100644
index 000000000..dabe9d1e4
--- /dev/null
+++ b/database/migrations/0021-elopagebuys_fields_nullable.ts
@@ -0,0 +1,25 @@
+/* MIGRATION TO ALLOW NULL FIELDS ON ELOPAGEBUYS
+ *
+ * This migration allows null on `affiliate_program_id`,
+ * `publisher_id`, `order_id`. `product_id`.
+ */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'ALTER TABLE `login_elopage_buys` MODIFY COLUMN `affiliate_program_id` int(11) DEFAULT NULL;',
+  )
+  await queryFn(
+    'ALTER TABLE `login_elopage_buys` MODIFY COLUMN `publisher_id` int(11) DEFAULT NULL;',
+  )
+  await queryFn('ALTER TABLE `login_elopage_buys` MODIFY COLUMN `order_id` int(11) DEFAULT NULL;')
+  await queryFn('ALTER TABLE `login_elopage_buys` MODIFY COLUMN `product_id` int(11) DEFAULT NULL;')
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'ALTER TABLE `login_elopage_buys` MODIFY COLUMN `affiliate_program_id` int(11) NOT NULL;',
+  )
+  await queryFn('ALTER TABLE `login_elopage_buys` MODIFY COLUMN `publisher_id` int(11) NOT NULL;')
+  await queryFn('ALTER TABLE `login_elopage_buys` MODIFY COLUMN `order_id` int(11) NOT NULL;')
+  await queryFn('ALTER TABLE `login_elopage_buys` MODIFY COLUMN `product_id` int(11) NOT NULL;')
+}

From 1a1e011e6dddce8d98a71b9167a66bf9e16a69e4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 13 Feb 2022 12:41:16 +0100
Subject: [PATCH 10/17] null fields when there is no valid integer arriving
 from elopage. Furthermore try catch on save to prevent server crashes

---
 backend/src/webhook/elopage.ts | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts
index af6b5a097..d2090a54b 100644
--- a/backend/src/webhook/elopage.ts
+++ b/backend/src/webhook/elopage.ts
@@ -53,12 +53,13 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
     membership,
   } = req.body
 
-  loginElopageBuy.affiliateProgramId = parseInt(product.affiliate_program_id)
-  loginElopageBuy.publisherId = parseInt(publisher.id)
-  loginElopageBuy.orderId = parseInt(order_id)
-  loginElopageBuy.productId = parseInt(product_id)
+  loginElopageBuy.affiliateProgramId = parseInt(product.affiliate_program_id) || null
+  loginElopageBuy.publisherId = parseInt(publisher.id) || null
+  loginElopageBuy.orderId = parseInt(order_id) || null
+  loginElopageBuy.productId = parseInt(product_id) || null
   // TODO: WHAT THE ACTUAL FUK? Please save this as float in the future directly in the database
-  loginElopageBuy.productPrice = Math.trunc(parseFloat(product.price) * 100)
+  const productPrice = parseFloat(product.price)
+  loginElopageBuy.productPrice = productPrice ? Math.trunc(productPrice * 100) : 0
   loginElopageBuy.payerEmail = payer.email
   loginElopageBuy.publisherEmail = publisher.email
   // eslint-disable-next-line camelcase
@@ -66,7 +67,7 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
   loginElopageBuy.successDate = new Date(success_date)
   loginElopageBuy.event = event
   // TODO this was never set on login_server - its unclear if this is the correct value
-  loginElopageBuy.elopageUserId = parseInt(membership.id)
+  loginElopageBuy.elopageUserId = parseInt(membership.id) || null
 
   const firstName = payer.first_name
   const lastName = payer.last_name
@@ -79,7 +80,13 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
   }
 
   // Save the hook data
-  await LoginElopageBuys.save(loginElopageBuy)
+  try {
+    await LoginElopageBuys.save(loginElopageBuy)
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log('Error saving LoginElopageBuy', error)
+    return
+  }
 
   // create user for certain products
   /*
@@ -90,7 +97,10 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
     Business-Mitgliedschaft,          43960
     Förderbeitrag:                    49106
   */
-  if ([36001, 43741, 43870, 43944, 43960, 49106].includes(loginElopageBuy.productId)) {
+  if (
+    loginElopageBuy.productId &&
+    [36001, 43741, 43870, 43944, 43960, 49106].includes(loginElopageBuy.productId)
+  ) {
     const email = loginElopageBuy.payerEmail
 
     const VALIDATE_EMAIL = /^[a-zA-Z0-9.!#$%&?*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/
@@ -123,7 +133,7 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
         email,
         firstName,
         lastName,
-        publisherId: loginElopageBuy.publisherId,
+        publisherId: loginElopageBuy.publisherId || 0, // This seemed to be the default value if not set
       })
     } catch (error) {
       // eslint-disable-next-line no-console

From 6d732374c5763582bf4fb7ef3ad1526e9f6eb8d0 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 13 Feb 2022 23:04:43 +0100
Subject: [PATCH 11/17] missing entity definition

---
 .../LoginElopageBuys.ts                       | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 database/entity/0021-elopagebuys_fields_nullable/LoginElopageBuys.ts

diff --git a/database/entity/0021-elopagebuys_fields_nullable/LoginElopageBuys.ts b/database/entity/0021-elopagebuys_fields_nullable/LoginElopageBuys.ts
new file mode 100644
index 000000000..501276ea7
--- /dev/null
+++ b/database/entity/0021-elopagebuys_fields_nullable/LoginElopageBuys.ts
@@ -0,0 +1,52 @@
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
+
+@Entity('login_elopage_buys')
+export class LoginElopageBuys extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ type: 'int', width: 11, name: 'elopage_user_id', nullable: true, default: null })
+  elopageUserId: number | null
+
+  @Column({ type: 'int', width: 11, name: 'affiliate_program_id', nullable: true, default: null })
+  affiliateProgramId: number | null
+
+  @Column({ type: 'int', width: 11, name: 'publisher_id', nullable: true, default: null })
+  publisherId: number | null
+
+  @Column({ type: 'int', width: 11, name: 'order_id', nullable: true, default: null })
+  orderId: number | null
+
+  @Column({ type: 'int', width: 11, name: 'product_id', nullable: true, default: null })
+  productId: number | null
+
+  @Column({ name: 'product_price', nullable: false })
+  productPrice: number
+
+  @Column({
+    name: 'payer_email',
+    length: 255,
+    nullable: false,
+    charset: 'utf8',
+    collation: 'utf8_bin',
+  })
+  payerEmail: string
+
+  @Column({
+    name: 'publisher_email',
+    length: 255,
+    nullable: false,
+    charset: 'utf8',
+    collation: 'utf8_bin',
+  })
+  publisherEmail: string
+
+  @Column({ nullable: false })
+  payed: boolean
+
+  @Column({ name: 'success_date', nullable: false })
+  successDate: Date
+
+  @Column({ length: 255, nullable: false })
+  event: string
+}

From 14dfb225937008ad40c752c7e0300d5daa1a282e Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 14 Feb 2022 08:32:06 +0100
Subject: [PATCH 12/17] corrected database version

---
 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 46cb00ed2..64f3fd667 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -4,7 +4,7 @@ import dotenv from 'dotenv'
 dotenv.config()
 
 const constants = {
-  DB_VERSION: '0020-rename_and_clean_state_users',
+  DB_VERSION: '0021-elopagebuys_fields_nullable',
 }
 
 const server = {

From 820cdfb16f640c6cb4922b584fb369f6dc58d608 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 14 Feb 2022 09:51:06 +0100
Subject: [PATCH 13/17] do not log password and token to the console

---
 backend/src/server/plugins.ts | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 0bb5f9f98..ac23e948e 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -1,7 +1,15 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { ApolloLogPlugin } from 'apollo-log'
+import { ApolloLogPlugin, LogMutateData } from 'apollo-log'
+
+const copyInstance = (instance: any) => {
+  const data = Object.assign(
+    Object.create(Object.getPrototypeOf(instance)),
+    JSON.parse(JSON.stringify(instance)),
+  )
+  return data
+}
 
 const plugins = [
   {
@@ -21,7 +29,22 @@ const plugins = [
       }
     },
   },
-  ApolloLogPlugin(),
+  ApolloLogPlugin({
+    mutate: (data: LogMutateData) => {
+      // We need to deep clone the object in order to not modify the actual request
+      const data2 = copyInstance(data)
+
+      // mask password if part of the query
+      if (data2.context.request.variables && data2.context.request.variables.password) {
+        data2.context.request.variables.password = '***'
+      }
+
+      // mask token at all times
+      data2.context.context.token = '***'
+
+      return data2
+    },
+  }),
 ]
 
 export default plugins

From 760b7e2d01b90e49939159fae741faf735127f53 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 14 Feb 2022 10:24:06 +0100
Subject: [PATCH 14/17] renamed data2 to dataCopy

---
 backend/src/server/plugins.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index ac23e948e..4f3a15b90 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -32,17 +32,17 @@ const plugins = [
   ApolloLogPlugin({
     mutate: (data: LogMutateData) => {
       // We need to deep clone the object in order to not modify the actual request
-      const data2 = copyInstance(data)
+      const dataCopy = copyInstance(data)
 
       // mask password if part of the query
-      if (data2.context.request.variables && data2.context.request.variables.password) {
-        data2.context.request.variables.password = '***'
+      if (dataCopy.context.request.variables && dataCopy.context.request.variables.password) {
+        dataCopy.context.request.variables.password = '***'
       }
 
       // mask token at all times
-      data2.context.context.token = '***'
+      dataCopy.context.context.token = '***'
 
-      return data2
+      return dataCopy
     },
   }),
 ]

From a201cad0db124977bb3e02b48fa6095122cc5883 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 14 Feb 2022 12:57:24 +0100
Subject: [PATCH 15/17] use lodash clonedeep to copy objects

---
 backend/package.json          |  2 ++
 backend/src/server/plugins.ts | 11 ++---------
 backend/yarn.lock             | 12 ++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 043dca11d..2e58d27a2 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
+    "@types/lodash.clonedeep": "^4.5.6",
     "apollo-log": "^1.1.0",
     "apollo-server-express": "^2.25.2",
     "apollo-server-testing": "^2.25.2",
@@ -29,6 +30,7 @@
     "graphql": "^15.5.1",
     "jest": "^27.2.4",
     "jsonwebtoken": "^8.5.1",
+    "lodash.clonedeep": "^4.5.0",
     "module-alias": "^2.2.2",
     "moment": "^2.29.1",
     "mysql2": "^2.3.0",
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 4f3a15b90..049f63a08 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -2,14 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { ApolloLogPlugin, LogMutateData } from 'apollo-log'
-
-const copyInstance = (instance: any) => {
-  const data = Object.assign(
-    Object.create(Object.getPrototypeOf(instance)),
-    JSON.parse(JSON.stringify(instance)),
-  )
-  return data
-}
+import cloneDeep from 'lodash.clonedeep'
 
 const plugins = [
   {
@@ -32,7 +25,7 @@ const plugins = [
   ApolloLogPlugin({
     mutate: (data: LogMutateData) => {
       // We need to deep clone the object in order to not modify the actual request
-      const dataCopy = copyInstance(data)
+      const dataCopy = cloneDeep(data)
 
       // mask password if part of the query
       if (dataCopy.context.request.variables && dataCopy.context.request.variables.password) {
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 52cd0f751..6ef0d5701 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -913,6 +913,18 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
+"@types/lodash.clonedeep@^4.5.6":
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz#3b6c40a0affe0799a2ce823b440a6cf33571d32b"
+  integrity sha512-cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.178"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.178.tgz#341f6d2247db528d4a13ddbb374bcdc80406f4f8"
+  integrity sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==
+
 "@types/long@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"

From f3b3fa2eba3ad700acad93960b3fd7788a7ac372 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 14 Feb 2022 13:45:48 +0100
Subject: [PATCH 16/17] do not query on email opt in type, since we have
 different ones and legacy types. Furthermore order the result of the query.

---
 backend/src/graphql/resolver/AdminResolver.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 2d9b9bfca..4da51398c 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -24,7 +24,8 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation'
 import { hasElopageBuys } from '../../util/hasElopageBuys'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 
-const EMAIL_OPT_IN_REGISTER = 1
+// const EMAIL_OPT_IN_REGISTER = 1
+// const EMAIL_OPT_UNKNOWN = 3 // elopage?
 
 @Resolver()
 export class AdminResolver {
@@ -46,10 +47,17 @@ export class AdminResolver {
         adminUser.emailChecked = user.emailChecked
         adminUser.hasElopage = await hasElopageBuys(user.email)
         if (!user.emailChecked) {
-          const emailOptIn = await LoginEmailOptIn.findOne({
-            userId: user.id,
-            emailOptInTypeId: EMAIL_OPT_IN_REGISTER,
-          })
+          const emailOptIn = await LoginEmailOptIn.findOne(
+            {
+              userId: user.id,
+            },
+            {
+              order: {
+                updatedAt: 'DESC',
+                createdAt: 'DESC',
+              },
+            },
+          )
           if (emailOptIn) {
             if (emailOptIn.updatedAt) {
               adminUser.emailConfirmationSend = emailOptIn.updatedAt.toISOString()

From b2bf3457f9da15de7634e13344e696c8ca8d6712 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 14 Feb 2022 14:00:56 +0100
Subject: [PATCH 17/17] v1.6.4

---
 CHANGELOG.md          | 17 +++++++++++++++++
 admin/package.json    |  2 +-
 backend/package.json  |  2 +-
 database/package.json |  2 +-
 frontend/package.json |  2 +-
 package.json          |  2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45f221475..6a13e408b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,25 @@ 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.6.4](https://github.com/gradido/gradido/compare/1.6.3...1.6.4)
+
+- fix: Admin Email Confirmation Date and Time [`#1448`](https://github.com/gradido/gradido/pull/1448)
+- Fix: Do not log password or token to the console [`#1477`](https://github.com/gradido/gradido/pull/1477)
+- Fix: Elopage Hook Crash [`#1474`](https://github.com/gradido/gradido/pull/1474)
+- 538 unify all buttons [`#1455`](https://github.com/gradido/gradido/pull/1455)
+- 833 old error is shown for a second even if transaction is successful [`#1460`](https://github.com/gradido/gradido/pull/1460)
+- fix: Wrong Email Spelling in German [`#1446`](https://github.com/gradido/gradido/pull/1446)
+- fix: Redirect to Login after Register [`#1445`](https://github.com/gradido/gradido/pull/1445)
+- refactor: Split User Table Component in Admin Interface [`#1443`](https://github.com/gradido/gradido/pull/1443)
+- remove user table [`c6a469e`](https://github.com/gradido/gradido/commit/c6a469e08f16101c8fb78958eda69b163b815ed3)
+- open creations table [`9ef575d`](https://github.com/gradido/gradido/commit/9ef575d6b140a4c768e4330a18eaa3b04346b483)
+- User Search Table [`ae2d535`](https://github.com/gradido/gradido/commit/ae2d5355d62f525187dd1cdb1448aec63fb05d3f)
+
 #### [1.6.3](https://github.com/gradido/gradido/compare/1.6.2...1.6.3)
 
+> 9 February 2022
+
+- v1.6.3 [`#1447`](https://github.com/gradido/gradido/pull/1447)
 - add .btn-outline-secondary in scss [`#1442`](https://github.com/gradido/gradido/pull/1442)
 - Profil settings and footer refactor [`#1440`](https://github.com/gradido/gradido/pull/1440)
 - profil settings header info refactor style [`cbaa016`](https://github.com/gradido/gradido/commit/cbaa0162b9366e5de722235aeb633908c59bb3e1)
diff --git a/admin/package.json b/admin/package.json
index 4d6b13a6c..0aee14ec2 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.6.3",
+  "version": "1.6.4",
   "license": "MIT",
   "private": false,
   "scripts": {
diff --git a/backend/package.json b/backend/package.json
index 2e58d27a2..caefa5e69 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "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 c9fb01d9b..6ed4c0938 100644
--- a/database/package.json
+++ b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",
diff --git a/frontend/package.json b/frontend/package.json
index 9b68ba1ce..d59c22672 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "private": true,
   "scripts": {
     "start": "node run/server.js",
diff --git a/package.json b/package.json
index fadbaa1f0..aea523ebe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",