397 Commits

Author SHA1 Message Date
Moriz Wahl
0264931e58 test update user infos mutation. Remove publisher ID from update user infos as it is never used 2022-04-25 14:07:31 +02:00
Moriz Wahl
64859a71f4 use isAdmin on user to determine if user is admin 2022-04-20 11:27:09 +02:00
Moriz Wahl
6cc8410720 helper function to get user from context 2022-04-11 16:15:57 +02:00
Moriz Wahl
4d09123b0e remove global no explicit any lint rule 2022-04-11 15:55:05 +02:00
Moriz Wahl
97ee572c3a Merge branch 'fix-elopage-status' into define-context-object 2022-04-11 15:50:52 +02:00
Moriz Wahl
57298a4d3a use Context interface in user resolver 2022-04-11 15:50:46 +02:00
Moriz Wahl
f57f67846e reconstruct context object 2022-04-11 14:58:00 +02:00
Moriz Wahl
f3948b39be pass context object to hasElopage query 2022-04-05 14:50:45 +02:00
Moriz Wahl
3078315286 change name and tpye of query sendResetPasswordEmail to mutation forgotPassword. Do not throw when email is not found 2022-03-30 18:24:44 +02:00
Moriz Wahl
07ad22b71d change function name to print time duration 2022-03-29 20:10:00 +02:00
Moriz Wahl
9eda41b24a Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email 2022-03-29 00:59:47 +02:00
Moriz Wahl
37e36e01af do not remove optin code in DB after email verification 2022-03-29 00:51:44 +02:00
Moriz Wahl
cb90249301 rename function, add parameter for optinType, sort by updatedAt DESC 2022-03-29 00:50:50 +02:00
Moriz Wahl
5456affb9c fix logic (not canResendOptIn), fix error strings 2022-03-24 19:27:32 +01:00
Moriz Wahl
9da2047e8c move sendActivationEmail mutation from user to admin resolver 2022-03-24 19:14:59 +01:00
Moriz Wahl
1e3300ad5a use optIn as naming convention 2022-03-24 18:38:24 +01:00
Moriz Wahl
607805075c refactor sendActivationEmail, get rid of getOptInCode function 2022-03-24 18:33:07 +01:00
Moriz Wahl
965ab22bab create helper functions for time management, rename some functions 2022-03-24 18:17:46 +01:00
Moriz Wahl
7cd920686d helper function to create a new email optin object. Use this in create user 2022-03-24 17:50:34 +01:00
Moriz Wahl
ac000296da enums for optin types 2022-03-24 17:37:07 +01:00
Moriz Wahl
34d3893f1c Merge branch 'master' into optin-valid-time 2022-03-24 14:00:41 +01:00
Moriz Wahl
f1686523df add link information to reset password email 2022-03-23 16:57:04 +01:00
Moriz Wahl
d1644ad2ae add information about link duration and how to get a new link in email 2022-03-23 16:49:30 +01:00
Moriz Wahl
ca0d97c47c test printEmailCodeValidTime 2022-03-23 16:03:52 +01:00
Moriz Wahl
662285161c time span for email code valid time 2022-03-23 14:28:24 +01:00
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
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