Jackie/rentall-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

email can't be null, username removed since email can't be null

Browse Source
This commit is contained in:
jackiettran
2025-11-24 15:41:35 -05:00
parent 6aac929ec1
commit 532f3014df
6 changed files with 59 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/middleware/validation.js
View File

@@ -110,16 +110,6 @@ const validateRegistration = [
"Last name can only contain letters, spaces, hyphens, and apostrophes" "Last name can only contain letters, spaces, hyphens, and apostrophes"
), ),
body("username")
.optional()
.trim()
.isLength({ min: 3, max: 30 })
.withMessage("Username must be between 3 and 30 characters")
.matches(/^[a-zA-Z0-9_-]+$/)
.withMessage(
"Username can only contain letters, numbers, underscores, and hyphens"
),
body("phone") body("phone")
.optional() .optional()
.isMobilePhone() .isMobilePhone()

7
backend/models/User.js
View File

@@ -10,15 +10,10 @@ const User = sequelize.define(
defaultValue: DataTypes.UUIDV4, defaultValue: DataTypes.UUIDV4,
primaryKey: true, primaryKey: true,
}, },
username: {
type: DataTypes.STRING,
unique: true,
allowNull: true,
},
email: { email: {
type: DataTypes.STRING, type: DataTypes.STRING,
unique: true, unique: true,
allowNull: true, allowNull: false,
validate: { validate: {
isEmail: true, isEmail: true,
}, },

20
backend/routes/auth.js
View File

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

42
backend/routes/forum.js
View File

@@ -95,7 +95,7 @@ router.get('/posts', optionalAuth, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: PostTag, model: PostTag,
@@ -170,12 +170,12 @@ router.get('/posts/:id', optionalAuth, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'role'] attributes: ['id', 'firstName', 'lastName', 'role']
}, },
{ {
model: User, model: User,
as: 'closer', as: 'closer',
attributes: ['id', 'username', 'firstName', 'lastName', 'role'], attributes: ['id', 'firstName', 'lastName', 'role'],
required: false required: false
}, },
{ {
@@ -191,7 +191,7 @@ router.get('/posts/:id', optionalAuth, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'role'] attributes: ['id', 'firstName', 'lastName', 'role']
} }
] ]
} }
@@ -335,7 +335,7 @@ router.post('/posts', authenticateToken, uploadForumPostImages, async (req, res)
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: PostTag, model: PostTag,
@@ -524,7 +524,7 @@ router.put('/posts/:id', authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: PostTag, model: PostTag,
@@ -622,7 +622,7 @@ router.patch('/posts/:id/status', authenticateToken, async (req, res) => {
(async () => { (async () => {
try { try {
const closerUser = await User.findByPk(req.user.id, { const closerUser = await User.findByPk(req.user.id, {
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
}); });
const postWithAuthor = await ForumPost.findByPk(post.id, { const postWithAuthor = await ForumPost.findByPk(post.id, {
@@ -630,7 +630,7 @@ router.patch('/posts/:id/status', authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
] ]
}); });
@@ -702,12 +702,12 @@ router.patch('/posts/:id/status', authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: User, model: User,
as: 'closer', as: 'closer',
attributes: ['id', 'username', 'firstName', 'lastName'], attributes: ['id', 'firstName', 'lastName'],
required: false required: false
}, },
{ {
@@ -790,13 +790,13 @@ router.patch('/posts/:id/accept-answer', authenticateToken, async (req, res) =>
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
] ]
}); });
const postAuthor = await User.findByPk(req.user.id, { const postAuthor = await User.findByPk(req.user.id, {
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
}); });
const postWithAuthor = await ForumPost.findByPk(post.id, { const postWithAuthor = await ForumPost.findByPk(post.id, {
@@ -804,7 +804,7 @@ router.patch('/posts/:id/accept-answer', authenticateToken, async (req, res) =>
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
] ]
}); });
@@ -882,7 +882,7 @@ router.patch('/posts/:id/accept-answer', authenticateToken, async (req, res) =>
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: PostTag, model: PostTag,
@@ -972,7 +972,7 @@ router.post('/posts/:id/comments', authenticateToken, uploadForumCommentImages,
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
] ]
}); });
@@ -984,7 +984,7 @@ router.post('/posts/:id/comments', authenticateToken, uploadForumCommentImages,
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
] ]
}); });
@@ -1027,7 +1027,7 @@ router.post('/posts/:id/comments', authenticateToken, uploadForumCommentImages,
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName', 'email'] attributes: ['id', 'firstName', 'lastName', 'email']
} }
], ],
group: ['ForumComment.authorId', 'author.id'] group: ['ForumComment.authorId', 'author.id']
@@ -1102,7 +1102,7 @@ router.put('/comments/:id', authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
} }
] ]
}); });
@@ -1177,7 +1177,7 @@ router.get('/my-posts', authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: 'author', as: 'author',
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}, },
{ {
model: PostTag, model: PostTag,
@@ -1294,7 +1294,7 @@ router.delete('/admin/posts/:id', authenticateToken, requireAdmin, async (req, r
(async () => { (async () => {
try { try {
const admin = await User.findByPk(req.user.id, { const admin = await User.findByPk(req.user.id, {
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}); });
if (post.author && admin) { if (post.author && admin) {
@@ -1422,7 +1422,7 @@ router.delete('/admin/comments/:id', authenticateToken, requireAdmin, async (req
(async () => { (async () => {
try { try {
const admin = await User.findByPk(req.user.id, { const admin = await User.findByPk(req.user.id, {
attributes: ['id', 'username', 'firstName', 'lastName'] attributes: ['id', 'firstName', 'lastName']
}); });
if (comment.author && admin && post) { if (comment.author && admin && post) {

18
backend/routes/items.js
View File

@@ -43,7 +43,7 @@ router.get("/", async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
limit: parseInt(limit), limit: parseInt(limit),
@@ -180,12 +180,12 @@ router.get("/:id", optionalAuth, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "deleter", as: "deleter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -242,7 +242,7 @@ router.post("/", authenticateToken, requireVerifiedEmail, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName", "email", "stripeConnectedAccountId"], attributes: ["id", "firstName", "lastName", "email", "stripeConnectedAccountId"],
}, },
], ],
}); });
@@ -307,7 +307,7 @@ router.put("/:id", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -378,7 +378,7 @@ router.delete("/admin/:id", authenticateToken, requireAdmin, async (req, res) =>
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName", "email"], attributes: ["id", "firstName", "lastName", "email"],
}, },
], ],
}); });
@@ -422,12 +422,12 @@ router.delete("/admin/:id", authenticateToken, requireAdmin, async (req, res) =>
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "deleter", as: "deleter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
} }
], ],
}); });
@@ -492,7 +492,7 @@ router.patch("/admin/:id/restore", authenticateToken, requireAdmin, async (req,
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
} }
], ],
}); });

