Browse Source

Making the code a query string parameter for invite/reset urls.

pull/4023/head
mike12345567 5 years ago
parent
commit
b3292e991a
  1. 2
      packages/worker/src/api/routes/tests/auth.spec.js
  2. 2
      packages/worker/src/api/routes/tests/users.spec.js
  3. 4
      packages/worker/src/utilities/templates.js

2
packages/worker/src/api/routes/tests/auth.spec.js

@ -30,7 +30,7 @@ describe("/api/admin/auth", () => {
expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code
const parts = emailCall.html.split("http://localhost:10000/reset/")
const parts = emailCall.html.split("http://localhost:10000/reset?code=")
code = parts[1].split("\"")[0]
expect(code).toBeDefined()
})

2
packages/worker/src/api/routes/tests/users.spec.js

@ -30,7 +30,7 @@ describe("/api/admin/users", () => {
expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code
const parts = emailCall.html.split("http://localhost:10000/invite/")
const parts = emailCall.html.split("http://localhost:10000/invite?code=")
code = parts[1].split("\"")[0]
expect(code).toBeDefined()
})

4
packages/worker/src/utilities/templates.js

@ -35,13 +35,13 @@ exports.getSettingsTemplateContext = async (purpose, code = null) => {
case EmailTemplatePurpose.PASSWORD_RECOVERY:
context[TemplateBindings.RESET_CODE] = code
context[TemplateBindings.RESET_URL] = checkSlashesInUrl(
`${URL}/reset/${code}`
`${URL}/reset?code=${code}`
)
break
case EmailTemplatePurpose.INVITATION:
context[TemplateBindings.INVITE_CODE] = code
context[TemplateBindings.REGISTRATION_URL] = checkSlashesInUrl(
`${URL}/invite/${code}`
`${URL}/invite?code=${code}`
)
break
}

Loading…
Cancel
Save