166 Commits

Author	SHA1	Message	Date
Moriz Wahl	2e25c280cf	Merge branch 'master' into paginate-user-table	2022-01-18 12:54:59 +01:00
Ulf Gebhardt	90effb41b5	changed syntax again due to shell replacing $variables	2022-01-14 18:49:35 +01:00
Ulf Gebhardt	5217b347be	replace all $1 url variables with something meaningfull, since $1 is replaced in scripting	2022-01-14 10:24:47 +01:00
Moriz Wahl	4bac268de3	test setPassword with success	2022-01-13 09:30:53 +01:00
Moriz Wahl	c05f32cf5f	sendAccountActivationEmail with object as arg	2022-01-12 12:19:45 +01:00
Moriz Wahl	b1520182a2	sendResetPasswordEmail with object as arg	2022-01-12 12:13:42 +01:00
Moriz Wahl	fb53a0bcb0	extract reset password email	2022-01-12 11:36:17 +01:00
Moriz Wahl	c6863d6e64	sendAccountActivationEmail in separate file	2022-01-12 11:02:49 +01:00
Moriz Wahl	b95eb902e9	move mailer functions into own folder	2022-01-12 09:54:34 +01:00
Moriz Wahl	1c86b704d3	Merge branch 'master' into test-send-email	2022-01-12 09:49:00 +01:00
Moriz Wahl	55d85a8ccf	fix: Change Password in User Profile	2022-01-10 10:01:47 +01:00
Moriz Wahl	b7186209f1	sendAccountActivationEmail as imprted function	2022-01-04 18:37:59 +01:00
Moriz Wahl	e39d51d335	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2021-12-29 23:16:33 +01:00
Moriz Wahl	5c79d34ef3	test language, make pubkey unique, migrations dir from config	2021-12-28 17:36:41 +01:00
Moriz Wahl	6a666edc9f	test account activation email is sent	2021-12-27 20:48:39 +01:00
elweyn	51168b9ab0	Merge changes on the UserResolver with the changes in master.	2021-12-21 12:32:46 +01:00
elweyn	ffe3cdf700	Config of resendTime to resendPassword logic	2021-12-17 11:12:52 +01:00
elweyn	da527dd162	Database logics when resending activation link	2021-12-17 11:04:12 +01:00
elweyn	8c5fff73ef	Refactoring of the sendActivationEmail so that we can send another email with a new activation link.	2021-12-17 09:49:45 +01:00
Ulf Gebhardt	8edd750912	fixed optIn Code generation - a new Code is now generated when the 10 min delay is expired	2021-12-16 12:30:04 +01:00
elweyn	c7fbb9b0bf	Changed the Login error handling so that we get the no-account message in case of a specific error, else we send the user to /reset/login	2021-12-07 10:19:29 +01:00
Ulf Gebhardt	bbd54ef607	Merge branch 'master' into login_call_resetPassword	2021-12-06 13:42:48 +01:00
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	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	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