342 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	c8e46b54d3	merge conflicts resolved	2021-11-26 02:39:30 +01:00
Ulf Gebhardt	5cccd8f873	Merge branch 'master' into login_call_resetPassword ... # Conflicts: # backend/src/graphql/resolver/UserResolver.ts	2021-11-26 02:36:32 +01:00
Hannes Heine	5cbdbcb7c9	Merge branch 'master' into login_call_resetPassword	2021-11-25 10:22:15 +01:00
Ulf Gebhardt	fddc39efe5	compare with jwt assigne drole on verifyLogin instead of database query again	2021-11-25 09:57:27 +01:00
Ulf Gebhardt	08f7952ad7	implemened isAdmin	2021-11-25 09:51:38 +01:00
Ulf Gebhardt	0565ff4d85	reverted createUser process - this is done in another PR	2021-11-25 09:18:37 +01:00
Ulf Gebhardt	31a3837fa5	right check for searchUsers & verifyLogin	2021-11-25 09:01:23 +01:00
Ulf Gebhardt	754bd89723	lint	2021-11-25 08:49:47 +01:00
Ulf Gebhardt	77dc54155a	Merge branch 'master' into backend_rights ... # Conflicts: # admin/src/router/guards.js # admin/src/store/store.js # backend/src/graphql/resolver/UserResolver.ts # frontend/src/components/SidebarPlugin/SideBar.vue # frontend/src/graphql/queries.js # frontend/src/routes/guards.js	2021-11-25 08:49:06 +01:00
Ulf Gebhardt	a24c6119a6	check rights on all resolvers	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	cefc963780	implemented isAdmin from backend	2021-11-24 19:38:42 +01:00
Moriz Wahl	b0ac9b6632	Merge branch 'login_admin_interface' of github.com:gradido/gradido into login_admin_interface	2021-11-24 18:26:38 +01:00
Moriz Wahl	ac7eb303b4	Merge branch 'master' into login_admin_interface	2021-11-24 18:23:31 +01:00
Ulf Gebhardt	87059a6588	Merge branch 'master' into login_hook_elopage	2021-11-24 09:08:14 +01:00
Ulf Gebhardt	fc054cc2f9	Merge branch 'master' into login_admin_interface	2021-11-24 09:06:56 +01:00
Ulf Gebhardt	8354aad277	lint fix	2021-11-24 04:18:11 +01:00
Ulf Gebhardt	d07bd472b0	catch errors with klicktipp - do not fail setPassword on failing klicktipp	2021-11-24 04:15:50 +01:00
Ulf Gebhardt	4bdcff8152	fixed save optin code problem, ... corrected URL	2021-11-24 04:12:01 +01:00
Ulf Gebhardt	51f7d48566	- make setPassword a mutation ... - fix repository stuff	2021-11-24 03:55:24 +01:00
Ulf Gebhardt	58992b639a	fix pubkey on state_user table - write zeros	2021-11-24 03:30:23 +01:00
Ulf Gebhardt	f6a2368ead	cleaned imports	2021-11-24 03:09:34 +01:00
Ulf Gebhardt	3c64274694	added comments	2021-11-24 03:05:35 +01:00
Ulf Gebhardt	d0ba662bab	generate random optIn Code the same way	2021-11-24 03:02:17 +01:00
Ulf Gebhardt	a117b325cf	also check for presence of pub & priv key	2021-11-24 02:24:39 +01:00
Ulf Gebhardt	cf8ca47cc6	check for no password and emailChecked on login	2021-11-24 02:20:22 +01:00
Ulf Gebhardt	d5ea64d9ca	Merge branch 'bugfix_register_with_not_activ_account' into login_call_resetPassword	2021-11-24 02:16:31 +01:00
Ulf Gebhardt	636c4c8df3	implement verifyLogin	2021-11-23 14:05:02 +01:00
Ulf Gebhardt	41d6a7ba45	implemented isAdmin from backend	2021-11-23 12:48:59 +01:00
Ulf Gebhardt	9ea1edb010	Merge branch 'master' into login_hook_elopage	2021-11-23 12:43:24 +01:00
Ulf Gebhardt	e62f3fd6cb	transactions	2021-11-23 12:32:27 +01:00
Ulf Gebhardt	1fc0fa3bc1	remove some more comments	2021-11-23 12:24:08 +01:00
Ulf Gebhardt	4b5acedea2	klicktipp, ... removed unused stuff	2021-11-23 12:20:36 +01:00
Ulf Gebhardt	d5b2356caf	setPassword in frontend ... remove resetPassword	2021-11-23 12:08:23 +01:00
Ulf Gebhardt	d1dfda81ce	removed password from createUser & implement setPassword	2021-11-23 12:00:14 +01:00
Ulf Gebhardt	a1a24d1553	prototype setPassword call	2021-11-23 11:24:42 +01:00
elweyn	8479975425	Since we don't make a request to the login_server we need to catch if user email has been activated.	2021-11-23 08:05:52 +01:00
Ulf Gebhardt	bead60ac7f	use correct constants for email optins	2021-11-23 03:10:34 +01:00
Ulf Gebhardt	1802dbf06d	use correct optin for register	2021-11-23 03:08:43 +01:00
Ulf Gebhardt	87714f0089	corrected error typo	2021-11-23 03:05:29 +01:00
Ulf Gebhardt	728aaa095f	first of several calls regarding password reset	2021-11-23 03:04:28 +01:00
Ulf Gebhardt	635c7b6e51	Merge branch 'master' into bugfix_coinanimation_update_only_send_for_true	2021-11-22 23:48:53 +01:00
Hannes Heine	ed01bca12b	Update backend/src/graphql/resolver/UserResolver.ts	2021-11-22 23:35:02 +01:00
Ulf Gebhardt	6dab777005	use correct pubKey, use hex instead of buffer	2021-11-22 22:00:57 +01:00
Hannes Heine	1d9042ca4b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-11-22 21:42:09 +01:00
Ulf Gebhardt	0fd2110fa1	removed duplicate import	2021-11-22 16:06:48 +01:00
Ulf Gebhardt	8eb5c74ba8	encode buffer to hex when decoding the jwt, not everytime we use it	2021-11-22 15:55:57 +01:00
Ulf Gebhardt	0341ae0d13	Merge branch 'master' into login_call_unsecureLogin	2021-11-22 15:54:37 +01:00
Ulf Gebhardt	dbfe882c14	implemented isAdmin from backend	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	a6e4e84c9b	do not generate a password for a user, but change the process to set the password later.	2021-11-19 01:51:13 +01:00
Ulf Gebhardt	a44a3ee6d0	make language an optional parameter for createUser and do not set it on the elopage webhook	2021-11-19 01:08:53 +01:00