feat: ui part call and match found / sign out button / sameet controllers

Author: Favazmubarak

frontend/app/home/page.tsx

@@ -549,15 +549,15 @@ export default function FindMatchPage() {
       )}
 
       {matchFound && (
-        <div className="relative min-h-screen flex items-center justify-center px-4 py-14 sm:py-16 md:py-6">
+        <div className="relative min-h-screen flex items-center justify-center px-4 py-4 sm:py-16 md:py-4">
           <button
             onClick={handleBackFromMatch}
-            className="absolute top-7 left-10 flex font-semibold text-primary"
+            className="absolute top-7 left-10 hidden md:flex font-semibold text-primary"
           >
             <ChevronLeft size={23} className="mt-0.5" />
             Go Back
           </button>
-          <div className="w-full max-w-4xl mx-auto text-center space-y-8 sm:space-y-5">
+          <div className="w-full max-w-4xl mx-auto text-center space-y-4 sm:space-y-5">
             <div className="space-y-3 sm:space-y-3">
               <div className="inline-flex items-center gap-2 sm:gap-3 px-4 sm:px-6  py-1.5 sm:py-2 bg-linear-to-r from-primary to-favor text-white rounded-full shadow-md sm:shadow-lg">
                 <Zap className="w-4 h-4 sm:w-5 sm:h-5" />
@@ -566,7 +566,7 @@ export default function FindMatchPage() {
                 </span>
               </div>
 
-              <h2 className="font-sans text-2xl sm:text-4xl md:text-6xl font-bold text-foreground leading-tight">
+              <h2 className="font-sans text-xl sm:text-2xl md:text-4xl font-bold text-foreground leading-tight">
                 Meet Your New Connection
               </h2>
 

frontend/app/session/page.tsx

@@ -654,16 +654,8 @@ function VideoCallInner() {
           <span className="text-white/15 text-xs font-mono">{iceState}</span>
         </header>
 
-        {/* ── Video area ── */}
-        {/*
-          h-full is critical: section must have explicit height so absolute
-          children (controls, local video) are positioned within the viewport.
-          Without it, section collapses to 0 and controls overflow below screen.
-          Layout mirrors Google Meet: remote video fills section, controls float
-          over video at bottom, local video sits just above controls on the right.
-        */}
+       
         <section className="flex-1 relative h-full overflow-hidden">
-          {/* Remote video — fills entire section */}
           <video
             ref={remoteVideoRef}
             autoPlay
@@ -709,10 +701,9 @@ function VideoCallInner() {
 
           {/* Local video PiP — top-right on mobile, bottom-right on sm+ */}
           <div
-            className="absolute top-16 right-3 sm:bottom-20 sm:top-auto sm:right-4 z-30 w-34 sm:w-44 md:w-52 xl:w-72 rounded-xl overflow-hidden"
+            className="absolute top-16 right-3 sm:bottom-20 sm:top-auto sm:right-4 z-30 w-24 sm:w-44 md:w-52 xl:w-72 rounded-xl overflow-hidden [aspect-ratio:3/4] sm:[aspect-ratio:16/9]"
             style={{
               border: '1px solid rgba(255,255,255,0.1)',
-              aspectRatio: '16/9',
             }}
           >
             <video

frontend/components/ProfileIcon.tsx

@@ -73,8 +73,11 @@ export default function ProfileHover() {
 
               <div className="h-px bg-slate-200 dark:bg-slate-800 my-2 mx-2" />
 
-              <button className="w-full flex items-center justify-between p-2.5 rounded-xl text-red-500 hover:bg-red-50 dark:hover:bg-red-950/20 transition-all group">
-                <div className="flex items-center gap-3" onClick={handleLogout}>
+              <button
+                onClick={handleLogout}
+                className="w-full flex items-center justify-between p-2.5 rounded-xl text-red-500 hover:bg-red-50 dark:hover:bg-red-950/20 transition-all group"
+              >
+                <div className="flex items-center gap-3">
                   <LogOut
                     size={16}
                     className="group-hover:rotate-12 transition-transform"

gateway/src/proxies/authProxy.ts

@@ -3,9 +3,12 @@ import { ClientRequest, IncomingMessage } from 'node:http';
 import dotenv from 'dotenv';
 dotenv.config();
 
+const isProduction = process.env.NODE_ENV === 'production';
+
 export const authProxy = createProxyMiddleware({
   target: `${process.env.AUTH_SERVICE_URL}/auth`,
   changeOrigin: true,
+  cookieDomainRewrite: isProduction ? { '*': '.conferoo.in' } : '',
 
   on: {
     proxyReq: (proxyReq: ClientRequest, req: IncomingMessage) => {

services/auth-service/src/controllers/authController.ts

@@ -3,12 +3,21 @@ import { authService } from '../services/authServices.js';
 import { googleAuthService } from '../services/googleAuth.service.js';
 import { logger } from '../config/logger.js';
 import { AppError } from '../middlewares/errorHandller.js';
-import { authSessionRepository } from '../repositories/authSessionRepository.js';
-import { hashRefreshToken } from '../utils/jwtService.js';
 import { redis } from '../config/redis.js';
+import { hashRefreshToken } from '../utils/jwtService.js';
+import { authSessionRepository } from '../repositories/authSessionRepository.js';
 
 const isProduction = process.env.NODE_ENV === 'production';
 
+const cookieOptions = (maxAge: number) => ({
+  httpOnly: true,
+  secure: isProduction,
+  sameSite: (isProduction ? 'none' : 'lax') as 'none' | 'lax',
+  path: '/',
+  maxAge,
+  ...(isProduction && { domain: '.conferoo.in' }),
+});
+
 export const register = async (req: Request, res: Response) => {
   const { email, password, fullName } = req.body;
   const verificationToken = await authService.registerUser(
@@ -55,12 +64,6 @@ export const login = async (req: Request, res: Response) => {
   const { accessToken, refreshToken, role, userId } =
     await authService.loginUser(email, password);
 
-  // ── Single-device login block ─────────────────────────────────────────────
-  // Check if this user already has an active socket (online:{userId} exists).
-  // Both services share the same Redis instance so this check is reliable.
-  // If online → reject with 409 and return userId so frontend can force logout.
-  // The user must force-logout the other device before they can log in here.
-  // ─────────────────────────────────────────────────────────────────────────
   const alreadyOnline = await redis.exists(`online:${userId}`);
   if (alreadyOnline) {
     logger.info(`Login blocked — user ${userId} already online`);
@@ -74,29 +77,17 @@ export const login = async (req: Request, res: Response) => {
 
   logger.info('Login Succesfull');
 
-  res.cookie('refreshToken', refreshToken, {
-    httpOnly: true,
-    secure: false,
-    sameSite: 'lax',
-    domain: 'localhost',
-    path: '/',
-    maxAge: 7 * 24 * 60 * 60 * 1000,
-  });
-
-  res.cookie('accessToken', accessToken, {
-    httpOnly: true,
-    secure: false,
-    sameSite: 'lax',
-    domain: 'localhost',
-    path: '/',
-    maxAge: 24 * 60 * 60 * 1000,
-  });
+  res.cookie(
+    'refreshToken',
+    refreshToken,
+    cookieOptions(7 * 24 * 60 * 60 * 1000)
+  );
+  res.cookie('accessToken', accessToken, cookieOptions(24 * 60 * 60 * 1000));
 
   res.status(200).json({
     message: 'Login Successfully Completed',
     success: true,
     role,
-    userId,
   });
 };
 
@@ -120,32 +111,33 @@ export const resendOtp = async (req: Request, res: Response) => {
 export const googleLogin = async (req: Request, res: Response) => {
   const { idToken } = req.body;
 
-  const { accessToken, refreshToken } =
+  const { accessToken, refreshToken, role, userId } =
     await googleAuthService.authenticate(idToken);
 
-  logger.info('Google login successful');
+  const alreadyOnline = await redis.exists(`online:${userId}`);
+  if (alreadyOnline) {
+    logger.info(`Login blocked — user ${userId} already online`);
+    return res.status(409).json({
+      success: false,
+      message: 'You are already logged in on another device or tab.',
+      code: 'ALREADY_LOGGED_IN',
+      userId,
+    });
+  }
 
-  res.cookie('refreshToken', refreshToken, {
-    httpOnly: true,
-    secure: false,
-    sameSite: 'lax',
-    domain: 'localhost',
-    path: '/',
-    maxAge: 7 * 24 * 60 * 60 * 1000,
-  });
+  logger.info('Google login successful');
 
-  res.cookie('accessToken', accessToken, {
-    httpOnly: true,
-    secure: false,
-    sameSite: 'lax',
-    domain: 'localhost',
-    path: '/',
-    maxAge: 24 * 60 * 60 * 1000,
-  });
+  res.cookie(
+    'refreshToken',
+    refreshToken,
+    cookieOptions(7 * 24 * 60 * 60 * 1000)
+  );
+  res.cookie('accessToken', accessToken, cookieOptions(24 * 60 * 60 * 1000));
 
   res.status(200).json({
     success: true,
     message: 'Google login successfully completed',
+    role,
   });
 };
 
@@ -208,17 +200,16 @@ export const logout = async (req: Request, res: Response) => {
 
   await authService.logoutUser(refreshToken);
 
-  res.clearCookie('refreshToken', {
+  const clearOptions = {
     httpOnly: true,
-    sameSite: 'lax',
     secure: isProduction,
-  });
+    sameSite: (isProduction ? 'none' : 'lax') as 'none' | 'lax',
+    path: '/',
+    ...(isProduction && { domain: '.conferoo.in' }),
+  };
 
-  res.clearCookie('accessToken', {
-    httpOnly: true,
-    sameSite: 'lax',
-    secure: isProduction,
-  });
+  res.clearCookie('refreshToken', clearOptions);
+  res.clearCookie('accessToken', clearOptions);
 
   res.status(200).json({
     success: true,
@@ -234,11 +225,7 @@ export const refresh = async (req: Request, res: Response) => {
 
   const newAccessToken = await authService.refreshAccessToken(refreshToken);
 
-  res.cookie('accessToken', newAccessToken, {
-    httpOnly: true,
-    secure: isProduction,
-    sameSite: 'lax',
-  });
+  res.cookie('accessToken', newAccessToken, cookieOptions(24 * 60 * 60 * 1000));
 
   res.status(200).json({
     message: 'refresh succesfully',
@@ -257,4 +244,4 @@ export const resetPassword = async (req: Request, res: Response) => {
   const { token, newPassword } = req.body;
   await authService.resetPassword(token, newPassword);
   res.json({ message: 'Password updated successfully' });
-};
+};

services/auth-service/src/services/googleAuth.service.ts

@@ -67,6 +67,8 @@ export const googleAuthService = {
     return {
       accessToken,
       refreshToken,
+      role:user.role,
+      userId
     };
   },
 };