47
backend/routes/rentals.js
View File

@@ -64,7 +64,7 @@ router.get("/renting", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
order: [["createdAt", "DESC"]], order: [["createdAt", "DESC"]],
@@ -92,7 +92,7 @@ router.get("/owning", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
order: [["createdAt", "DESC"]], order: [["createdAt", "DESC"]],
@@ -141,12 +141,12 @@ router.get("/:id", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -290,12 +290,12 @@ router.post("/", authenticateToken, requireVerifiedEmail, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -351,14 +351,13 @@ router.put("/:id/status", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: [ attributes: [
"id", "id",
"username",
"firstName", "firstName",
"lastName", "lastName",
"stripeCustomerId", "stripeCustomerId",
@@ -431,12 +430,12 @@ router.put("/:id/status", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -523,12 +522,12 @@ router.put("/:id/status", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -600,12 +599,12 @@ router.put("/:id/status", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -634,12 +633,12 @@ router.put("/:id/decline", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName", "email"], attributes: ["id", "firstName", "lastName", "email"],
}, },
], ],
}); });
@@ -674,12 +673,12 @@ router.put("/:id/decline", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -832,12 +831,12 @@ router.post("/:id/mark-completed", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -1048,12 +1047,12 @@ router.post("/:id/cancel", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });
@@ -1143,12 +1142,12 @@ router.post("/:id/mark-return", authenticateToken, async (req, res) => {
{ {
model: User, model: User,
as: "owner", as: "owner",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
{ {
model: User, model: User,
as: "renter", as: "renter",
attributes: ["id", "username", "firstName", "lastName"], attributes: ["id", "firstName", "lastName"],
}, },
], ],
}); });