From 9893cc78aa147e97948bf1befb96d73b6408c861 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 May 2022 19:33:26 +0200
Subject: [PATCH] add context user with user.id instead of public key

---
 backend/src/graphql/resolver/BalanceResolver.ts     | 6 +++---
 backend/src/graphql/resolver/TransactionResolver.ts | 6 +++---
 backend/src/graphql/resolver/UserResolver.ts        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts
index ba4d476f4..8aa4d24d7 100644
--- a/backend/src/graphql/resolver/BalanceResolver.ts
+++ b/backend/src/graphql/resolver/BalanceResolver.ts
@@ -1,4 +1,4 @@
-import log4js from '@/server/logger'
+import { getLogger } from '@/server/logger'
 
 import { Context, getUser } from '@/server/context'
 import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
@@ -12,7 +12,7 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { MoreThan, getCustomRepository } from '@dbTools/typeorm'
 import { TransactionLinkRepository } from '@repository/TransactionLink'
 
-const logger = log4js.getLogger('backend.graphql.resolver.BalanceResolver')
+const logger = getLogger('backend')
 
 @Resolver()
 export class BalanceResolver {
@@ -22,7 +22,7 @@ export class BalanceResolver {
     const user = getUser(context)
     const now = new Date()
 
-    logger.addContext('user', user.pubKey)
+    logger.addContext('user', user.id)
     logger.info(`balance(userId=${user.id})...`)
 
     const gdtResolver = new GdtResolver()
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d94142dc0..456999d3c 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -1,7 +1,7 @@
 /* eslint-disable new-cap */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import log4js from '@/server/logger'
+import { getLogger } from '@/server/logger'
 import CONFIG from '@/config'
 
 import { Context, getUser } from '@/server/context'
@@ -35,7 +35,7 @@ import Decimal from 'decimal.js-light'
 
 import { BalanceResolver } from './BalanceResolver'
 
-const logger = log4js.getLogger('backend.graphql.resolver.TransactionResolver')
+const logger = getLogger('backend')
 
 const MEMO_MAX_CHARS = 255
 const MEMO_MIN_CHARS = 5
@@ -174,7 +174,7 @@ export class TransactionResolver {
     const now = new Date()
     const user = getUser(context)
 
-    logger.addContext('user', user.pubKey)
+    logger.addContext('user', user.id)
     logger.info(`transactionList(user=${user.firstName}.${user.lastName}, ${user.email})`)
 
     // find current balance
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 9ad908111..c2415c9f5 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -28,7 +28,7 @@ const sodium = require('sodium-native')
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const random = require('random-bigint')
 
-export const logger = getLogger('backend.graphql.resolver.UserResolver')
+export const logger = getLogger('backend')
 logger.addContext('user', 'unknown')
 
 // We will reuse this for changePassword
@@ -282,7 +282,7 @@ export class UserResolver {
       throw new Error('No user with this credentials')
     }
     // add pubKey in logger-context for layout-pattern X{user} to print it in each logging message
-    logger.addContext('user', dbUser.pubKey)
+    logger.addContext('user', dbUser.id)
     logger.debug('login credentials valid...')
 
     const user = new User(dbUser)