Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

📧 fix: Ensure User Verification for Instances without Email Service (#2998)

Danny Avila35f8053f456a
diff --git a/api/server/controllers/auth/LoginController.js b/api/server/controllers/auth/LoginController.js
index 414be8253e..925eb21d77 100644
--- a/api/server/controllers/auth/LoginController.js
+++ b/api/server/controllers/auth/LoginController.js
@@ -1,8 +1,11 @@
const { setAuthTokens } = require('~/server/services/AuthService');
-const { getUserById } = require('~/models/userMethods');
-const { isEnabled } = require('~/server/utils');
+const { getUserById, updateUser } = require('~/models/userMethods');
+const { isEnabled, checkEmailConfig } = require('~/server/utils');
const { logger } = require('~/config');
+// Unix timestamp for 2024-06-07 15:20:18 Eastern Time
+const verificationEnabledTimestamp = 1717788018;
+
const loginController = async (req, res) => {
try {
const user = await getUserById(req.user._id, '-password -__v');
@@ -12,6 +15,18 @@ const loginController = async (req, res) => {
return res.status(400).json({ message: 'Invalid credentials' });
}
+ const emailEnabled = checkEmailConfig();
+ const userCreatedAtTimestamp = Math.floor(new Date(user.createdAt).getTime() / 1000);
+
+ if (
+ !emailEnabled &&
+ !user.emailVerified &&
+ userCreatedAtTimestamp < verificationEnabledTimestamp
+ ) {
+ await updateUser(user._id, { emailVerified: true });
+ user.emailVerified = true;
+ }
+
if (!user.emailVerified && !isEnabled(process.env.ALLOW_UNVERIFIED_EMAIL_LOGIN)) {
return res.status(422).json({ message: 'Email not verified' });
}
@@ -21,10 +36,9 @@ const loginController = async (req, res) => {
return res.status(200).send({ token, user });
} catch (err) {
logger.error('[loginController]', err);
- }
- // Generic error messages are safer
- return res.status(500).json({ message: 'Something went wrong' });
+ return res.status(500).json({ message: 'Something went wrong' });
+ }
};
module.exports = {