From 64859a71f44457afc97b31f2fbe225451dedb90b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 20 Apr 2022 11:27:09 +0200
Subject: [PATCH] use isAdmin on user to determine if user is admin

---
 backend/src/graphql/model/User.ts            |  8 ++++----
 backend/src/graphql/resolver/UserResolver.ts | 10 ----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 1a187a38f..1949592c0 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -14,8 +14,8 @@ export class User {
     this.emailChecked = user.emailChecked
     this.language = user.language
     this.publisherId = user.publisherId
+    this.isAdmin = user.isAdmin
     // TODO
-    this.isAdmin = null
     this.coinanimation = null
     this.klickTipp = null
     this.hasElopage = null
@@ -58,11 +58,11 @@ export class User {
 
   // `passphrase` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,
 
+  @Field(() => Boolean)
+  isAdmin: boolean
+
   // TODO this is a bit inconsistent with what we query from the database
   // therefore all those fields are now nullable with default value null
-  @Field(() => Boolean, { nullable: true })
-  isAdmin: boolean | null
-
   @Field(() => Boolean, { nullable: true })
   coinanimation: boolean | null
 
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 137c09622..7685268b4 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -19,9 +19,7 @@ import { sendResetPasswordEmail as sendResetPasswordEmailMailer } from '@/mailer
 import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
 import { klicktippSignIn } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { ROLE_ADMIN } from '@/auth/ROLES'
 import { hasElopageBuys } from '@/util/hasElopageBuys'
-import { ServerUser } from '@entity/ServerUser'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const sodium = require('sodium-native')
@@ -207,7 +205,6 @@ export class UserResolver {
       })
     user.coinanimation = coinanimation
 
-    user.isAdmin = context.role === ROLE_ADMIN
     return user
   }
 
@@ -243,9 +240,6 @@ export class UserResolver {
     }
 
     const user = new User(dbUser)
-    // user.email = email
-    // user.pubkey = dbUser.pubKey.toString('hex')
-    user.language = dbUser.language
 
     // Elopage Status & Stored PublisherId
     user.hasElopage = await this.hasElopage({ ...context, user: dbUser })
@@ -266,10 +260,6 @@ export class UserResolver {
       })
     user.coinanimation = coinanimation
 
-    // context.role is not set to the actual role yet on login
-    const countServerUsers = await ServerUser.count({ email: user.email })
-    user.isAdmin = countServerUsers > 0
-
     context.setHeaders.push({
       key: 'token',
       value: encode(dbUser.pubKey),