MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
mike12345567 2021-05-05 18:13:59 +01:00
parent 2614027969
commit c37f41fbd5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ describe("/api/admin/auth", () => {
expect(sendMailMock).toHaveBeenCalled() expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0] const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code // 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] code = parts[1].split("\"")[0]
expect(code).toBeDefined() expect(code).toBeDefined()
}) })

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

@ -30,7 +30,7 @@ describe("/api/admin/users", () => {
expect(sendMailMock).toHaveBeenCalled() expect(sendMailMock).toHaveBeenCalled()
const emailCall = sendMailMock.mock.calls[0][0] const emailCall = sendMailMock.mock.calls[0][0]
// after this URL there should be a code // 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] code = parts[1].split("\"")[0]
expect(code).toBeDefined() expect(code).toBeDefined()
}) })

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

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