Merge pull request #576 from nhost/magic-link-register

Use register instead of sign-up for Magic Link
nhost · Jun 8, 2021 · b79346c · b79346c
2 parents 2a8106b + ea7acd6
commit b79346c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/routes/auth/auth.test.ts b/src/routes/auth/auth.test.ts
@@ -74,7 +74,7 @@ it('should create an account without a password when magic link login is enabled
       await deleteMailHogEmail(message)
 
       {
-        const { status } = await request.get(`/auth/magic-link?action=sign-up&token=${token}`)
+        const { status } = await request.get(`/auth/magic-link?action=register&token=${token}`)
         expect(status).toBe(302)
       }
     }
@@ -275,7 +275,7 @@ it('should sign the user in without password when magic link is enabled', async
       const token = await getHeaderFromLatestEmailAndDelete(email, 'X-Token')
 
       {
-        const { status } = await request.get(`/auth/magic-link?action=sign-up&token=${token}`)
+        const { status } = await request.get(`/auth/magic-link?action=register&token=${token}`)
         expect(status).toBe(302)
       }
 

diff --git a/src/routes/auth/magic-link.ts b/src/routes/auth/magic-link.ts
@@ -13,7 +13,7 @@ async function magicLink({ query }: Request, res: Response): Promise<unknown> {
   const { token, action } = await magicLinkQuery.validateAsync(query);
   const useCookie = typeof query.cookie !== 'undefined' ? query.cookie === 'true' : true
   let refresh_token = token;
-  if (action === 'sign-up') {
+  if (action === 'register') {
     const new_ticket = uuidv4()
     let hasuraData: UpdateAccountData
     try {

diff --git a/src/routes/auth/register.ts b/src/routes/auth/register.ts
@@ -118,8 +118,8 @@ async function registerAccount(req: Request, res: Response): Promise<unknown> {
             display_name,
             token: ticket,
             url: APPLICATION.SERVER_URL,
-            action: 'sign up',
-            action_url: 'sign-up'
+            action: 'register',
+            action_url: 'register'
           }
         })
       } catch (err) {

diff --git a/src/shared/validation.ts b/src/shared/validation.ts
@@ -158,6 +158,6 @@ export const fileMetadataUpdate = Joi.object({
 
 export const magicLinkQuery = Joi.object({
   token: Joi.string().required(),
-  action: Joi.string().valid('log-in', 'sign-up').required(),
+  action: Joi.string().valid('log-in', 'register').required(),
   cookie: Joi.boolean().optional(),
 });