From ad3ebefa3a2330f2bcada33a17e0b10d97debd96 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner
Date: Sat, 23 Nov 2024 17:27:51 +0100
Subject: [PATCH] now using sendUserToGms() in UserResolver too
---
backend/src/graphql/resolver/UserResolver.ts | 6 +++---
.../src/graphql/resolver/util/sendUserToGms.ts | 18 ++++++++++--------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 0302c7860..acaeac60f 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -696,9 +696,9 @@ export class UserResolver {
logger.debug(`changed user-settings relevant for gms-user update...`)
const homeCom = await getHomeCommunity()
if (homeCom.gmsApiKey !== null) {
- logger.debug(`gms-user update...`, user)
- await updateGmsUser(homeCom.gmsApiKey, new GmsUser(user))
- logger.debug(`gms-user update successfully.`)
+ logger.debug(`send User to Gms...`, user)
+ await sendUserToGms(user, homeCom)
+ logger.debug(`sendUserToGms successfully.`)
}
}
} catch (e) {
diff --git a/backend/src/graphql/resolver/util/sendUserToGms.ts b/backend/src/graphql/resolver/util/sendUserToGms.ts
index da5452d3d..22af795d4 100644
--- a/backend/src/graphql/resolver/util/sendUserToGms.ts
+++ b/backend/src/graphql/resolver/util/sendUserToGms.ts
@@ -19,20 +19,14 @@ export async function sendUserToGms(user: DbUser, homeCom: DbCommunity): Promise
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
if (await createGmsUser(homeCom.gmsApiKey, gmsUser)) {
logger.debug('GMS user published successfully:', gmsUser)
- user.gmsRegistered = true
- user.gmsRegisteredAt = new Date()
- await DbUser.save(user)
- logger.debug('mark user as gms published:', user)
+ await updateUserGmsStatus(user)
}
} else {
logger.debug('update user in gms:', gmsUser)
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
if (await updateGmsUser(homeCom.gmsApiKey, gmsUser)) {
logger.debug('GMS user published successfully:', gmsUser)
- user.gmsRegistered = true
- user.gmsRegisteredAt = new Date()
- await DbUser.save(user)
- logger.debug('mark user as gms published:', user)
+ await updateUserGmsStatus(user)
}
}
} catch (err) {
@@ -43,3 +37,11 @@ export async function sendUserToGms(user: DbUser, homeCom: DbCommunity): Promise
}
}
}
+
+async function updateUserGmsStatus(user: DbUser) {
+ logger.debug('updateUserGmsStatus:', user)
+ user.gmsRegistered = true
+ user.gmsRegisteredAt = new Date()
+ await DbUser.save(user)
+ logger.debug('mark user as gms published:', user)
+}