Skip to content

Commit 6b35546

Browse files
committed
fix: can't get current user
1 parent 068330a commit 6b35546

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

server/src/constants/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const ENDPOINTS = {
1616
LOGIN: '/auth/login',
1717
LOGIN_ADMIN: '/auth/login-admin',
1818
REGISTER: '/auth/register',
19-
CURRENT_USER: '/auth/current-user',
19+
CURRENT_USER: '/auth/me',
2020
REFRESH_TOKEN: '/auth/refresh-token',
2121
FORGOT_PASSWORD: '/auth/forgot-password',
2222
RESET_PASSWORD: '/auth/reset-password',

server/src/libs/firebase.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import fs from 'node:fs';
2-
import admin from 'firebase-admin';
31
import {
42
FIREBASE_CLIENT_EMAIL,
53
FIREBASE_DATABASE_URL,
64
FIREBASE_PRIVATE_KEY,
75
FIREBASE_PROJECT_ID,
86
} from '@/config';
7+
import admin from 'firebase-admin';
98

109

1110
export const firebase = admin.initializeApp({

server/src/middlewares/auth.middleware.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import type { NextFunction, Request, Response } from 'express';
2-
import { Container } from 'typedi';
3-
import { StatusCodes } from 'http-status-codes';
4-
import { ACCESS_TOKEN_SECRET } from '@config';
51
import { HttpException } from '@/exceptions/http-exception';
6-
import type { RequestWithUser, TTokenStore } from '@interfaces/auth.interface';
7-
import { UserService } from '@/services/users.service';
82
import { AuthService } from '@/services/auth.service';
3+
import { UserService } from '@/services/users.service';
4+
import { ACCESS_TOKEN_SECRET } from '@config';
5+
import type { RequestWithUser, TTokenStore } from '@interfaces/auth.interface';
6+
import type { NextFunction, Request, Response } from 'express';
7+
import { StatusCodes } from 'http-status-codes';
8+
import { Container } from 'typedi';
99

1010
const getAuthorization = (req: Request): string | null => {
1111
const coockie = req.cookies.access_token as unknown;
@@ -28,6 +28,8 @@ export const auth = async (
2828
const authService = Container.get(AuthService);
2929
const Authorization = getAuthorization(req);
3030

31+
console.log('Authorization', Authorization)
32+
3133
if (Authorization) {
3234
const { id } = (await authService.verifyToken(
3335
Authorization,

server/src/routes/auth.route.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import {
66
RegisterDto,
77
ResetPasswordDto,
88
} from '@/dtos/auth.dto';
9+
import { auth } from '@/middlewares/auth.middleware';
910
import { validate } from '@/middlewares/validation.middleware';
1011
import { AuthController } from '@controllers/auth.controller';
1112
import type { Routes } from '@interfaces/routes.interface';
1213
import { Router } from 'express';
13-
import { auth } from 'firebase-admin';
1414

1515
export class AuthRoute implements Routes {
1616
public router: Router = Router();
@@ -56,16 +56,18 @@ export class AuthRoute implements Routes {
5656
this.controller.resetPassword
5757
);
5858

59+
this.router.post(
60+
ENDPOINTS.AUTH.WITH_ID_TOKEN,
61+
validate(IdTokenDto),
62+
this.controller.loginWithIdToken
63+
);
64+
5965
this.router.get(
6066
ENDPOINTS.AUTH.CURRENT_USER,
6167
auth,
6268
this.controller.getCurrentUser
6369
);
6470

65-
this.router.post(
66-
ENDPOINTS.AUTH.WITH_ID_TOKEN,
67-
validate(IdTokenDto),
68-
this.controller.loginWithIdToken
69-
);
71+
7072
}
7173
}

0 commit comments

Comments
 (0)