699 Commits

Author SHA1 Message Date
Moriz Wahl
662285161c time span for email code valid time 2022-03-23 14:28:24 +01:00
Hannes Heine
2457371300
Merge branch 'master' into add-referrer-id-to-users 2022-03-22 09:50:09 +01:00
Moriz Wahl
5eccddec05 test that referrerId is present 2022-03-21 17:28:48 +01:00
Alexander Friedland
1baf855265
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 14:37:04 +01:00
Moriz Wahl
62384b1056
Merge branch 'master' into no-float-ids 2022-03-21 14:05:51 +01:00
Alexander Friedland
8bbe9401b0
Merge branch 'master' into 1588-frontend-show-link-information 2022-03-21 13:08:48 +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
Moriz Wahl
384fd12b63 change parameter name to code 2022-03-20 19:00:36 +01:00
Moriz Wahl
e9357198c0 change parameter name to code 2022-03-20 18:58:20 +01:00
ogerly
1315ab4fa0 change parameter id from Int to String 2022-03-20 11:25:18 +01:00
Moriz Wahl
612b8ca69c Merge branch 'master' into no-float-ids 2022-03-19 13:07:53 +01:00
Moriz Wahl
7f6b7482b0 Int as arg type for ID 2022-03-19 12:35:34 +01:00
Moriz Wahl
8038f1bf9b include deleted links 2022-03-19 12:29:43 +01:00
Moriz Wahl
303ab94ba3
Merge branch 'master' into user-entity-in-context 2022-03-18 15:13:11 +01:00
Moriz Wahl
4c396d7581 define Int as type for args of Ids 2022-03-17 13:03:41 +01:00
Moriz Wahl
e8625cb5af remove console log 2022-03-17 11:32:52 +01:00
Moriz Wahl
f21e0ed038 only creations transaction list with admin rights 2022-03-17 11:20:26 +01:00
Moriz Wahl
577ca00c46 refactor transaction list query, do not allow user id an only creations as args any more. this query only return the transactions of the logged in user 2022-03-17 10:46:29 +01:00
Moriz Wahl
b44ef71756 no double DB calls to get user from db in resolvers 2022-03-17 10:05:07 +01:00
Moriz Wahl
fd9292b3d5 user context in admin interface 2022-03-17 09:57:19 +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
51c06741fc get test working with chages to the schema 2022-03-17 09:06:40 +01:00
Moriz Wahl
1182b94075 createUser returns User object, adopt mutations, reduce db calls in seed 2022-03-17 08:40:02 +01:00
Moriz Wahl
d1fe360157 Merge branch 'master' into seed-transaction-links 2022-03-16 22:10:16 +01:00
Moriz Wahl
7731cb9949
Merge branch 'master' into seed-transactions-in-backend 2022-03-16 19:26:28 +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
e5217640e5
Merge branch 'master' into 1319-email-optin 2022-03-16 05:11:12 +01:00
Moriz Wahl
7656649253
Merge branch 'master' into seed-in-backend 2022-03-15 21:44:05 +01:00
Moriz Wahl
5b9463ca2a seed deleted and outdated transaction links 2022-03-15 21:24:44 +01:00
Moriz Wahl
5e8e885841 fix test 2022-03-15 20:32:33 +01:00
Moriz Wahl
fef7c6b8cc rename userFactory 2022-03-15 17:41:22 +01:00
Moriz Wahl
e45e580627 setup testClient for seeding 2022-03-15 12:30:02 +01:00
Moriz Wahl
00c70311a1 use factory to create user in test, use bibi bloxberg as seeded user (no admin) 2022-03-15 11:19:19 +01:00
Moriz Wahl
004627ddcf create factory folder, move user creation in factory 2022-03-15 10:23:24 +01:00
Moriz Wahl
b30f4dfa5d copy queries and mutations from frontend and use them 2022-03-15 10:17:36 +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
Alexander Friedland
1ae4aa4e85
Merge branch 'master' into 1594-Show-if-a-transaction-was-created-by-link 2022-03-14 18:06:14 +01:00
Moriz Wahl
bc29e3d6a6 fix wrong db query in create user helper, improve isAuthorized, delete token to simulate unauthenticated 2022-03-14 16:17:11 +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
5e25e5c8eb
Merge branch 'master' into 1319-email-optin 2022-03-14 16:15:14 +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