190 Commits

Author	SHA1	Message	Date
Ulf Gebhardt	50d13b10ab	Merge branch 'combine_transaction_tables2' into refactor_arithmetic ... # Conflicts: # backend/src/config/index.ts # backend/src/graphql/model/Transaction.ts # backend/src/graphql/resolver/AdminResolver.ts # backend/src/graphql/resolver/TransactionResolver.ts # database/entity/Transaction.ts # database/src/interface/TransactionContext.ts # database/src/seeds/helpers/user-helpers.ts	2022-02-28 12:58:23 +01:00
Ulf Gebhardt	396907ce89	also make email lowercase on email functions	2022-02-28 11:55:24 +01:00
Ulf Gebhardt	ca3d4b87eb	trim and lower email to ensure future login will work	2022-02-28 11:49:06 +01:00
Ulf Gebhardt	97b4e16f40	new graphql interface, ... things build	2022-02-26 17:17:43 +01:00
ogerly	09258eb57a	rename disabled to deleted	2022-02-22 12:18:06 +01:00
Ulf Gebhardt	270ccbf1cf	removed unused symbol	2022-02-21 01:23:58 +01:00
Ulf Gebhardt	e27dcb27c6	Merge branch 'master' into refactor_user_resolver	2022-02-18 17:23:50 +01:00
Ulf Gebhardt	264270524b	some small refactors for the user resolver: ... - stop using repositories where its not needed - removed unused function	2022-02-18 13:26:57 +01:00
Ulf Gebhardt	90bdca04a6	UserResolver ... - on login have a specific message for deleted users - when trying to register also check for deleted users and prevent registration	2022-02-18 12:49:05 +01:00
Alexander Friedland	af3dd430e7	Merge branch 'master' into 1401-Admin-interface-does-user-have-member-area	2022-02-08 15:56:31 +01:00
Ulf Gebhardt	8e769e7b0e	Merge branch 'master' into remove_unnecessary_repositories	2022-02-07 13:07:55 +01:00
elweyn	346ca8fc35	Merge conflict resolved.	2022-02-07 10:45:27 +01:00
ogerly	555420a568	Remove unused imports, extract hasElopageBuys to utility.	2022-02-07 10:36:43 +01:00
Ulf Gebhardt	817e462698	fixed backend according to migration	2022-02-07 05:01:49 +01:00
Ulf Gebhardt	c63a42009e	removed references and implemented implicit active record queries	2022-02-04 15:48:04 +01:00
Ulf Gebhardt	17e2e28aec	fixed backend implementation	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	6500901e2f	lint fix	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	da349230c8	removed LoginBackupUsers entity & references from backend resolvers	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	a334c916fd	fixed business logic with only one user	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	7baf05cf14	corrected field pubKey rename	2022-02-03 21:35:15 +01:00
Ulf Gebhardt	5bc23a4857	remove typeorm from backend project and reference the one installed in database. This way the default connection of the enteties can be used - this was not possible before since the connection waa created in the backend typeorm, but the entities are defined in the database installation. ... We now remove the typeorm from backend and rely solely on the database typeorm. We now can use both activeRecord and dataMapper pattern.	2022-02-01 04:14:54 +01:00
Ulf Gebhardt	654dd8de96	check right on sendActivationEmail	2022-02-01 02:59:19 +01:00
Ulf Gebhardt	138f09b4e0	unified the mnemonic lists and simplified code	2022-01-25 00:49:53 +01:00
Ulf Gebhardt	eb33e5130a	regenerate passphrase if needed	2022-01-20 12:30:07 +01:00
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