1227 Commits

Author SHA1 Message Date
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
elweyn
ce0cc2c1b7 Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin 2022-03-15 08:16:32 +01:00
elweyn
04bb502255 Change the logic get EMAIL_CODE_VALID_TIME config 2022-03-15 08:16: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
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
b91237d2af
Merge branch 'master' into fix_logrotate 2022-03-14 15:20:38 +01:00
elweyn
ac3340ec1c Change RESEND_TIME config name to EMAIL_CODE_VALID_TIME. 2022-03-14 12:49:34 +01:00
elweyn
00a1ed9e11 Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin 2022-03-14 12:34:13 +01:00
elweyn
4105191b04 RIGHTS for the query. 2022-03-14 12:33:10 +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
4db0235738 await for the connection to close 2022-03-14 10:19:19 +01:00
Moriz Wahl
85ca10f000 refactor: No Reset DB in Backend Unit Tests 2022-03-14 10:10:57 +01:00
21848c2b1c
reference build folders in moduleAliases 2022-03-12 04:06:03 +01:00
549f218231
module-aliases in order to have things working with NODE_ENV=production 2022-03-12 03:52:01 +01:00
Moriz Wahl
e79a583ee2 insert transactionLinkId in transaction made by redeemed link, update transaction link within commit transaction 2022-03-11 16:29:54 +01:00
Moriz Wahl
06d45c1e51 add transaction link id to transaction model 2022-03-11 16:12:13 +01:00
Moriz Wahl
6d284c8170 new DB version 2022-03-11 15:58:16 +01:00
Moriz Wahl
826ad7019c add TODO 2022-03-11 15:33:36 +01:00
Moriz Wahl
13c61984de liniting 2022-03-11 15:27:02 +01:00
Moriz Wahl
df7406b145 Merge branch 'master' into redeem-transaction-link-mutation 2022-03-11 15:25:24 +01:00
Moriz Wahl
13fe4300d2 extract transaction process in function 2022-03-11 15:19:01 +01:00
Moriz Wahl
5d21c25240 also list depricated links 2022-03-11 14:39:12 +01:00
Moriz Wahl
0267a31515 use paginated for args 2022-03-11 14:19:48 +01:00
Moriz Wahl
7c104fc705 Merge branch 'master' into transaction-link-list-query 2022-03-11 14:13:46 +01:00
Moriz Wahl
9912c8913b prevent linter 2022-03-11 14:10:31 +01:00
Moriz Wahl
b54278a080
Merge branch 'master' into virtual-link-transaction 2022-03-11 14:01:42 +01:00
Moriz Wahl
4affd35a44
Update backend/src/graphql/resolver/TransactionResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-11 14:01:35 +01:00
Moriz Wahl
e78337d9ef
Update backend/src/graphql/enum/TransactionTypeId.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-11 14:01:04 +01:00
Moriz Wahl
489ab233b9 define type of arg offset 2022-03-11 13:59:33 +01:00
Moriz Wahl
d46cb9a63c
Merge branch 'master' into transaction-link-list-query 2022-03-11 13:51:22 +01:00
Moriz Wahl
81cd858eb4 call transaction resolver to redeem transactoin link. Optional senderId parameter for sendCoins to redeem links 2022-03-11 13:47:04 +01:00
c042df8714
remove one unnecessary conditional check 2022-03-11 13:12:44 +01:00
Moriz Wahl
fed268afb6 tpye number for offset arg 2022-03-11 12:44:55 +01:00
Moriz Wahl
cda9ee196d tpye number for offset arg 2022-03-11 12:44:32 +01:00
Moriz Wahl
277d0a4b38 set rights 2022-03-11 12:41:13 +01:00
Moriz Wahl
6880fb628e feat: List Transaction Links Query 2022-03-11 12:29:10 +01:00
Moriz Wahl
80201c6fb1 Merge branch 'virtual-link-transaction' into transaction-link-list-query 2022-03-11 12:24:02 +01:00
Moriz Wahl
d62862fab8
Merge branch 'master' into virtual-link-transaction 2022-03-11 11:59:43 +01:00
Moriz Wahl
428e29f5d9 refactor: Transaction Link Query 2022-03-11 11:55:06 +01:00
Moriz Wahl
7f9745c7a4
Merge branch 'master' into remove-showEmail 2022-03-11 11:22:32 +01:00
Moriz Wahl
5300f5db12
Merge branch 'master' into remove-showEmail 2022-03-11 11:15:33 +01:00
Moriz Wahl
50092b0f15 Merge branch 'master' into delete-transaction-link-mutation 2022-03-11 11:14:23 +01:00
Moriz Wahl
e42c91f6e0 rename summary query 2022-03-11 11:07:15 +01:00
Moriz Wahl
80944978ac only one file for virtual transactions 2022-03-11 10:58:14 +01:00
Moriz Wahl
24a0c2d1e4 no calculation in virtual link transaction 2022-03-11 10:46:24 +01:00
Moriz Wahl
120ce948cd
Update backend/src/graphql/resolver/TransactionResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-03-11 10:38:37 +01:00
Moriz Wahl
762ad9fe9e
Merge branch 'master' into virtual-link-transaction 2022-03-11 10:36:41 +01:00
Moriz Wahl
df94fa8e37 improved query 2022-03-11 10:21:07 +01:00