272 Commits

Author	SHA1	Message	Date
Moriz Wahl	807922a8d5	redeem code in email link config	2022-03-23 09:17:15 +01:00
Moriz Wahl	767387bb7c	change {code} to {optin} to avoid confusion when redeem code is provided	2022-03-23 09:05:39 +01:00
Moriz Wahl	9c8599528e	allow null for redeemCode	2022-03-22 19:24:58 +01:00
Alexander Friedland	eda69bfc47	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-22 12:34:17 +01:00
Alexander Friedland	7929b93964	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-22 12:33:10 +01:00
Moriz Wahl	2b7d9d8c1a	save referrer ID when present on register	2022-03-21 17:23:56 +01:00
ogerly	2ea7cf6705	merge #1588 and resolve conflicts	2022-03-21 14:57:43 +01:00
elweyn	ed1c3bf137	Withdrew else block after throwing an error.	2022-03-21 12:44:03 +01:00
Ulf Gebhardt	c83959fc58	Merge branch 'master' into 1319-email-optin	2022-03-21 12:30:57 +01:00
ogerly	a23777b6ec	uncomment code activationLink	2022-03-21 12:07:59 +01:00
ogerly	15e0186381	add redeemCode on register process for createUser	2022-03-21 10:54:56 +01:00
ogerly	3992882962	add redeemCode on UserResolver.ts	2022-03-21 10:29:56 +01:00
Moriz Wahl	303ab94ba3	Merge branch 'master' into user-entity-in-context	2022-03-18 15:13:11 +01:00
Moriz Wahl	ac11d1fa60	store user entity created on authentication check in context to avoid further DB calls	2022-03-17 09:55:15 +01:00
Moriz Wahl	1182b94075	createUser returns User object, adopt mutations, reduce db calls in seed	2022-03-17 08:40:02 +01:00
elweyn	c2119aa410	Change the error message to match the behavior of the code.	2022-03-16 05:38:33 +01:00
elweyn	085e2b5021	Add method to check if OptInCode isValid.	2022-03-16 05:35:16 +01:00
elweyn	62b4e554f3	Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin	2022-03-16 05:30:49 +01:00
Hannes Heine	de88da40c1	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-16 05:23:10 +01:00
Hannes Heine	e9ff0a8ed1	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-16 05:22:51 +01:00
Hannes Heine	623ba8e86b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-16 05:22:40 +01:00
elweyn	e20182bff3	Change the parseInt of CONFIG.EMAIL_CODE_VALID_TIME.toString with only the int of the config.	2022-03-16 05:21:58 +01:00
Hannes Heine	507b9975a3	Merge branch 'master' into 1319-email-optin	2022-03-15 08:28:17 +01:00
elweyn	d4adb3b682	Revert change so that if the timeElapsed is less or equal to the max time their is no new email that is send.	2022-03-15 08:26:38 +01:00
elweyn	09c215bd50	Change Error message formating.	2022-03-15 08:19:27 +01:00
Hannes Heine	506df5268a	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:15:42 +01:00
Hannes Heine	82e453c27b	Update backend/src/graphql/resolver/UserResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-14 16:14:52 +01:00
Moriz Wahl	60e83b56d1	feat: Test Logout	2022-03-14 12:56:58 +01:00
elweyn	ac3340ec1c	Change RESEND_TIME config name to EMAIL_CODE_VALID_TIME.	2022-03-14 12:49:34 +01:00
elweyn	c3f7953bdb	Create a query to check if OptIn code is not to old.	2022-03-14 12:32:42 +01:00
Moriz Wahl	0136a22f0c	resolve relative paths in resolvers	2022-03-07 21:35:50 +01:00
Ulf Gebhardt	cc596df22a	validate valitity of userpassword when updating it via updateUserInfos	2022-03-07 13:31:33 +01:00
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