119 Commits

Author	SHA1	Message	Date
elweyn	1004718892	Added moderator query to the creationFormular so we can send the right moderator id.	2021-12-02 06:30:41 +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	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
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
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
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	540cbd0e1f	reimplement publisherId on updateUserInfos	2021-11-17 00:20:43 +01:00
Ulf Gebhardt	4fccc19b68	missing import	2021-11-17 00:13:44 +01:00
Ulf Gebhardt	f0bfe7a7a1	Merge branch 'apollo_jwt_withdrawSessionId' into login_call_updateUserInfos	2021-11-17 00:12:12 +01:00
Ulf Gebhardt	c9f167d07b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-11-17 00:10:16 +01:00
Ulf Gebhardt	eb06b9a528	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Hannes Heine <heine.hannes@gmail.com>	2021-11-17 00:09:30 +01:00
Ulf Gebhardt	1f5c740359	Merge branch 'master' into apollo_jwt_withdrawSessionId	2021-11-17 00:06:09 +01:00
elweyn	cbc6570d65	Encode doesn't need sessionId anymore.	2021-11-11 12:32:37 +01:00
elweyn	a73a36b971	Withdrew the JWT changes and store the Buffer again instead of the hex key.	2021-11-11 10:09:08 +01:00
elweyn	e97798d73c	Withdrew comments.	2021-11-11 06:42:27 +01:00
elweyn	e976c6854d	Adding hasElopage and publisherId logic, hasElopage is called and checks if in ElopageBuys their is a user with this email, if hasElopage and publisherId is filled store it in the user table.	2021-11-11 06:41:56 +01:00
elweyn	1baf756c08	HasElopage has been called, search loginUser catch instead of if no user, context get's the pubKey at the end of the login call instead of the start.	2021-11-11 06:31:00 +01:00
elweyn	3b79bae488	Merge branch 'master' into login_call_unsecureLogin	2021-11-11 06:06:27 +01:00
Ulf Gebhardt	d7c5154912	removed unused context ... corrected comment removed unused code-comment	2021-11-11 00:30:00 +01:00
Ulf Gebhardt	e896759e1e	"implemented" logout call	2021-11-11 00:14:03 +01:00
Ulf Gebhardt	dc8091b60b	lint fix	2021-11-10 23:50:58 +01:00
Ulf Gebhardt	8b0c1feb3e	change password and reencrypt private key when doing so.	2021-11-10 23:47:37 +01:00
Ulf Gebhardt	7205eb2fae	transaction for coinanimation	2021-11-10 20:34:14 +01:00
Ulf Gebhardt	f797017c9a	have language check for changing language	2021-11-10 20:23:47 +01:00
Ulf Gebhardt	4ffa2b4ee1	we will not implement disable here - it does not make sense that an user disables himself	2021-11-10 20:18:49 +01:00
Ulf Gebhardt	fe7d7dc5f8	implemented most of updateUserInfos on Apollo ... also removed publisherId from updateUserInfos since this is now part of the login call.	2021-11-10 20:18:49 +01:00
Ulf Gebhardt	1865e42f83	just some cleanups, mostly to trigger another build	2021-11-10 18:20:47 +01:00
Ulf Gebhardt	248622f3be	hasElopage is now implemented on apollo ... - requires authorization now	2021-11-10 18:20:47 +01:00