Merge branch 'master' into do-not-throw-gdt-errors

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)

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": {

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",

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()

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",

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",

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",