IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted createUser process - this is done in another PR

Browse Source
This commit is contained in:
Ulf Gebhardt 2021-11-25 09:18:37 +01:00
parent 31a3837fa5
commit 0565ff4d85
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/graphql/arg/CreateUserArgs.ts
View File

@ -11,6 +11,9 @@ export default class CreateUserArgs {
@Field(() => String) @Field(() => String)
lastName: string lastName: string
@Field(() => String)
password: string
@Field(() => String) @Field(() => String)
language?: string // Will default to DEFAULT_LANGUAGE language?: string // Will default to DEFAULT_LANGUAGE

54
backend/src/graphql/resolver/UserResolver.ts
View File

@ -343,7 +343,7 @@ export class UserResolver {
@Authorized([RIGHTS.CREATE_USER]) @Authorized([RIGHTS.CREATE_USER])
@Mutation(() => String) @Mutation(() => String)
async createUser( async createUser(
@Args() { email, firstName, lastName, language, publisherId }: CreateUserArgs, @Args() { email, firstName, lastName, password, language, publisherId }: CreateUserArgs,
): Promise<string> { ): Promise<string> {
// TODO: wrong default value (should be null), how does graphql work here? Is it an required field? // TODO: wrong default value (should be null), how does graphql work here? Is it an required field?
// default int publisher_id = 0; // default int publisher_id = 0;
@ -353,13 +353,12 @@ export class UserResolver {
language = DEFAULT_LANGUAGE language = DEFAULT_LANGUAGE
} }
// TODO: Register process
// Validate Password // Validate Password
// if (!isPassword(password)) { if (!isPassword(password)) {
// throw new Error( throw new Error(
// 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!', 'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!',
// ) )
// } }
// Validate username // Validate username
// TODO: never true // TODO: never true
@ -377,13 +376,11 @@ export class UserResolver {
throw new Error(`User already exists.`) throw new Error(`User already exists.`)
} }
// TODO: Register process const passphrase = PassphraseGenerate()
// const passphrase = PassphraseGenerate() const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key
// const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash
// const passwordHash = SecretKeyCryptographyCreateKey(email, password) // return short and long hash
// const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1])
const emailHash = getEmailHash(email) const emailHash = getEmailHash(email)
const encryptedPrivkey = SecretKeyCryptographyEncrypt(keyPair[1], passwordHash[1])
// Table: login_users // Table: login_users
const loginUser = new LoginUser() const loginUser = new LoginUser()
@ -392,15 +389,13 @@ export class UserResolver {
loginUser.lastName = lastName loginUser.lastName = lastName
loginUser.username = username loginUser.username = username
loginUser.description = '' loginUser.description = ''
// TODO: Register process loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash
// loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash
loginUser.emailHash = emailHash loginUser.emailHash = emailHash
loginUser.language = language loginUser.language = language
loginUser.groupId = 1 loginUser.groupId = 1
loginUser.publisherId = publisherId loginUser.publisherId = publisherId
// TODO: Register process loginUser.pubKey = keyPair[0]
// loginUser.pubKey = keyPair[0] loginUser.privKey = encryptedPrivkey
// loginUser.privKey = encryptedPrivkey
const queryRunner = getConnection().createQueryRunner() const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect() await queryRunner.connect()
@ -412,24 +407,21 @@ export class UserResolver {
throw new Error('insert user failed') throw new Error('insert user failed')
}) })
// TODO: Register process
// Table: login_user_backups // Table: login_user_backups
// const loginUserBackup = new LoginUserBackup() const loginUserBackup = new LoginUserBackup()
// loginUserBackup.userId = loginUserId loginUserBackup.userId = loginUserId
// loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space loginUserBackup.passphrase = passphrase.join(' ') + ' ' // login server saves trailing space
// loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER; loginUserBackup.mnemonicType = 2 // ServerConfig::MNEMONIC_BIP0039_SORTED_ORDER;
// TODO: Register process await queryRunner.manager.save(loginUserBackup).catch((error) => {
// await queryRunner.manager.save(loginUserBackup).catch((error) => { // eslint-disable-next-line no-console
// // eslint-disable-next-line no-console console.log('insert LoginUserBackup failed', error)
// console.log('insert LoginUserBackup failed', error) throw new Error('insert user backup failed')
// throw new Error('insert user backup failed') })
// })
// Table: state_users // Table: state_users
const dbUser = new DbUser() const dbUser = new DbUser()
// TODO: Register process dbUser.pubkey = keyPair[0]
// dbUser.pubkey = keyPair[0]
dbUser.email = email dbUser.email = email
dbUser.firstName = firstName dbUser.firstName = firstName
dbUser.lastName = lastName dbUser.lastName = lastName