email can't be null, username removed since email can't be null
This commit is contained in:
@@ -43,13 +43,11 @@ router.post(
|
||||
validateRegistration,
|
||||
async (req, res) => {
|
||||
try {
|
||||
const { username, email, password, firstName, lastName, phone } =
|
||||
const { email, password, firstName, lastName, phone } =
|
||||
req.body;
|
||||
|
||||
const existingUser = await User.findOne({
|
||||
where: {
|
||||
[require("sequelize").Op.or]: [{ email }, { username }],
|
||||
},
|
||||
where: { email },
|
||||
});
|
||||
|
||||
if (existingUser) {
|
||||
@@ -96,7 +94,6 @@ router.post(
|
||||
}
|
||||
|
||||
const user = await User.create({
|
||||
username,
|
||||
email,
|
||||
password,
|
||||
firstName,
|
||||
@@ -161,14 +158,12 @@ router.post(
|
||||
const reqLogger = logger.withRequestId(req.id);
|
||||
reqLogger.info("User registration successful", {
|
||||
userId: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
});
|
||||
|
||||
res.status(201).json({
|
||||
user: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
@@ -184,7 +179,6 @@ router.post(
|
||||
error: error.message,
|
||||
stack: error.stack,
|
||||
email: req.body.email,
|
||||
username: req.body.username,
|
||||
});
|
||||
res.status(500).json({ error: "Registration failed. Please try again." });
|
||||
}
|
||||
@@ -265,7 +259,6 @@ router.post(
|
||||
res.json({
|
||||
user: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
@@ -326,9 +319,9 @@ router.post(
|
||||
} = payload;
|
||||
|
||||
if (!email) {
|
||||
return res
|
||||
.status(400)
|
||||
.json({ error: "Email not provided by Google" });
|
||||
return res.status(400).json({
|
||||
error: "Email permission is required to continue. Please grant email access when signing in with Google and try again."
|
||||
});
|
||||
}
|
||||
|
||||
// Handle cases where Google doesn't provide name fields
|
||||
@@ -375,7 +368,6 @@ router.post(
|
||||
authProvider: "google",
|
||||
providerId: googleId,
|
||||
profileImage: picture,
|
||||
username: email.split("@")[0] + "_" + googleId.slice(-6), // Generate unique username
|
||||
isVerified: true,
|
||||
verifiedAt: new Date(),
|
||||
});
|
||||
@@ -439,7 +431,6 @@ router.post(
|
||||
res.json({
|
||||
user: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
@@ -677,7 +668,6 @@ router.post("/refresh", async (req, res) => {
|
||||
res.json({
|
||||
user: {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
firstName: user.firstName,
|
||||
lastName: user.lastName,
|
||||
|
||||
Reference in New Issue
Block a user