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

Merge pull request #412 from getmaxun/ts-extend

Browse Source 
feat(cloud): authenticated requests extend
This commit is contained in:
Karishma Shukla
2025-01-29 15:37:03 +05:30
committed by GitHub
parent ac9fdf546c e335e138ab
commit 9884ed0b9e
2 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,12 +107,13 @@ router.get("/logout", async (req, res) => {
router.get( router.get(
"/current-user", "/current-user",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: "Unauthorized" }); return res.status(401).json({ ok: false, error: "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) {
@@ -135,7 +136,7 @@ router.get(
router.get( router.get(
"/user/:id", "/user/:id",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
try { try {
const { id } = req.params; const { id } = req.params;
if (!id) { if (!id) {
@@ -164,12 +165,13 @@ router.get(
router.post( router.post(
"/generate-api-key", "/generate-api-key",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: "Unauthorized" }); return res.status(401).json({ ok: false, error: "Unauthorized" });
} }
const user = await User.findByPk(req.user.id, { const user = await User.findByPk(authenticatedReq.user.id, {
attributes: { exclude: ["password"] }, attributes: { exclude: ["password"] },
}); });
@@ -204,13 +206,14 @@ router.post(
router.get( router.get(
"/api-key", "/api-key",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: "Unauthorized" }); return res.status(401).json({ ok: false, error: "Unauthorized" });
} }
const user = await User.findByPk(req.user.id, { const user = await User.findByPk(authenticatedReq.user.id, {
raw: true, raw: true,
attributes: ["api_key"], attributes: ["api_key"],
}); });
@@ -232,13 +235,14 @@ router.get(
router.delete( router.delete(
"/delete-api-key", "/delete-api-key",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
if (!req.user) { const authenticatedReq = req as AuthenticatedRequest;
if (!authenticatedReq.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
try { try {
const user = await User.findByPk(req.user.id, { raw: true }); const user = await User.findByPk(authenticatedReq.user.id, { raw: true });
if (!user) { if (!user) {
return res.status(404).json({ message: "User not found" }); return res.status(404).json({ message: "User not found" });
@@ -248,7 +252,7 @@ router.delete(
return res.status(404).json({ message: "API Key not found" }); return res.status(404).json({ message: "API Key not found" });
} }
await User.update({ api_key: null }, { where: { id: req.user.id } }); await User.update({ 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,
@@ -294,7 +298,8 @@ router.get("/google", (req, res) => {
router.get( router.get(
"/google/callback", "/google/callback",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
const { code, state } = req.query; const { code, state } = req.query;
try { try {
if (!state) { if (!state) {
@@ -320,12 +325,12 @@ router.get(
return res.status(400).json({ message: "Email not found" }); return res.status(400).json({ message: "Email not found" });
} }
if (!req.user) { if (!authenticatedReq.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: req.user.id } }); let user = await User.findOne({ where: { id: authenticatedReq.user.id } });
if (!user) { if (!user) {
return res.status(400).json({ message: "User not found" }); return res.status(400).json({ message: "User not found" });
@@ -403,12 +408,13 @@ router.get(
router.post( router.post(
"/gsheets/data", "/gsheets/data",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, res) => {
const authenticatedReq = req as AuthenticatedRequest;
const { spreadsheetId, robotId } = req.body; const { spreadsheetId, robotId } = req.body;
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
const user = await User.findByPk(req.user.id, { raw: true }); const user = await User.findByPk(authenticatedReq.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" });
@@ -520,13 +526,14 @@ router.post("/gsheets/update", requireSignIn, async (req, res) => {
router.post( router.post(
"/gsheets/remove", "/gsheets/remove",
requireSignIn, requireSignIn,
async (req: AuthenticatedRequest, res) => { async (req: Request, 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 (!req.user) { if (!authenticatedReq.user) {
return res.status(401).send({ error: "Unauthorized" }); return res.status(401).send({ error: "Unauthorized" });
} }
@@ -548,7 +555,7 @@ router.post(
}); });
capture("maxun-oss-google-sheet-integration-removed", { capture("maxun-oss-google-sheet-integration-removed", {
user_id: req.user.id, user_id: authenticatedReq.user.id,
robot_id: robotId, robot_id: robotId,
deleted_at: new Date().toISOString(), deleted_at: new Date().toISOString(),
}); });

28
server/src/routes/proxy.ts
View File

@@ -12,16 +12,17 @@ interface AuthenticatedRequest extends Request {
user?: { id: string }; user?: { id: string };
} }
router.post('/config', requireSignIn, async (req: AuthenticatedRequest, res: Response) => { router.post('/config', requireSignIn, async (req: Request, res: Response) => {
const { server_url, username, password } = req.body; const { server_url, username, password } = req.body;
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: 'Unauthorized' }); return res.status(401).json({ ok: false, error: 'Unauthorized' });
} }
const user = await User.findByPk(req.user.id, { const user = await User.findByPk(authenticatedReq.user.id, {
attributes: { exclude: ['password'] }, attributes: { exclude: ['password'] },
}); });
@@ -57,13 +58,14 @@ router.post('/config', requireSignIn, async (req: AuthenticatedRequest, res: Res
} }
}); });
router.get('/test', requireSignIn, async (req: AuthenticatedRequest, res: Response) => { router.get('/test', requireSignIn, async (req: Request, res: Response) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: 'Unauthorized' }); return res.status(401).json({ ok: false, error: 'Unauthorized' });
} }
const user = await User.findByPk(req.user.id, { const user = await User.findByPk(authenticatedReq.user.id, {
attributes: ['proxy_url', 'proxy_username', 'proxy_password'], attributes: ['proxy_url', 'proxy_username', 'proxy_password'],
raw: true raw: true
}); });
@@ -98,13 +100,14 @@ router.get('/test', requireSignIn, async (req: AuthenticatedRequest, res: Respon
} }
}); });
router.get('/config', requireSignIn, async (req: AuthenticatedRequest, res: Response) => { router.get('/config', requireSignIn, async (req: Request, res: Response) => {
const authenticatedReq = req as AuthenticatedRequest;
try { try {
if (!req.user) { if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: 'Unauthorized' }); return res.status(401).json({ ok: false, error: 'Unauthorized' });
} }
const user = await User.findByPk(req.user.id, { const user = await User.findByPk(authenticatedReq.user.id, {
attributes: ['proxy_url', 'proxy_username', 'proxy_password'], attributes: ['proxy_url', 'proxy_username', 'proxy_password'],
raw: true, raw: true,
}); });
@@ -125,12 +128,13 @@ router.get('/config', requireSignIn, async (req: AuthenticatedRequest, res: Resp
} }
}); });
router.delete('/config', requireSignIn, async (req: AuthenticatedRequest, res: Response) => { router.delete('/config', requireSignIn, async (req: Request, res: Response) => {
if (!req.user) { const authenticatedReq = req as AuthenticatedRequest;
if (!authenticatedReq.user) {
return res.status(401).json({ ok: false, error: 'Unauthorized' }); return res.status(401).json({ ok: false, error: 'Unauthorized' });
} }
const user = await User.findByPk(req.user.id); const user = await User.findByPk(authenticatedReq.user.id);
if (!user) { if (!user) {
return res.status(404).json({ message: 'User not found' }); return res.status(404).json({ message: 'User not found' });