Linty fresh and pretty

lib/constants/defaults.ts

@@ -0,0 +1,4 @@
+export const PORT = 9000;
+export const API_PATH = '/api';
+export const AUTH_ROUTE = '/auth';
+export const RESET_ROUTE = `${AUTH_ROUTE}/reset`;

lib/schema/auth.ts

@@ -6,6 +6,7 @@ import { STRATEGIES } from '../constants/strategies';
 import { TokenProps, sign, verify as verifyJwt } from '../utils/jwt';
 import { encrypt, verify as verifyPassword } from '../utils/password';
 import { generateResetToken } from '../utils/tokens';
+import { getPasswordResetLink } from '../utils/links';
 
 export type Auth = {
     is2FA?: boolean;
@@ -65,12 +66,9 @@ AuthSchema.methods = {
     },
 
     async getResetLink(route) {
-        const resetToken = await this.getResetToken();
+        const token = await this.getResetToken();
-        if (resetToken) {
+        if (token) {
-            let resetRoute = route;
+            const resetUrl = getPasswordResetLink(token);
-            resetRoute = resetRoute.replace(':user_id', this._id);
-            resetRoute = resetRoute.replace(':reset_token?', resetToken);
-            const resetUrl = `${process.env.URL}${resetRoute}`;
             console.log('[sendPasswordReset] resetUrl:', resetUrl);
             return resetUrl;
         }
@@ -109,13 +107,13 @@ AuthSchema.methods = {
 };
 
 AuthSchema.statics = {
-    // authenticateAndGetRecordLocator: async function (username, password) {
+    authenticateAndGetRecordLocator: async function (username, password) {
-    //     const auth = await this.findByUserName(username);
+        const auth = await this.findByUsername(username);
-    //     if (auth && auth.authenticate(password)) {
+        if (auth && auth.authenticate(password)) {
-    //         return auth?.record;
+            return auth.record;
-    //     }
+        }
-    //     return false;
+        return false;
-    // },
+    },
 
     async findByUsername(username) {
         return this.findOne({ username });

lib/server.ts

@@ -2,10 +2,11 @@ import dotenv from 'dotenv';
 
 import app from './app';
 import { connection } from './database/database.connection';
+import { PORT as DEFAULT_PORT } from './constants/defaults';
 
 dotenv.config();
 
-const PORT: number = Number(process.env.PORT) || 9000;
+const PORT: number = Number(process.env.PORT) || DEFAULT_PORT;
 
 connection.then(
     () => app.listen(PORT),

lib/utils/auth.ts

@@ -5,7 +5,7 @@ import { sign } from './jwt';
 export const getAuthenticationBundle = async (username: string, password: string) => {
     const auth = await Auth.findByUsername(username).catch();
     const isAuthenticated = !!auth && (auth as AuthModel).authenticate(password);
-    const record = isAuthenticated ? (auth as AuthPrivate).record as string : null;
+    const record = isAuthenticated ? ((auth as AuthPrivate).record as string) : null;
     const token = sign(record || undefined);
     return {
         record,

lib/utils/links.ts

@@ -0,0 +1,7 @@
+import { API_PATH, PORT, RESET_ROUTE } from '../constants/defaults';
+
+export const getPasswordResetLink = (token: string) => {
+    const hostname = process.env.HOST_NAME || `localhost:${process.env.PORT || PORT}`;
+    const path = `${process.env.API_PATH || API_PATH}${process.env.RESET_ROUTE || RESET_ROUTE}`;
+    return `https://${hostname}${path}?t=${token}`;
+};