mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Withdrew state and errors from the UpdateUserInfosResponse object.
This commit is contained in:
parent
99a37ddb0a
commit
f757cd2b76
@ -83,22 +83,22 @@ export class UpdateUserInfosArgs {
|
||||
email!: string
|
||||
|
||||
@Field({ nullable: true })
|
||||
firstName?: string
|
||||
firstName?: string | null
|
||||
|
||||
@Field({ nullable: true })
|
||||
lastName?: string
|
||||
lastName?: string | null
|
||||
|
||||
@Field({ nullable: true })
|
||||
username?: string
|
||||
username?: string | null
|
||||
|
||||
@Field({ nullable: true })
|
||||
language?: string
|
||||
language?: string | null
|
||||
|
||||
@Field({ nullable: true })
|
||||
password?: string
|
||||
password?: string | null
|
||||
|
||||
@Field({ nullable: true })
|
||||
passwordNew?: string
|
||||
passwordNew?: string | null
|
||||
}
|
||||
|
||||
@ArgsType()
|
||||
|
||||
@ -8,17 +8,9 @@ import { ObjectType, Field } from 'type-graphql'
|
||||
export class UpdateUserInfosResponse extends BaseEntity {
|
||||
constructor(json: any) {
|
||||
super()
|
||||
this.state = json.state
|
||||
this.validValues = json.valid_values
|
||||
this.errors = json.errors
|
||||
}
|
||||
|
||||
@Field(() => String)
|
||||
state: string
|
||||
|
||||
@Field(() => Number)
|
||||
validValues: number
|
||||
|
||||
@Field(() => [String])
|
||||
errors: [string]
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
// import jwt from 'jsonwebtoken'
|
||||
import { Resolver, Query, /* Mutation, */ Args, Arg, Field } from 'type-graphql'
|
||||
import { Resolver, Query, Args, Arg } from 'type-graphql'
|
||||
import CONFIG from '../../config'
|
||||
import { ResetPasswordResponse } from '../models/ResetPasswordResponse'
|
||||
import { CheckUsernameResponse } from '../models/CheckUsernameResponse'
|
||||
@ -142,24 +142,24 @@ export class UserResolver {
|
||||
{
|
||||
sessionId,
|
||||
email,
|
||||
firstName = '',
|
||||
lastName = '',
|
||||
username = '',
|
||||
language = '',
|
||||
password = '',
|
||||
passwordNew = '',
|
||||
firstName = null,
|
||||
lastName = null,
|
||||
username = null,
|
||||
language = null,
|
||||
password = null,
|
||||
passwordNew = null,
|
||||
}: UpdateUserInfosArgs,
|
||||
): Promise<UpdateUserInfosResponse> {
|
||||
const payload = {
|
||||
session_id: sessionId,
|
||||
email,
|
||||
update: {
|
||||
'User.first_name': firstName.length > 0 ? firstName : undefined,
|
||||
'User.last_name': lastName.length > 0 ? lastName : undefined,
|
||||
'User.username': username.length > 0 ? username : undefined,
|
||||
'User.language': language.length > 0 ? language : undefined,
|
||||
'User.password': passwordNew.length > 0 ? passwordNew : undefined,
|
||||
'User.password_old': password.length > 0 ? password : undefined,
|
||||
'User.first_name': firstName !== null ? firstName : undefined,
|
||||
'User.last_name': lastName !== null ? lastName : undefined,
|
||||
'User.username': username !== null ? username : undefined,
|
||||
'User.language': language !== null ? language : undefined,
|
||||
'User.password': passwordNew !== null ? passwordNew : undefined,
|
||||
'User.password_old': password !== null ? password : undefined,
|
||||
},
|
||||
}
|
||||
const result = await apiPost(CONFIG.LOGIN_API_URL + 'updateUserInfos', payload)
|
||||
@ -167,7 +167,6 @@ export class UserResolver {
|
||||
return new UpdateUserInfosResponse(result.data)
|
||||
}
|
||||
|
||||
// TODO
|
||||
@Query(() => CheckUsernameResponse)
|
||||
async checkUsername(
|
||||
@Args() { username, groupId = 1 }: CheckUsernameArgs,
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
export const MapVariableToColumnName = (object) => {
|
||||
return null
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user