feat: email regex check
This commit is contained in:
@@ -33,6 +33,14 @@ router.post("/register", async (req, res) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||||
|
if (!emailRegex.test(email)) {
|
||||||
|
return res.status(400).json({
|
||||||
|
error: "VALIDATION_ERROR",
|
||||||
|
code: "register.validation.invalid_email_format"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (!password || password.length < 6) {
|
if (!password || password.length < 6) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
error: "VALIDATION_ERROR",
|
error: "VALIDATION_ERROR",
|
||||||
@@ -74,16 +82,16 @@ router.post("/register", async (req, res) => {
|
|||||||
res.cookie("token", token, {
|
res.cookie("token", token, {
|
||||||
httpOnly: true,
|
httpOnly: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
capture("maxun-oss-user-registered", {
|
capture("maxun-oss-user-registered", {
|
||||||
email: user.email,
|
email: user.email,
|
||||||
userId: user.id,
|
userId: user.id,
|
||||||
registeredAt: new Date().toISOString(),
|
registeredAt: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(`User registered`);
|
console.log(`User registered`);
|
||||||
res.json(user);
|
res.json(user);
|
||||||
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.log(`Could not register user - ${error}`);
|
console.log(`Could not register user - ${error}`);
|
||||||
return res.status(500).json({
|
return res.status(500).json({
|
||||||
@@ -150,23 +158,23 @@ router.post("/login", async (req, res) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
router.get("/logout", async (req, res) => {
|
router.get("/logout", async (req, res) => {
|
||||||
try {
|
try {
|
||||||
res.clearCookie("token");
|
res.clearCookie("token");
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
ok: true,
|
ok: true,
|
||||||
message: "Logged out successfully",
|
message: "Logged out successfully",
|
||||||
code: "success"
|
code: "success"
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Logout error:', error);
|
console.error('Logout error:', error);
|
||||||
return res.status(500).json({
|
return res.status(500).json({
|
||||||
ok: false,
|
ok: false,
|
||||||
message: "Error during logout",
|
message: "Error during logout",
|
||||||
code: "server",
|
code: "server",
|
||||||
error: process.env.NODE_ENV === 'development' ? error : undefined
|
error: process.env.NODE_ENV === 'development' ? error : undefined
|
||||||
});
|
});
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
@@ -678,7 +686,7 @@ router.get("/airtable", requireSignIn, (req: Request, res) => {
|
|||||||
router.get("/airtable/callback", requireSignIn, async (req: Request, res) => {
|
router.get("/airtable/callback", requireSignIn, async (req: Request, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
const authenticatedReq = req as AuthenticatedRequest;
|
||||||
const baseUrl = process.env.PUBLIC_URL || "http://localhost:5173";
|
const baseUrl = process.env.PUBLIC_URL || "http://localhost:5173";
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { code, state, error } = authenticatedReq.query;
|
const { code, state, error } = authenticatedReq.query;
|
||||||
|
|
||||||
@@ -694,7 +702,7 @@ router.get("/airtable/callback", requireSignIn, async (req: Request, res) => {
|
|||||||
|
|
||||||
// Verify session data
|
// Verify session data
|
||||||
if (!authenticatedReq.session?.code_verifier || authenticatedReq.session.robotId !== state.toString()) {
|
if (!authenticatedReq.session?.code_verifier || authenticatedReq.session.robotId !== state.toString()) {
|
||||||
return res.status(400).json({
|
return res.status(400).json({
|
||||||
message: "Session expired - please restart the OAuth flow"
|
message: "Session expired - please restart the OAuth flow"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -708,7 +716,7 @@ router.get("/airtable/callback", requireSignIn, async (req: Request, res) => {
|
|||||||
body: new URLSearchParams({
|
body: new URLSearchParams({
|
||||||
grant_type: "authorization_code",
|
grant_type: "authorization_code",
|
||||||
code: code.toString(),
|
code: code.toString(),
|
||||||
client_id: process.env.AIRTABLE_CLIENT_ID!,
|
client_id: process.env.AIRTABLE_CLIENT_ID!,
|
||||||
redirect_uri: process.env.AIRTABLE_REDIRECT_URI!,
|
redirect_uri: process.env.AIRTABLE_REDIRECT_URI!,
|
||||||
code_verifier: authenticatedReq.session.code_verifier
|
code_verifier: authenticatedReq.session.code_verifier
|
||||||
}),
|
}),
|
||||||
@@ -811,7 +819,7 @@ router.get("/airtable/bases", requireSignIn, async (req: Request, res) => {
|
|||||||
// Update robot with selected base
|
// Update robot with selected base
|
||||||
router.post("/airtable/update", requireSignIn, async (req: Request, res) => {
|
router.post("/airtable/update", requireSignIn, async (req: Request, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
const authenticatedReq = req as AuthenticatedRequest;
|
||||||
const { baseId, robotId , baseName, tableName, tableId} = req.body;
|
const { baseId, robotId, baseName, tableName, tableId } = req.body;
|
||||||
|
|
||||||
if (!baseId || !robotId) {
|
if (!baseId || !robotId) {
|
||||||
return res.status(400).json({ message: "Base ID and Robot ID are required" });
|
return res.status(400).json({ message: "Base ID and Robot ID are required" });
|
||||||
|
|||||||
Reference in New Issue
Block a user