1359 Commits

Author	SHA1	Message	Date
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	3128ede829	Merge branch 'master' into optin-valid-time	2022-03-29 00:34:04 +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	8718fdee7b	add comentary to explain the meaning of the constants	2022-03-24 17:38:03 +01:00
Moriz Wahl	ac000296da	enums for optin types	2022-03-24 17:37:07 +01:00
Moriz Wahl	30543942d8	check for valid min/max length of memeo before executing transaction	2022-03-24 14:36:16 +01:00
Moriz Wahl	0c0ce1b579	add new env variable to define email optin request time delay	2022-03-24 14:05:23 +01:00
Moriz Wahl	34d3893f1c	Merge branch 'master' into optin-valid-time	2022-03-24 14:00:41 +01:00
Moriz Wahl	bd79d63783	Merge branch 'master' into add-sender-email-to-transaction-mail	2022-03-23 20:59:31 +01:00
Moriz Wahl	3509087166	Update backend/src/mailer/text/transactionReceived.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 20:59:13 +01:00
Moriz Wahl	80a8217217	Update backend/src/mailer/sendTransactionReceivedEmail.test.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 20:58:57 +01:00
Ulf Gebhardt	20318546a8	Merge branch 'master' into enforce_config_version	2022-03-23 20:33:23 +01:00
Ulf Gebhardt	c0c6630873	make redeemCode nullable	2022-03-23 19:59:29 +01:00
Ulf Gebhardt	eaed95cdf8	Merge branch 'master' into enforce_config_version	2022-03-23 19:56:36 +01:00
Moriz Wahl	65fb882f63	Update backend/src/webhook/elopage.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-03-23 19:40:36 +01:00
Moriz Wahl	17256c27ba	test presence of sender email in transaction received email	2022-03-23 17:30:52 +01:00
Moriz Wahl	9ed400f511	add sender email to transaction received email	2022-03-23 17:27:47 +01:00
Moriz Wahl	174e1ab597	fix test	2022-03-23 17:12:09 +01:00
Moriz Wahl	cc0efb2204	test link duration in mails	2022-03-23 17:02:53 +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	3d613e72f5	add link to forgot-password	2022-03-23 16:48:35 +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	2faad50919	set email code valid time to 24h	2022-03-23 13:33:07 +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	9b53458655	fix test	2022-03-22 19:38:51 +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
Alexander Friedland	fe869e12c4	Update backend/src/graphql/resolver/UserResolver.test.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-03-22 12:31:44 +01:00
Hannes Heine	2457371300	Merge branch 'master' into add-referrer-id-to-users	2022-03-22 09:50:09 +01:00
ogerly	8a2ca07b2e	test UserResolver.test.js ok, with redeemCode	2022-03-22 07:09:58 +01:00
Moriz Wahl	98fd9d287a	Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:29:14 +01:00
Moriz Wahl	5eccddec05	test that referrerId is present	2022-03-21 17:28:48 +01:00
Moriz Wahl	2b7d9d8c1a	save referrer ID when present on register	2022-03-21 17:23:56 +01:00
Moriz Wahl	3fe6206763	Merge branch 'add-referrer-id-to-users' into 1559-frontend-transport-redeem-link-through-register	2022-03-21 17:16:00 +01:00
Moriz Wahl	88cd631bca	update database version	2022-03-21 17:04:45 +01:00
ogerly	2ea7cf6705	merge #1588 and resolve conflicts	2022-03-21 14:57:43 +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