♻️ Add login link token to email

staart · Aug 4, 2020 · 170ba99 · 170ba99
1 parent 47ceb5b
commit 170ba99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/_staart/helpers/jwt.ts b/src/_staart/helpers/jwt.ts
@@ -141,6 +141,12 @@ export const passwordResetToken = (id: number) =>
 export const loginToken = (user: users) =>
   generateToken(user, TOKEN_EXPIRY_LOGIN, Tokens.LOGIN);
 
+/**
+ * Generate a new login link JWT
+ */
+export const loginLinkToken = (user: users) =>
+  generateToken({ id: user.id }, TOKEN_EXPIRY_LOGIN, Tokens.LOGIN_LINK);
+
 /**
  * Generate a new 2FA JWT
  */

diff --git a/src/_staart/interfaces/enum.ts b/src/_staart/interfaces/enum.ts
@@ -39,6 +39,7 @@ export enum Templates {
 
 export enum Tokens {
   LOGIN = "auth",
+  LOGIN_LINK = "login-link",
   API_KEY = "api-key",
   ACCESS_TOKEN = "access-token",
   TWO_FACTOR = "2fa",

diff --git a/src/_staart/rest/auth.ts b/src/_staart/rest/auth.ts
@@ -10,7 +10,6 @@ import {
   INSUFFICIENT_PERMISSION,
   INVALID_2FA_TOKEN,
   INVALID_LOGIN,
-  MISSING_PASSWORD,
   NOT_ENABLED_2FA,
   RESOURCE_NOT_FOUND,
   USER_NOT_FOUND,
@@ -23,6 +22,7 @@ import { deleteItemFromCache } from "../helpers/cache";
 import {
   checkInvalidatedToken,
   getLoginResponse,
+  loginLinkToken,
   passwordResetToken,
   postLoginTokens,
   resendEmailVerificationToken,
@@ -86,7 +86,11 @@ export const login = async (
     throw new Error(USER_NOT_FOUND);
   }
   if (!user.password) {
-    await mail({ template: Templates.LOGIN_LINK, data: user, to: email });
+    await mail({
+      template: Templates.LOGIN_LINK,
+      data: { ...user, token: loginLinkToken(user) },
+      to: email,
+    });
     return { success: true, message: "login-link-sent" };
   }
   const isPasswordCorrect = await compare(password, user.password);