526 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	0b3a8c013a	include review of moriz	2021-11-26 02:50:57 +01:00
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	897ff2ec6c	comment	2021-11-25 10:02:17 +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	ffc45d5cde	implemented JWT Admin role assignment	2021-11-25 09:52:01 +01:00
Ulf Gebhardt	08f7952ad7	implemened isAdmin	2021-11-25 09:51:38 +01:00
Ulf Gebhardt	39f1b9cf9f	ServerUser Repository	2021-11-25 09:51:17 +01:00
Ulf Gebhardt	e838af8d4b	elopage hook problem	2021-11-25 09:23:23 +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
Moriz Wahl	fd9f6f6d55	fix error caused by merging	2021-11-24 19:49:17 +01:00
Ulf Gebhardt	a3b87c39bf	moved hasRight into Role class ... defined roles better	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	a24c6119a6	check rights on all resolvers	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	44365bccf1	refactored isAuthorized & implemented a new role & rights based system	2021-11-24 19:40:49 +01:00
Ulf Gebhardt	963bff1c0b	refactored jwt	2021-11-24 19:38:42 +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
Moriz Wahl	fa717e7046	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 18:03:38 +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	dc1715eea0	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 08:50:54 +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	e0ac39ab87	removed community url	2021-11-24 02:58:03 +01:00
Ulf Gebhardt	5169a6ada9	removed login URL	2021-11-24 02:57:07 +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
ogerly	d6e8d0cc6b	unused import KlickTip and Int in type-graphql remove	2021-11-23 13:27:39 +01:00
ogerly	52aa7e437e	Added creation to useradmin model, adding call to apollo in backend.	2021-11-23 13:12:11 +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
ogerly	05c9449e0e	yarn lint fix	2021-11-23 12:16:46 +01:00
ogerly	dc1cf1fbcb	Implemented the graphql AdminResolver method getUsers.	2021-11-23 12:15:24 +01:00
ogerly	c9d6b88dd0	Created a UserAdmin model that represents the Users for the Admin area.	2021-11-23 12:14:20 +01:00