IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

change {code} to {optin} to avoid confusion when redeem code is provided

Browse Source
This commit is contained in:
Moriz Wahl 2022-03-23 09:05:39 +01:00
parent 1c8e1df1b5
commit 767387bb7c
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/.env.dist
View File

@ -38,8 +38,8 @@ EMAIL_SENDER=info@gradido.net
EMAIL_PASSWORD=xxx
EMAIL_SMTP_URL=gmail.com
EMAIL_SMTP_PORT=587
EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{code}
EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{optin}
EMAIL_LINK_SETPASSWORD=http://localhost/reset/{optin}
EMAIL_CODE_VALID_TIME=10
# Webhook

4
backend/src/config/index.ts
View File

@ -62,9 +62,9 @@ const email = {
EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'gmail.com',
EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587',
EMAIL_LINK_VERIFICATION:
process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{code}',
process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{optin}',
EMAIL_LINK_SETPASSWORD:
process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{code}',
process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset-password/{optin}',
EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME
? parseInt(process.env.EMAIL_CODE_VALID_TIME) || 10
: 10,

2
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -124,7 +124,7 @@ describe('UserResolver', () => {
describe('account activation email', () => {
it('sends an account activation email', () => {
const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{code}/g, emailOptIn)
const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{optin}/g, emailOptIn)
expect(sendAccountActivationEmail).toBeCalledWith({
link: activationLink,
firstName: 'Peter',

6
backend/src/graphql/resolver/UserResolver.ts
View File

@ -368,7 +368,7 @@ export class UserResolver {
const emailOptIn = await createEmailOptIn(dbUser.id, queryRunner)
let activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
/{code}/g,
/{optin}/g,
emailOptIn.verificationCode.toString(),
)
@ -417,7 +417,7 @@ export class UserResolver {
const emailOptIn = await createEmailOptIn(user.id, queryRunner)
const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
/{code}/g,
/{optin}/g,
emailOptIn.verificationCode.toString(),
)
@ -456,7 +456,7 @@ export class UserResolver {
const optInCode = await getOptInCode(user.id)
const link = CONFIG.EMAIL_LINK_SETPASSWORD.replace(
/{code}/g,
/{optin}/g,
optInCode.verificationCode.toString(),
)