From 729aa02035b567c02da8200743a68042377cba79 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 3 Aug 2021 18:54:31 +0200 Subject: [PATCH] fix update user infos --- backend/src/graphql/inputs/LoginUserInput.ts | 15 ++++++----- backend/src/graphql/resolvers/UserResolver.ts | 26 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/backend/src/graphql/inputs/LoginUserInput.ts b/backend/src/graphql/inputs/LoginUserInput.ts index 68ddad628..1668c5191 100644 --- a/backend/src/graphql/inputs/LoginUserInput.ts +++ b/backend/src/graphql/inputs/LoginUserInput.ts @@ -82,22 +82,25 @@ export class UpdateUserInfosArgs { @Field(() => String) email!: string - @Field(() => String) + @Field({ nullable: true }) firstName?: string - @Field(() => String) + @Field({ nullable: true }) lastName?: string - @Field(() => String) + @Field({ nullable: true }) + description?: string + + @Field({ nullable: true }) username?: string - @Field(() => String) + @Field({ nullable: true }) language?: string - @Field(() => String) + @Field({ nullable: true }) password?: string - @Field(() => String) + @Field({ nullable: true }) passwordNew?: string } diff --git a/backend/src/graphql/resolvers/UserResolver.ts b/backend/src/graphql/resolvers/UserResolver.ts index 4361bd0ed..c50b8d9f0 100644 --- a/backend/src/graphql/resolvers/UserResolver.ts +++ b/backend/src/graphql/resolvers/UserResolver.ts @@ -137,24 +137,26 @@ export class UserResolver { { sessionId, email, - firstName = '', - lastName = '', - username = '', - language = '', - password = '', - passwordNew = '', + firstName, + lastName, + description, + username, + language, + password, + passwordNew, }: UpdateUserInfosArgs, ): Promise { const payload = { session_id: sessionId, email, update: { - 'User.first_name': firstName !== '' ? firstName : undefined, - 'User.last_name': lastName !== '' ? lastName : undefined, - 'User.username': username !== '' ? username : undefined, - 'User.language': language !== '' ? language : undefined, - 'User.password': passwordNew !== '' ? passwordNew : undefined, - 'User.password_old': password !== '' ? password : undefined, + 'User.first_name': firstName || undefined, + 'User.last_name': lastName || undefined, + 'User.description': description || undefined, + 'User.username': username || undefined, + 'User.language': language || undefined, + 'User.password': passwordNew || undefined, + 'User.password_old': password || undefined, }, } const result = await apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload)