fix-code (#11)

* fix-code:add-endpoint

* fix-code:review1

Author: rifasania

src/controllers/apikey-controller.ts

@@ -0,0 +1,49 @@
+import { Request, Response } from 'express';
+import { successResponse, errorResponse } from '../utils/response';
+import UserRepository from '../repositories/user-repository';
+import { generateApiKey } from '../utils/auth';
+import Users from '../models/user';
+import { InferAttributes } from 'sequelize';
+
+type UserType = InferAttributes<Users>;
+
+interface AuthRequest extends Request {
+  user?: UserType;
+}
+
+export const getApiKey = async (req: AuthRequest, res: Response) => {
+  try {
+    if (!req.user) {
+      return errorResponse(res, 'Unauthorized', 401);
+    }
+
+    return successResponse(
+      res,
+      { apikey: req.user.apikey },
+      'User details retrieved',
+    );
+  } catch (error) {
+    console.error(error);
+    return errorResponse(res, 'Unauthorized', 401);
+  }
+};
+
+export const regenerateApiKey = async (req: AuthRequest, res: Response) => {
+  try {
+    if (!req.user) {
+      return errorResponse(res, 'Unauthorized', 401);
+    }
+
+    const newApiKey = await generateApiKey();
+    await UserRepository.update({ id: req.user.id }, { apikey: newApiKey });
+
+    return successResponse(
+      res,
+      { apikey: newApiKey },
+      'User details retrieved',
+    );
+  } catch (error) {
+    console.error(error);
+    return errorResponse(res, 'Unauthorized', 401);
+  }
+};

src/controllers/query-controller.ts

@@ -0,0 +1,29 @@
+import { Request, Response } from 'express';
+import { sequelize } from '../config/database';
+import { QueryTypes } from 'sequelize';
+import { errorResponse, successResponse } from '../utils/response';
+
+export const executeQuery = async (req: Request, res: Response) => {
+  try {
+    const { query } = req.body;
+
+    if (!query || typeof query !== 'string') {
+      return errorResponse(res, 'Query is required and must be a string', 400);
+    }
+
+    const forbiddenPatterns = [
+      /DROP\s+TABLE/i,
+      /ALTER\s+/i,
+      /DELETE\s+FROM\s+[^\s]+(\s*;|$)/i,
+    ];
+    if (forbiddenPatterns.some((pattern) => pattern.test(query))) {
+      return errorResponse(res, 'Query contains forbidden operations', 403);
+    }
+
+    const result = await sequelize.query(query, { type: QueryTypes.RAW });
+    return successResponse(res, result, 'Query executed successfully');
+  } catch (error) {
+    console.error(error);
+    return errorResponse(res, 'Failed to execute query', 500);
+  }
+};

src/controllers/schema-controller.ts

@@ -1,14 +1,15 @@
 import { Request, Response } from 'express';
 import SchemaRepository from '../repositories/schema-repository';
+import { errorResponse, successResponse } from '../utils/response';
 
 export const schema = async (req: Request, res: Response) => {
   try {
     const tables = await SchemaRepository.getSchemas();
 
-    return res.json({ success: true, tables });
+    return successResponse(res, tables);
   } catch (error) {
     const errorMessage =
       error instanceof Error ? error.message : 'Unknown error';
-    res.status(500).json({ error: errorMessage });
+    return errorResponse(res, errorMessage, 500);
   }
 };

src/controllers/user-controller.ts

@@ -5,6 +5,14 @@ import { ENV } from '../config/env';
 import { hashPassword, generateApiKey } from '../utils/auth';
 import { successResponse, errorResponse } from '../utils/response';
 import UserRepository from '../repositories/user-repository';
+import Users from '../models/user';
+import { InferAttributes } from 'sequelize';
+
+type UserType = InferAttributes<Users>;
+
+interface AuthRequest extends Request {
+  user?: UserType;
+}
 
 export const registerUser = async (req: Request, res: Response) => {
   try {
@@ -71,21 +79,9 @@ export const loginUser = async (req: Request, res: Response) => {
   }
 };
 
-export const getUserDetails = async (req: Request, res: Response) => {
+export const getUserDetails = async (req: AuthRequest, res: Response) => {
   try {
-    const token = req.headers.authorization?.split(' ')[1];
-    if (!token) {
-      return errorResponse(res, 'Unauthorized', 401);
-    }
-
-    const decoded: any = jwt.verify(token, ENV.JWT_SECRET);
-    const user = await UserRepository.findOne({ id: decoded.userId });
-
-    if (!user) {
-      return errorResponse(res, 'Unauthorized', 401);
-    }
-
-    return successResponse(res, user, 'User details retrieved');
+    return successResponse(res, req.user, 'User details retrieved');
   } catch (error) {
     console.error(error);
     return errorResponse(res, 'Unauthorized', 401);

src/index.ts

@@ -6,6 +6,8 @@ import ddlRoutes from './routes/ddl-routes';
 import { sequelize } from './config/database';
 import schemaRoutes from './routes/schema-routes';
 import dmlRoutes from './routes/dml-routes';
+import queryRoutes from './routes/query-routes';
+import apikeyRoutes from './routes/apikey-routes';
 
 sequelize
   .sync({ alter: true })
@@ -30,6 +32,8 @@ apiRouter.use('/users', userRoutes);
 apiRouter.use('/migrate', ddlRoutes);
 apiRouter.use('/schemas', schemaRoutes);
 apiRouter.use('/execute', dmlRoutes);
+apiRouter.use('/query', queryRoutes);
+apiRouter.use('/apikey', apikeyRoutes);
 
 app.use('/api', apiRouter);
 

src/middlewares/apikey-middleware.ts

@@ -0,0 +1,31 @@
+import { Request, Response, NextFunction } from 'express';
+import { errorResponse } from '../utils/response';
+import UserRepository from '../repositories/user-repository';
+
+export const apiKeyMiddleware = async (
+  req: Request,
+  res: Response,
+  next: NextFunction,
+) => {
+  try {
+    const apiKey = req.headers['x-api-key'] as string;
+
+    if (!apiKey) {
+      return errorResponse(res, 'Unauthorized', 401);
+    }
+
+    const user = await UserRepository.findOne(
+      { apikey: apiKey },
+      { attributes: { exclude: ['password'] } },
+    );
+    if (!user) {
+      return errorResponse(res, 'Unauthorized', 401);
+    }
+
+    (req as any).user = user;
+    next();
+  } catch (error) {
+    console.error('Error:', error);
+    return errorResponse(res, 'Unauthorized', 401);
+  }
+};

src/middlewares/auth-middleware.ts

@@ -2,9 +2,18 @@ import { Request, Response, NextFunction } from 'express';
 import jwt from 'jsonwebtoken';
 import { errorResponse } from '../utils/response';
 import { ENV } from '../config/env';
+import UserRepository from '../repositories/user-repository';
+import Users from '../models/user';
+import { InferAttributes } from 'sequelize';
 
-export const authMiddleware = (
-  req: Request,
+type UserType = InferAttributes<Users>;
+
+interface AuthRequest extends Request {
+  user?: UserType;
+}
+
+export const authMiddleware = async (
+  req: AuthRequest,
   res: Response,
   next: NextFunction,
 ) => {
@@ -14,8 +23,17 @@ export const authMiddleware = (
       return errorResponse(res, 'Unauthorized', 401);
     }
 
-    const decoded = jwt.verify(token, ENV.JWT_SECRET);
-    (req as any).user = decoded;
+    const decoded: any = jwt.verify(token, ENV.JWT_SECRET);
+    const user = await UserRepository.findOne(
+      { id: decoded.userId },
+      { attributes: { exclude: ['password'] } },
+    );
+
+    if (!user) {
+      return errorResponse(res, 'Unauthorized', 401);
+    }
+
+    req.user = user;
     next();
   } catch (error) {
     console.error('Error:', error);

src/repositories/user-repository.ts

@@ -1,9 +1,9 @@
 import Users from '../models/user';
-import { WhereOptions } from 'sequelize';
+import { FindOptions, WhereOptions } from 'sequelize';
 
 class UserRepository {
-  static async findOne(condition: WhereOptions) {
-    return await Users.findOne({ where: condition });
+  static async findOne(condition: WhereOptions, options: FindOptions = {}) {
+    return await Users.findOne({ where: condition, ...options });
   }
 
   static async insert(data: {
@@ -14,6 +14,10 @@ class UserRepository {
   }) {
     return await Users.create(data);
   }
+
+  static async update(condition: WhereOptions, data: Partial<Users>) {
+    return await Users.update(data, { where: condition });
+  }
 }
 
 export default UserRepository;

src/routes/apikey-routes.ts

@@ -0,0 +1,10 @@
+import { Router } from 'express';
+import { authMiddleware } from '../middlewares/auth-middleware';
+import { getApiKey, regenerateApiKey } from '../controllers/apikey-controller';
+
+const router = Router();
+
+router.get('/', authMiddleware, getApiKey);
+router.put('/', authMiddleware, regenerateApiKey);
+
+export default router;

src/routes/auth-routes.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-const { registerUser, loginUser } = require('../controllers/user-controller');
+import { registerUser, loginUser } from '../controllers/user-controller';
 
 const router = Router();