From 7a4fadea13697bed71b5dcd7cbba95276e8f6f11 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Fri, 21 Feb 2025 19:32:41 +0100
Subject: [PATCH] add userLocation in login-response

---
 backend/src/graphql/model/User.ts      |  9 +++++++++
 backend/src/seeds/graphql/mutations.ts | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts
index 328bec61b..043bc8abd 100644
--- a/backend/src/graphql/model/User.ts
+++ b/backend/src/graphql/model/User.ts
@@ -1,10 +1,14 @@
+import { Point } from '@dbTools/typeorm'
 import { User as dbUser } from '@entity/User'
 import { ObjectType, Field, Int } from 'type-graphql'
 
 import { GmsPublishLocationType } from '@enum/GmsPublishLocationType'
 import { PublishNameType } from '@enum/PublishNameType'
 
+import { Point2Location } from '@/graphql/resolver/util/Location2Point'
+
 import { KlickTipp } from './KlickTipp'
+import { Location } from './Location'
 
 @ObjectType()
 export class User {
@@ -37,6 +41,8 @@ export class User {
       this.gmsPublishName = user.gmsPublishName
       this.humhubPublishName = user.humhubPublishName
       this.gmsPublishLocation = user.gmsPublishLocation
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      this.userLocation = user.location ? Point2Location(user.location as Point) : null
     }
   }
 
@@ -109,4 +115,7 @@ export class User {
 
   @Field(() => [String])
   roles: string[]
+
+  @Field(() => Location, { nullable: true })
+  userLocation: Location | null
 }
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index d9618bd0c..f41c47e90 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -343,16 +343,25 @@ export const redeemTransactionLink = gql`
 export const login = gql`
   mutation ($email: String!, $password: String!, $publisherId: Int) {
     login(email: $email, password: $password, publisherId: $publisherId) {
-      id
+      gradidoID
+      alias
       firstName
       lastName
       language
       klickTipp {
         newsletterState
       }
+      gmsAllowed
+      humhubAllowed
+      gmsPublishName
+      humhubPublishName
+      gmsPublishLocation
+      userLocation
       hasElopage
       publisherId
       roles
+      hideAmountGDD
+      hideAmountGDT
     }
   }
 `