555 Commits

Author	SHA1	Message	Date
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	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
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
ogerly	2e7c35aab6	Implemented a search LoginUser like on firstName, lastName and email.	2021-11-23 12:13:29 +01:00
ogerly	1697c69e8c	WiP getUsers for Admin.	2021-11-23 11:20:50 +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	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
Hannes Heine	49db3d37fc	Update backend/src/typeorm/repository/UserSettingRepository.ts	2021-11-22 23:33:04 +01:00
elweyn	fccc7b4434	Changed the Auto increment so that it is done after the rollback and not in the finally block.	2021-11-22 23:17:11 +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	f6f6314eb1	save price as integer	2021-11-19 01:22:24 +01:00
Ulf Gebhardt	ad82cda489	remove unused fields comments to reduce file lengrh	2021-11-19 01:12:01 +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
Ulf Gebhardt	2aba37e60c	replace map with foreach since we don't need a return - thanks moriz	2021-11-19 01:00:55 +01:00
elweyn	d8def24e0c	Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined.	2021-11-18 10:28:54 +01:00
Ulf Gebhardt	5335d12802	catch error on createUser and log them	2021-11-17 19:37:35 +01:00