Skip to content

fix: validation host configuration #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AVVS merged 21 commits into from
Jun 26, 2022
Merged

fix: validation host configuration #566

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
42e5384
feat: contact email
o-v-t May 20, 2022
5109f5e
feat: contact email
o-v-t May 27, 2022
f99a648
feat: contact email
o-v-t May 27, 2022
5cf53fe
feat: contact email
o-v-t May 27, 2022
797f99a
feat: contact email
o-v-t May 27, 2022
563ac9c
feat: contact email
o-v-t May 28, 2022
4245b35
feat: contact email
o-v-t May 31, 2022
3cbf23b
Merge branch 'master' into fix/remove_unverify_contact
o-v-t Jun 3, 2022
440847e
fix: remove unchalleged concat
o-v-t Jun 3, 2022
f568909
fix: remove unchalleged concat
o-v-t Jun 3, 2022
1ce6a7f
fix: remove allow remove first contact
o-v-t Jun 11, 2022
b01c434
fix: pass metadata through contact challenge
o-v-t Jun 11, 2022
5319dca
chore(merge): master into fix/remove_unchalleged_contact
o-v-t Jun 20, 2022
ec32fd1
fix: verify email on activate fix
o-v-t Jun 22, 2022
7f36511
chore(merge): master into fix/remove_unchalleged_contact
o-v-t Jun 22, 2022
1984d03
fix: verify email on activate fix
o-v-t Jun 22, 2022
ea45af7
fix: verify email on activate fix
o-v-t Jun 23, 2022
3e7eb65
fix: verify email on activate fix
o-v-t Jun 23, 2022
2dd6786
fix: fix coverage
o-v-t Jun 23, 2022
1af8c98
chore(merge): master into fix/remove_unchalleged_contact
o-v-t Jun 24, 2022
af236f6
fix: validation host configuration
o-v-t Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/utils/challenges/email/generate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ const { placeholder } = partial;
function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
const { config } = this;
const { validation, server, pwdReset } = config;
const { paths } = validation;
const { paths, hosts = {} } = validation;

// in the case of emails namespace is email where we send data to
const { wait = false, send = false } = opts;
const context = { ...ctx };
const actions = {};
const templateName = validation.templates[type] || type;
const { host } = server;
const serverConfig = { ...server, host: hosts[type] || host };

context.lng = context.i18nLocale;

Expand All @@ -45,7 +47,7 @@ function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
q: context.token.secret,
lng: context.lng,
})}`;
context.link = generateLink(server, paths[type]);
context.link = generateLink(serverConfig, paths[type]);
break;
case USERS_ACTION_ORGANIZATION_ADD:
context.qs = `?${stringify({
Expand All @@ -55,7 +57,7 @@ function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
organizationId: ctx.organizationId,
lng: context.lng,
})}`;
context.link = generateLink(server, paths[USERS_ACTION_ORGANIZATION_ADD]);
context.link = generateLink(serverConfig, paths[USERS_ACTION_ORGANIZATION_ADD]);
break;
case USERS_ACTION_ORGANIZATION_REGISTER:
context.qs = `?${stringify({
Expand All @@ -66,7 +68,7 @@ function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
organizationId: ctx.organizationId,
lng: context.lng,
})}`;
context.link = generateLink(server, paths[USERS_ACTION_ORGANIZATION_REGISTER]);
context.link = generateLink(serverConfig, paths[USERS_ACTION_ORGANIZATION_REGISTER]);
break;
case USERS_ACTION_ORGANIZATION_INVITE:
context.qs = `?${stringify({
Expand All @@ -78,7 +80,7 @@ function generate(email, type, ctx = {}, opts = {}, nodemailer = {}) {
skipPassword: ctx.skipPassword,
lng: context.lng,
})}`;
context.link = generateLink(server, paths[USERS_ACTION_ORGANIZATION_INVITE]);
context.link = generateLink(serverConfig, paths[USERS_ACTION_ORGANIZATION_INVITE]);
break;

case USERS_ACTION_PASSWORD:
Expand Down