Skip to content

Commit

Permalink
fix: imports
Browse files Browse the repository at this point in the history
  • Loading branch information
genzyy committed Nov 12, 2023
1 parent f25f11c commit 3c091e1
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 18 deletions.
13 changes: 6 additions & 7 deletions src/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { CREATED, OK } from 'http-status';
import { Request, Response } from 'express';
import userRepository from '../repositories/user';
import catchAsync from '../utils/catchAsync';
import JwtService from '../services/jwt.service';
import { UserRepository } from '../repositories';
import { catchAsync, exclude } from '../utils';
import { JwtService } from '../services';
import EmailService from '../services/email.service';
import { NotFound, Unauthorized } from '../utils/ApiError';
import exclude from '../utils/exclude';
import { UserReturn } from '../types/user';

const register = catchAsync(async (req: Request, res: Response) => {
const { email, username, password } = req.body;
const user = await userRepository.createUser(username, email, password);
const user = await UserRepository.createUser(username, email, password);
const tokens = JwtService.generateAuthTokenForUser(user.id);

await EmailService.sendOnboardingEmail(user.email, user.name ?? '');
Expand All @@ -22,7 +21,7 @@ const login = catchAsync(async (req: Request, res: Response) => {
const { email, password } = req.body;
const accessToken = await getUserAccessToken(req);
const userId = JwtService.verifyToken(accessToken);
const user = await userRepository.getUserByEmailAndId(email, userId);
const user = await UserRepository.getUserByEmailAndId(email, userId);

if (!user) {
throw new NotFound('User not found');
Expand All @@ -36,7 +35,7 @@ const login = catchAsync(async (req: Request, res: Response) => {
const getMe = catchAsync(async (req: Request, res: Response) => {
const accessToken = await getUserAccessToken(req);
const userId = JwtService.verifyToken(accessToken);
const dbUser = await userRepository.getUser(userId, UserReturn);
const dbUser = await UserRepository.getUser(userId, UserReturn);
return res.status(OK).send({ ...dbUser });
});

Expand Down
6 changes: 3 additions & 3 deletions src/repositories/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import userRepository from './user';
import apiMetadataRepository from './apiMetadata';
import UserRepository from './user';
import ApiMetadataRepository from './apiMetadata';

export { userRepository, apiMetadataRepository };
export { UserRepository, ApiMetadataRepository };
8 changes: 4 additions & 4 deletions src/routes/v1/auth.route.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import express from 'express';
import validate from '../../core/middlewares/validator';
import authValidation from '../../validations/auth.validation';
import authController from '../../controllers/auth.controller';
import { AuthController } from '../../controllers/';

const router = express.Router();

router.post('/register', validate(authValidation.register), authController.register);
router.post('/login', validate(authValidation.login), authController.login);
router.post('/register', validate(authValidation.register), AuthController.register);
router.post('/login', validate(authValidation.login), AuthController.login);
router.post('/logout');
router.get('/me', validate(authValidation.getMe), authController.getMe);
router.get('/me', validate(authValidation.getMe), AuthController.getMe);
router.post('/refresh-tokens');

export default router;
6 changes: 3 additions & 3 deletions src/services/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import emailService from './email.service';
import jwtService from './jwt.service';
import EmailService from './email.service';
import JwtService from './jwt.service';

export { emailService, jwtService };
export { EmailService, JwtService };
2 changes: 1 addition & 1 deletion src/types/user.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { User as UserModel } from '@prisma/client';
import Joi from 'joi';
import include from '../utils/include';
import { include } from '../utils';

export type Key = keyof UserModel;

Expand Down
9 changes: 9 additions & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import ApiError from './ApiError';
import exclude from './exclude';
import include from './include';
import catchAsync from './catchAsync';
import filter from './filter';
import getKeys from './getKeys';
import { TupleUnion } from './TupleUnion';

export { ApiError, exclude, include, catchAsync, filter, getKeys, TupleUnion };

0 comments on commit 3c091e1

Please sign in to comment.