models/user: attach EmailConfirmationStates via function call

Author: clairep94

server/config/passport.js

@@ -162,7 +162,7 @@ passport.use(
           if (!req.user.github) {
             req.user.github = profile.id;
             req.user.tokens.push({ kind: 'github', accessToken });
-            req.user.verified = User.EmailConfirmation.Verified;
+            req.user.verified = User.EmailConfirmation().Verified;
           }
           await req.user.save();
           return done(null, req.user);
@@ -193,7 +193,7 @@ passport.use(
           existingEmailUser.tokens.push({ kind: 'github', accessToken });
           existingEmailUser.name =
             existingEmailUser.name || profile.displayName;
-          existingEmailUser.verified = User.EmailConfirmation.Verified;
+          existingEmailUser.verified = User.EmailConfirmation().Verified;
 
           await existingEmailUser.save();
           return done(null, existingEmailUser);
@@ -214,7 +214,7 @@ passport.use(
         user.username = profile.username;
         user.tokens.push({ kind: 'github', accessToken });
         user.name = profile.displayName;
-        user.verified = User.EmailConfirmation.Verified;
+        user.verified = User.EmailConfirmation().Verified;
         await user.save();
 
         return done(null, user);
@@ -264,7 +264,7 @@ passport.use(
           if (!req.user.google) {
             req.user.google = profile._json.emails[0].value;
             req.user.tokens.push({ kind: 'google', accessToken });
-            req.user.verified = User.EmailConfirmation.Verified;
+            req.user.verified = User.EmailConfirmation().Verified;
           }
           await req.user.save();
           return done(null, req.user);
@@ -293,7 +293,7 @@ passport.use(
           });
           existingEmailUser.name =
             existingEmailUser.name || profile._json.displayName;
-          existingEmailUser.verified = User.EmailConfirmation.Verified;
+          existingEmailUser.verified = User.EmailConfirmation().Verified;
 
           await existingEmailUser.save();
           return done(null, existingEmailUser);
@@ -305,7 +305,7 @@ passport.use(
         user.username = username;
         user.tokens.push({ kind: 'google', accessToken });
         user.name = profile._json.displayName;
-        user.verified = User.EmailConfirmation.Verified;
+        user.verified = User.EmailConfirmation().Verified;
 
         await user.save();
         return done(null, user);

server/controllers/user.controller.js

@@ -59,7 +59,7 @@ export async function createUser(req, res) {
       username,
       email: emailLowerCase,
       password,
-      verified: User.EmailConfirmation.Sent,
+      verified: User.EmailConfirmation().Sent,
       verifiedToken: token,
       verifiedTokenExpires: EMAIL_VERIFY_TOKEN_EXPIRY_TIME
     });
@@ -190,7 +190,7 @@ export async function emailVerificationInitiate(req, res) {
       res.status(404).json({ error: 'User not found' });
       return;
     }
-    if (user.verified === User.EmailConfirmation.Verified) {
+    if (user.verified === User.EmailConfirmation().Verified) {
       res.status(409).json({ error: 'Email already verified' });
       return;
     }
@@ -209,7 +209,7 @@ export async function emailVerificationInitiate(req, res) {
       return;
     }
     const EMAIL_VERIFY_TOKEN_EXPIRY_TIME = Date.now() + 3600000 * 24; // 24 hours
-    user.verified = User.EmailConfirmation.Resent;
+    user.verified = User.EmailConfirmation().Resent;
     user.verifiedToken = token;
     user.verifiedTokenExpires = EMAIL_VERIFY_TOKEN_EXPIRY_TIME; // 24 hours
     await user.save();
@@ -233,7 +233,7 @@ export async function verifyEmail(req, res) {
     });
     return;
   }
-  user.verified = User.EmailConfirmation.Verified;
+  user.verified = User.EmailConfirmation().Verified;
   user.verifiedToken = null;
   user.verifiedTokenExpires = null;
   await user.save();
@@ -315,7 +315,7 @@ export async function updateSettings(req, res) {
       await saveUser(res, user);
     } else if (user.email !== req.body.email) {
       const EMAIL_VERIFY_TOKEN_EXPIRY_TIME = Date.now() + 3600000 * 24; // 24 hours
-      user.verified = User.EmailConfirmation.Sent;
+      user.verified = User.EmailConfirmation().Sent;
 
       user.email = req.body.email;
 

server/models/user.ts

@@ -8,12 +8,6 @@ import {
 } from '../types';
 import { apiKeySchema } from './apiKey';
 
-// const EmailConfirmationStates = {
-//   Verified: 'verified',
-//   Sent: 'sent',
-//   Resent: 'resent'
-// };
-
 const userSchema = new Schema<UserDocument, UserModel>(
   {
     name: { type: String, default: '' },
@@ -340,11 +334,11 @@ userSchema.statics.findByEmailAndUsername = async function findByEmailAndUsernam
   return foundUser;
 };
 
-// userSchema.statics.EmailConfirmation = EmailConfirmationStates;
-
 userSchema.index({ username: 1 }, { collation: { locale: 'en', strength: 2 } });
 userSchema.index({ email: 1 }, { collation: { locale: 'en', strength: 2 } });
 
+userSchema.statics.EmailConfirmation = () => EmailConfirmationStates;
+
 export const User =
   (mongoose.models.User as UserModel) ||
   mongoose.model<UserDocument, UserModel>('User', userSchema);

server/types/email.ts

@@ -1,9 +1,9 @@
 /** Possible email confirmation states */
-export enum EmailConfirmationStates {
-  Verified = 'verified',
-  Sent = 'sent',
-  Resent = 'resent'
-}
+export const EmailConfirmationStates = {
+  Verified: 'verified',
+  Sent: 'sent',
+  Resent: 'resent'
+} as const;
 
 /** Rendered mail data for the mailer service, without the 'from' property, which will be automatically added */
 export interface RenderedMailerData {

server/types/user.ts

@@ -71,5 +71,6 @@ export interface UserModel extends Model<UserDocument> {
     email: string,
     username: string
   ): Promise<UserDocument | null>;
-  EmailConfirmation: typeof EmailConfirmationStates;
+
+  EmailConfirmation(): typeof EmailConfirmationStates;
 }