diff --git a/src/modules/atproto/infrastructure/services/FakeAppPasswordSessionService.ts b/src/modules/atproto/infrastructure/services/FakeAppPasswordSessionService.ts
index 971aaeba..c5fd6270 100644
--- a/src/modules/atproto/infrastructure/services/FakeAppPasswordSessionService.ts
+++ b/src/modules/atproto/infrastructure/services/FakeAppPasswordSessionService.ts
@@ -2,20 +2,25 @@ import { Result, ok, err } from 'src/shared/core/Result';
 import { IAppPasswordSessionService } from '../../application/IAppPasswordSessionService';
 import { AtpSessionData } from '@atproto/api';
 
-export class FakeAppPasswordSessionService implements IAppPasswordSessionService {
+export class FakeAppPasswordSessionService
+  implements IAppPasswordSessionService
+{
   async getSession(did: string): Promise<Result<AtpSessionData>> {
     try {
       // Use mock data from environment variables
       const mockDid = process.env.BSKY_DID || 'did:plc:mock123';
       const mockHandle = process.env.BSKY_HANDLE || 'mock.bsky.social';
-      const mockAccessToken = process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
-      const mockRefreshToken = process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
+      const mockAccessToken =
+        process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
+      const mockRefreshToken =
+        process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
 
       const mockSession: AtpSessionData = {
         did: mockDid,
         handle: mockHandle,
         accessJwt: mockAccessToken,
         refreshJwt: mockRefreshToken,
+        active: true,
       };
 
       return ok(mockSession);
@@ -32,8 +37,10 @@ export class FakeAppPasswordSessionService implements IAppPasswordSessionService
       // Use mock data from environment variables
       const mockDid = process.env.BSKY_DID || 'did:plc:mock123';
       const mockHandle = process.env.BSKY_HANDLE || 'mock.bsky.social';
-      const mockAccessToken = process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
-      const mockRefreshToken = process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
+      const mockAccessToken =
+        process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
+      const mockRefreshToken =
+        process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
 
       // Simulate successful session creation with any identifier/password
       const mockSession: AtpSessionData = {
@@ -41,6 +48,7 @@ export class FakeAppPasswordSessionService implements IAppPasswordSessionService
         handle: mockHandle,
         accessJwt: mockAccessToken,
         refreshJwt: mockRefreshToken,
+        active: true,
       };
 
       return ok(mockSession);
diff --git a/src/modules/atproto/infrastructure/services/FakeAtProtoOAuthProcessor.ts b/src/modules/atproto/infrastructure/services/FakeAtProtoOAuthProcessor.ts
index 53a5234f..f17883ff 100644
--- a/src/modules/atproto/infrastructure/services/FakeAtProtoOAuthProcessor.ts
+++ b/src/modules/atproto/infrastructure/services/FakeAtProtoOAuthProcessor.ts
@@ -9,7 +9,7 @@ export class FakeAtProtoOAuthProcessor implements IOAuthProcessor {
   async generateAuthUrl(handle?: string): Promise<Result<string>> {
     try {
       // Return a mock auth URL
-      const mockUrl = `https://mock-oauth.example.com/auth?handle=${handle || 'mock'}`;
+      const mockUrl = `localhost:4000/auth/complete?accessToken=${process.env.MOCK_ACCESS_TOKEN}&refreshToken=${process.env.MOCK_REFRESH_TOKEN}`;
       return ok(mockUrl);
     } catch (error: any) {
       return err(error);
diff --git a/src/modules/user/infrastructure/services/FakeJwtTokenService.ts b/src/modules/user/infrastructure/services/FakeJwtTokenService.ts
index 0f70e1e6..4ba53fa0 100644
--- a/src/modules/user/infrastructure/services/FakeJwtTokenService.ts
+++ b/src/modules/user/infrastructure/services/FakeJwtTokenService.ts
@@ -1,6 +1,7 @@
 import { Result, ok, err } from 'src/shared/core/Result';
-import { ITokenService, TokenPair } from '../../application/services/ITokenService';
+import { ITokenService } from '../../application/services/ITokenService';
 import { ITokenRepository } from '../../domain/repositories/ITokenRepository';
+import { TokenPair } from '../../application/dtos/TokenDTO';
 
 export class FakeJwtTokenService implements ITokenService {
   constructor(private tokenRepository: ITokenRepository) {}
@@ -8,12 +9,15 @@ export class FakeJwtTokenService implements ITokenService {
   async generateToken(did: string): Promise<Result<TokenPair>> {
     try {
       // Use mock tokens from environment variables
-      const mockAccessToken = process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
-      const mockRefreshToken = process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
+      const mockAccessToken =
+        process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
+      const mockRefreshToken =
+        process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
 
       return ok({
         accessToken: mockAccessToken,
         refreshToken: mockRefreshToken,
+        expiresIn: 3600, // 1 hour
       });
     } catch (error: any) {
       return err(error);
@@ -23,7 +27,8 @@ export class FakeJwtTokenService implements ITokenService {
   async validateToken(token: string): Promise<Result<string | null>> {
     try {
       // Use mock data from environment variables
-      const mockAccessToken = process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
+      const mockAccessToken =
+        process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
       const mockDid = process.env.BSKY_DID || 'did:plc:mock123';
 
       // Return mock DID if token matches mock token
@@ -40,14 +45,17 @@ export class FakeJwtTokenService implements ITokenService {
   async refreshToken(refreshToken: string): Promise<Result<TokenPair | null>> {
     try {
       // Use mock tokens from environment variables
-      const mockRefreshToken = process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
-      const mockAccessToken = process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
+      const mockRefreshToken =
+        process.env.MOCK_REFRESH_TOKEN || 'mock-refresh-token-456';
+      const mockAccessToken =
+        process.env.MOCK_ACCESS_TOKEN || 'mock-access-token-123';
 
       // Return new tokens if refresh token matches mock token
       if (refreshToken === mockRefreshToken) {
         return ok({
           accessToken: mockAccessToken,
           refreshToken: mockRefreshToken,
+          expiresIn: 3600, // 1 hour
         });
       }