From 1184666fe2062694d3a96c397181fdeb8d2a1fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claus-Peter=20H=C3=BCbner?= <claus-peter.huebner@email.de>
Date: Fri, 26 Aug 2022 14:42:37 +0200
Subject: [PATCH] try to solve problem of dbUser-entity with emailContact in
 context

---
 backend/src/graphql/directive/isAuthorized.ts |  2 +-
 backend/src/typeorm/repository/User.ts        | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts
index 065c01957..c24cde47a 100644
--- a/backend/src/graphql/directive/isAuthorized.ts
+++ b/backend/src/graphql/directive/isAuthorized.ts
@@ -31,7 +31,7 @@ const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
 
   // TODO - load from database dynamically & admin - maybe encode this in the token to prevent many database requests
   // TODO this implementation is bullshit - two database queries cause our user identifiers are not aligned and vary between email, id and pubKey
-  const userRepository = await getCustomRepository(UserRepository)
+  const userRepository = getCustomRepository(UserRepository)
   try {
     const user = await userRepository.findByPubkeyHex(context.pubKey)
     context.user = user
diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts
index 04a30de8f..3c859ce0c 100644
--- a/backend/src/typeorm/repository/User.ts
+++ b/backend/src/typeorm/repository/User.ts
@@ -1,12 +1,20 @@
 import { Brackets, EntityRepository, ObjectLiteral, Repository } from '@dbTools/typeorm'
-import { User } from '@entity/User'
+import { User as DbUser } from '@entity/User'
 
-@EntityRepository(User)
-export class UserRepository extends Repository<User> {
-  async findByPubkeyHex(pubkeyHex: string): Promise<User> {
-    return await this.createQueryBuilder('user')
+@EntityRepository(DbUser)
+export class UserRepository extends Repository<DbUser> {
+  async findByPubkeyHex(pubkeyHex: string): Promise<DbUser> {
+    const dbUser = await this.createQueryBuilder('user')
       .where('hex(user.pubKey) = :pubkeyHex', { pubkeyHex })
       .getOneOrFail()
+    /*
+    const dbUser = await this.findOneOrFail(`hex(user.pubKey) = { pubkeyHex }`)
+    const emailContact = await this.query(
+      `SELECT * from user_contacts where id = { dbUser.emailId }`,
+    )
+    dbUser.emailContact = emailContact
+    */
+    return dbUser
   }
 
   async findBySearchCriteriaPagedFiltered(
@@ -15,7 +23,7 @@ export class UserRepository extends Repository<User> {
     filterCriteria: ObjectLiteral[],
     currentPage: number,
     pageSize: number,
-  ): Promise<[User[], number]> {
+  ): Promise<[DbUser[], number]> {
     const query = await this.createQueryBuilder('user')
       .select(select)
       .withDeleted()