vodorod/parcer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: revert to auth request

Browse Source
This commit is contained in:
amhsirak
2025-02-22 21:22:19 +05:30
parent 410d3def9c
commit daa889e734
1 changed files with 47 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
server/src/routes/auth.ts
View File

@@ -140,22 +140,9 @@ router.post("/login", async (req, res) => {
} }
}); });
router.get( router.get("/logout", async (req, res) => {
"/logout",
requireSignIn,
async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!authenticatedReq.user) {
return res.status(401).json({
ok: false,
message: "Unauthorized",
code: "unauthorized"
});
}
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",
@@ -176,13 +163,12 @@ router.get(
router.get( router.get(
"/current-user", "/current-user",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).json({ ok: false, error: "Unauthorized" }); return res.status(401).json({ ok: false, error: "Unauthorized" });
} }
const user = await User.findByPk(authenticatedReq.user.id, { const user = await User.findByPk(req.user.id, {
attributes: { exclude: ["password"] }, attributes: { exclude: ["password"] },
}); });
if (!user) { if (!user) {
@@ -205,7 +191,7 @@ router.get(
router.get( router.get(
"/user/:id", "/user/:id",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
try { try {
const { id } = req.params; const { id } = req.params;
if (!id) { if (!id) {
@@ -234,60 +220,39 @@ router.get(
router.post( router.post(
"/generate-api-key", "/generate-api-key",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).json({ return res.status(401).json({ ok: false, error: "Unauthorized" });
ok: false,
message: "Unauthorized",
code: "unauthorized"
});
} }
const user = await User.findByPk(req.user.id, {
const user = await User.findByPk(authenticatedReq.user.id, {
attributes: { exclude: ["password"] }, attributes: { exclude: ["password"] },
}); });
if (!user) { if (!user) {
return res.status(404).json({ return res.status(404).json({ message: "User not found" });
ok: false,
message: "User not found",
code: "not_found"
});
} }
if (user.api_key) { if (user.api_key) {
return res.status(400).json({ return res.status(400).json({ message: "API key already exists" });
ok: false,
message: "API key already exists",
code: "key_exists"
});
} }
const apiKey = genAPIKey(); const apiKey = genAPIKey();
await user.update({ api_key: apiKey }); await user.update({ api_key: apiKey });
// Capture analytics event
capture("maxun-oss-api-key-created", { capture("maxun-oss-api-key-created", {
user_id: user.id, user_id: user.id,
created_at: new Date().toISOString(), created_at: new Date().toISOString(),
}); });
return res.status(200).json({ return res.status(200).json({
ok: true,
message: "API key generated successfully", message: "API key generated successfully",
api_key: apiKey api_key: apiKey,
}); });
} catch (error) { } catch (error) {
console.error('API Key generation error:', error); return res
return res.status(500).json({ .status(500)
ok: false, .json({ message: "Error generating API key", error });
message: "Error generating API key",
code: "server",
error: process.env.NODE_ENV === 'development' ? error : undefined
});
} }
} }
); );
@@ -295,44 +260,27 @@ router.post(
router.get( router.get(
"/api-key", "/api-key",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).json({ return res.status(401).json({ ok: false, error: "Unauthorized" });
ok: false,
message: "Unauthorized",
code: "unauthorized"
});
} }
const user = await User.findByPk(authenticatedReq.user.id, { const user = await User.findByPk(req.user.id, {
raw: true, raw: true,
attributes: ["api_key"], attributes: ["api_key"],
}); });
if (!user) { if (!user) {
return res.status(404).json({ return res.status(404).json({ message: "User not found" });
ok: false,
message: "User not found",
code: "not_found"
});
} }
return res.status(200).json({ return res.status(200).json({
ok: true,
message: "API key fetched successfully", message: "API key fetched successfully",
api_key: user.api_key || null api_key: user.api_key || null,
}); });
} catch (error) { } catch (error) {
console.error('API Key fetch error:', error); return res.status(500).json({ message: "Error fetching API key", error });
return res.status(500).json({
ok: false,
message: "Error fetching API key",
code: "server",
error: process.env.NODE_ENV === 'development' ? error : undefined
});
} }
} }
); );
@@ -340,61 +288,34 @@ router.get(
router.delete( router.delete(
"/delete-api-key", "/delete-api-key",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest; if (!req.user) {
try { return res.status(401).send({ error: "Unauthorized" });
if (!authenticatedReq.user) { }
return res.status(401).json({
ok: false,
message: "Unauthorized",
code: "unauthorized"
});
}
const user = await User.findByPk(authenticatedReq.user.id, { try {
raw: true, const user = await User.findByPk(req.user.id, { raw: true });
attributes: ["id", "api_key"]
});
if (!user) { if (!user) {
return res.status(404).json({ return res.status(404).json({ message: "User not found" });
ok: false,
message: "User not found",
code: "not_found"
});
} }
if (!user.api_key) { if (!user.api_key) {
return res.status(404).json({ return res.status(404).json({ message: "API Key not found" });
ok: false,
message: "API Key not found",
code: "key_not_found"
});
} }
await User.update( await User.update({ api_key: null }, { where: { id: req.user.id } });
{ api_key: null },
{ where: { id: authenticatedReq.user.id } }
);
capture("maxun-oss-api-key-deleted", { capture("maxun-oss-api-key-deleted", {
user_id: user.id, user_id: user.id,
deleted_at: new Date().toISOString(), deleted_at: new Date().toISOString(),
}); });
return res.status(200).json({ return res.status(200).json({ message: "API Key deleted successfully" });
ok: true, } catch (error: any) {
message: "API Key deleted successfully" return res
}); .status(500)
.json({ message: "Error deleting API key", error: error.message });
} catch (error) {
console.error('API Key deletion error:', error);
return res.status(500).json({
ok: false,
message: "Error deleting API key",
code: "server",
error: process.env.NODE_ENV === 'development' ? error : undefined
});
} }
} }
); );
@@ -429,8 +350,7 @@ router.get("/google", (req, res) => {
router.get( router.get(
"/google/callback", "/google/callback",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
const { code, state } = req.query; const { code, state } = req.query;
try { try {
if (!state) { if (!state) {
@@ -456,12 +376,12 @@ router.get(
return res.status(400).json({ message: "Email not found" }); return res.status(400).json({ message: "Email not found" });
} }
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
// Get the currently authenticated user (from `requireSignIn`) // Get the currently authenticated user (from `requireSignIn`)
let user = await User.findOne({ where: { id: authenticatedReq.user.id } }); let user = await User.findOne({ where: { id: req.user.id } });
if (!user) { if (!user) {
return res.status(400).json({ message: "User not found" }); return res.status(400).json({ message: "User not found" });
@@ -539,13 +459,12 @@ router.get(
router.post( router.post(
"/gsheets/data", "/gsheets/data",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
const { spreadsheetId, robotId } = req.body; const { spreadsheetId, robotId } = req.body;
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
const user = await User.findByPk(authenticatedReq.user.id, { raw: true }); const user = await User.findByPk(req.user.id, { raw: true });
if (!user) { if (!user) {
return res.status(400).json({ message: "User not found" }); return res.status(400).json({ message: "User not found" });
@@ -657,14 +576,13 @@ router.post("/gsheets/update", requireSignIn, async (req, res) => {
router.post( router.post(
"/gsheets/remove", "/gsheets/remove",
requireSignIn, requireSignIn,
async (req: Request, res) => { async (req: AuthenticatedRequest, res) => {
const authenticatedReq = req as AuthenticatedRequest;
const { robotId } = req.body; const { robotId } = req.body;
if (!robotId) { if (!robotId) {
return res.status(400).json({ message: "Robot ID is required" }); return res.status(400).json({ message: "Robot ID is required" });
} }
if (!authenticatedReq.user) { if (!req.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
@@ -686,7 +604,7 @@ router.post(
}); });
capture("maxun-oss-google-sheet-integration-removed", { capture("maxun-oss-google-sheet-integration-removed", {
user_id: authenticatedReq.user.id, user_id: req.user.id,
robot_id: robotId, robot_id: robotId,
deleted_at: new Date().toISOString(), deleted_at: new Date().toISOString(),
}); });
@@ -700,4 +618,4 @@ router.post(
}); });
} }
} }
); );