klicktipp,

removed unused stuff

backend/src/graphql/arg/ChangePasswordArgs.ts

@@ -1,13 +0,0 @@
-import { ArgsType, Field } from 'type-graphql'
-
-@ArgsType()
-export default class ChangePasswordArgs {
-  @Field(() => Number)
-  sessionId: number
-
-  @Field(() => String)
-  email: string
-
-  @Field(() => String)
-  password: string
-}

backend/src/graphql/model/LoginViaVerificationCode.ts

@@ -1,17 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { ObjectType, Field } from 'type-graphql'
-
-@ObjectType()
-export class LoginViaVerificationCode {
-  constructor(json: any) {
-    this.sessionId = json.session_id
-    this.email = json.user.email
-  }
-
-  @Field(() => Number)
-  sessionId: number
-
-  @Field(() => String)
-  email: string
-}

backend/src/graphql/resolver/UserResolver.ts

@@ -5,18 +5,15 @@ import fs from 'fs'
 import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
 import { getConnection, getCustomRepository } from 'typeorm'
 import CONFIG from '../../config'
-import { LoginViaVerificationCode } from '../model/LoginViaVerificationCode'
 import { User } from '../model/User'
 import { User as DbUser } from '@entity/User'
 import encode from '../../jwt/encode'
-import ChangePasswordArgs from '../arg/ChangePasswordArgs'
 import CheckUsernameArgs from '../arg/CheckUsernameArgs'
 import CreateUserArgs from '../arg/CreateUserArgs'
 import UnsecureLoginArgs from '../arg/UnsecureLoginArgs'
 import UpdateUserInfosArgs from '../arg/UpdateUserInfosArgs'
 import { apiPost, apiGet } from '../../apis/HttpRequest'
 import {
-  klicktippRegistrationMiddleware,
   klicktippNewsletterStateMiddleware,
 } from '../../middleware/klicktippMiddleware'
 import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository'
@@ -29,6 +26,7 @@ import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { sendEMail } from '../../util/sendEMail'
 import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys'
 import { randomBytes } from 'crypto'
+import { signIn } from '../../apis/KlicktippController'
 
 const EMAIL_OPT_IN_RESET_PASSWORD = 2
 const EMAIL_OPT_IN_REGISTER = 1
@@ -355,7 +353,6 @@ export class UserResolver {
 
       // Table: state_users
       const dbUser = new DbUser()
-      dbUser.pubkey = keyPair[0]
       dbUser.email = email
       dbUser.firstName = firstName
       dbUser.lastName = lastName
@@ -475,6 +472,14 @@ export class UserResolver {
     @Arg('code') code: string,
     @Arg('password') password: string,
   ): Promise<boolean> {
+    // Validate Password
+    if (!isPassword(password)) {
+      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!',
+      )
+    }
+
+    // Load code
     const optInCode = await LoginEmailOptIn.findOneOrFail({ verificationCode: code }).catch(() => {
       throw new Error('Could not login with emailVerificationCode')
     })
@@ -485,8 +490,13 @@ export class UserResolver {
       throw new Error('Code is older than 10 minutes')
     }
 
-    // load user
+    // load loginUser
     const loginUser = await LoginUser.findOneOrFail({ id: optInCode.userId }).catch(() => {
+      throw new Error('Could not find corresponding Login User')
+    })
+
+    // load user
+    const dbUser = await DbUser.findOneOrFail({ email: loginUser.email }).catch(() => {
       throw new Error('Could not find corresponding User')
     })
 
@@ -505,13 +515,6 @@ export class UserResolver {
     // Activate EMail
     loginUser.emailChecked = true
 
-    // Validate Password
-    if (!isPassword(password)) {
-      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!',
-      )
-    }
-
     // Update Password
     const passwordHash = SecretKeyCryptographyCreateKey(loginUser.email, password) // return short and long hash
     const keyPair = KeyPairEd25519Create(passphrase) // return pub, priv Key
@@ -519,14 +522,20 @@ export class UserResolver {
     loginUser.password = passwordHash[0].readBigUInt64LE() // using the shorthash
     loginUser.pubKey = keyPair[0]
     loginUser.privKey = encryptedPrivkey
+    dbUser.pubkey = keyPair[0]
 
     // Save loginUser
     // TODO transaction
     await loginUser.save()
 
+    // Save user
+    // TODO transaction
+    await dbUser.save()
+
     // Sign into Klicktipp
+    // TODO do we always signUp the user? How to handle things with old users?
     if (optInCode.emailOptInTypeId === EMAIL_OPT_IN_REGISTER) {
-      // TODO klicktippRegistrationMiddleware
+      await signIn(loginUser.email, loginUser.language, loginUser.firstName, loginUser.lastName)
     }
 
     // Delete Code

backend/src/middleware/klicktippMiddleware.ts

@@ -1,20 +1,20 @@
 import { MiddlewareFn } from 'type-graphql'
-import { signIn, getKlickTippUser } from '../apis/KlicktippController'
+import { /* signIn, */ getKlickTippUser } from '../apis/KlicktippController'
 import { KlickTipp } from '../graphql/model/KlickTipp'
 import CONFIG from '../config/index'
 
-export const klicktippRegistrationMiddleware: MiddlewareFn = async (
-  // Only for demo
-  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
-  { root, args, context, info },
-  next,
-) => {
-  // Do Something here before resolver is called
-  const result = await next()
-  // Do Something here after resolver is completed
-  await signIn(result.email, result.language, result.firstName, result.lastName)
-  return result
-}
+// export const klicktippRegistrationMiddleware: MiddlewareFn = async (
+//   // Only for demo
+//   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
+//   { root, args, context, info },
+//   next,
+// ) => {
+//   // Do Something here before resolver is called
+//   const result = await next()
+//   // Do Something here after resolver is completed
+//   await signIn(result.email, result.language, result.firstName, result.lastName)
+//   return result
+// }
 
 export const klicktippNewsletterStateMiddleware: MiddlewareFn = async (
   /* eslint-disable-next-line @typescript-eslint/no-unused-vars */