From c8e46b54d32c1c9085609e3931131ffbc40c924f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 26 Nov 2021 02:39:30 +0100
Subject: [PATCH] merge conflicts resolved

---
 backend/src/auth/INALIENABLE_RIGHTS.ts       | 4 +---
 backend/src/auth/RIGHTS.ts                   | 4 +---
 backend/src/graphql/resolver/UserResolver.ts | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/backend/src/auth/INALIENABLE_RIGHTS.ts b/backend/src/auth/INALIENABLE_RIGHTS.ts
index eb367d643..58a81ce52 100644
--- a/backend/src/auth/INALIENABLE_RIGHTS.ts
+++ b/backend/src/auth/INALIENABLE_RIGHTS.ts
@@ -4,10 +4,8 @@ export const INALIENABLE_RIGHTS = [
   RIGHTS.LOGIN,
   RIGHTS.GET_COMMUNITY_INFO,
   RIGHTS.COMMUNITIES,
-  RIGHTS.LOGIN_VIA_EMAIL_VERIFICATION_CODE,
   RIGHTS.CREATE_USER,
   RIGHTS.SEND_RESET_PASSWORD_EMAIL,
-  RIGHTS.RESET_PASSWORD,
+  RIGHTS.SET_PASSWORD,
   RIGHTS.CHECK_USERNAME,
-  RIGHTS.CHECK_EMAIL,
 ]
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index fa750239e..6a2c05025 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -12,14 +12,12 @@ export enum RIGHTS {
   SUBSCRIBE_NEWSLETTER = 'SUBSCRIBE_NEWSLETTER',
   TRANSACTION_LIST = 'TRANSACTION_LIST',
   SEND_COINS = 'SEND_COINS',
-  LOGIN_VIA_EMAIL_VERIFICATION_CODE = 'LOGIN_VIA_EMAIL_VERIFICATION_CODE',
   LOGOUT = 'LOGOUT',
   CREATE_USER = 'CREATE_USER',
   SEND_RESET_PASSWORD_EMAIL = 'SEND_RESET_PASSWORD_EMAIL',
-  RESET_PASSWORD = 'RESET_PASSWORD',
+  SET_PASSWORD = 'SET_PASSWORD',
   UPDATE_USER_INFOS = 'UPDATE_USER_INFOS',
   CHECK_USERNAME = 'CHECK_USERNAME',
-  CHECK_EMAIL = 'CHECK_EMAIL',
   HAS_ELOPAGE = 'HAS_ELOPAGE',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 80694d608..957f8a442 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -8,7 +8,6 @@ import CONFIG from '../../config'
 import { User } from '../model/User'
 import { User as DbUser } from '@entity/User'
 import { encode } from '../../auth/JWT'
-import ChangePasswordArgs from '../arg/ChangePasswordArgs'
 import CheckUsernameArgs from '../arg/CheckUsernameArgs'
 import CreateUserArgs from '../arg/CreateUserArgs'
 import UnsecureLoginArgs from '../arg/UnsecureLoginArgs'