diff --git a/src/modules/auth/auth.controller.ts b/src/modules/auth/auth.controller.ts
index 0a3620c4b..a4f5e5c65 100644
--- a/src/modules/auth/auth.controller.ts
+++ b/src/modules/auth/auth.controller.ts
@@ -1,12 +1,4 @@
-import {
-  Body,
-  Controller,
-  Get,
-  Headers,
-  Ip,
-  Post,
-  Query,
-} from '@nestjs/common';
+import { Body, Controller, Headers, Ip, Post } from '@nestjs/common';
 import { users } from '@prisma/client';
 import { RateLimit } from 'nestjs-rate-limiter';
 import { Expose } from '../../modules/prisma/prisma.interface';
diff --git a/src/modules/auth/jwt.strategy.ts b/src/modules/auth/jwt.strategy.ts
index 1f8685e7f..a3ec70d9a 100644
--- a/src/modules/auth/jwt.strategy.ts
+++ b/src/modules/auth/jwt.strategy.ts
@@ -1,20 +1,38 @@
-import { ExtractJwt, Strategy } from 'passport-jwt';
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { AccessTokenClaims, AccessTokenParsed } from './auth.interface';
+import { PassportStrategy } from '@nestjs/passport';
+import { Request } from 'express';
+import { verify } from 'jsonwebtoken';
+import { Strategy } from 'passport-strategy';
 import { LOGIN_ACCESS_TOKEN } from '../tokens/tokens.constants';
+import { AccessTokenClaims, AccessTokenParsed } from './auth.interface';
+
+class StaartStrategy extends Strategy {
+  name = 'jwt';
+}
 
 @Injectable()
-export class JwtStrategy extends PassportStrategy(Strategy) {
+export class JwtStrategy extends PassportStrategy(StaartStrategy) {
   constructor() {
-    super({
-      jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      ignoreExpiration: false,
-      secretOrKey: process.env.JWT_SECRET,
-    });
+    super();
+  }
+
+  authenticate(request: Request) {
+    const bearerToken = request.headers.authorization;
+    if (typeof bearerToken !== 'string')
+      return this.fail('No token found', 401);
+    const matches = bearerToken.match(/(\S+)\s+(\S+)/);
+    if (matches) {
+      const token = matches[2];
+      if (!token) return this.fail('No token found', 401);
+      try {
+        return this.success(verify(token, process.env.JWT_SECRET));
+      } catch (error) {}
+    }
+    return this.fail('Unable to parse token', 401);
   }
 
   async validate(payload: AccessTokenClaims): Promise<AccessTokenParsed> {
+    console.log('got here');
     const { sub, id, scopes } = payload;
     if (sub !== LOGIN_ACCESS_TOKEN) throw new UnauthorizedException();
     return { id, scopes };