Merge pull request 'authlocalstorage' (#46) from authlocalstorage into main

Reviewed-on: #46

SerpentRace_Backend/.env.dev

@@ -32,3 +32,10 @@ MINIO_USE_SSL=false
 MAX_SPECIAL_FIELDS_PERCENTAGE=67
 MAX_GENERATION_TIME_SECONDS=20
 GENERATION_ERROR_TOLERANCE=15
+
+# EMAIL SERVICE CONFIGURATION
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=587
+EMAIL_USER=your_email@domain.com
+EMAIL_PASS=your_email_password
+EMAIL_FROM=noreply@serpentrace.com

SerpentRace_Backend/node_modules/jest-runner/build/testWorker.js

@@ -1,5 +1,5 @@
 
-/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.483\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.483/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 
 /*!
  * /**

SerpentRace_Backend/node_modules/jest/bin/jest.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.475\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.475/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '20ac9ab8d4418641bf7b8dUlMXUUwNXgNRAl1VDAkAVlMGDl1X', mode: 'build'})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\magdo\\.vscode\\extensions\\wallabyjs.console-ninja-1.0.483\\out\\buildHook\\index.js').default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/magdo/.vscode/extensions/wallabyjs.console-ninja-1.0.483/out/buildHook/index.js').then(m => m.default.default({tool: 'jest', checkSum: '201794f25617bd9f0b124dAgcXBEgHD1IJVgZUCgQHUVUCDFwF', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 
 
 /**

SerpentRace_Backend/src/Application/Services/AuthMiddleware.ts

@@ -23,9 +23,9 @@ async function isTokenBlacklisted(token: string): Promise<boolean> {
 /**
  * Extract token from request (cookie or Authorization header)
  */
-function extractToken(req: Request): string | null {
+function extractToken(req: Request, type: 'auth' | 'refresh'): string | null {
     // First try to get token from cookie
-    const cookieToken = req.cookies['auth_token'];
+    const cookieToken = req.cookies[`${type}_token`];
     if (cookieToken) {
         return cookieToken;
     }
@@ -42,8 +42,9 @@ function extractToken(req: Request): string | null {
 export async function authRequired(req: Request, res: Response, next: NextFunction) {
     try {
         // Extract token from request
-        const token = extractToken(req);
+        const token = extractToken(req, "auth");
-        if (!token) {
+        const refreshToken = extractToken(req, "refresh");
+        if (!token || !refreshToken) {
             logAuth('Authentication failed - No token provided', undefined, {
                 ip: req.ip,
                 userAgent: req.get ? req.get('User-Agent') : 'unknown',
@@ -95,8 +96,9 @@ export async function authRequired(req: Request, res: Response, next: NextFuncti
 export async function adminRequired(req: Request, res: Response, next: NextFunction) {
     try {
         // Extract token from request
-        const token = extractToken(req);
+        const token = extractToken(req, "auth");
-        if (!token) {
+        const refreshToken = extractToken(req, "refresh");
+        if (!token || !refreshToken) {
             logWarning('Admin access denied - No token provided', {
                 ip: req.ip,
                 path: req.path

SerpentRace_Backend/src/Application/Services/JWTService.ts

@@ -281,9 +281,7 @@ export class JWTService {
             } else {
                 // For cookie auth, create token pair and set cookies
                 const newTokenPair = this.create(freshPayload, res);
-                res.setHeader('X-New-Access-Token', newTokenPair.accessToken);
+                this.setTokenCookies(res, newTokenPair);
-                res.setHeader('X-New-Refresh-Token', newTokenPair.refreshToken);
-                res.setHeader('X-Token-Refreshed', 'true');
             }
             
             return true;

SerpentRace_Docker/.env.dev

@@ -42,7 +42,7 @@ EMAIL_PORT=465
 EMAIL_SECURE=true
 EMAIL_USER=noreply@serpentrace.hu
 EMAIL_PASS=ZUx720ece&Cin&F{
-EMAIL_FROM=noreply@serpentrace.com
+EMAIL_FROM=noreply@serpentrace.hu
 
 # CHAT SYSTEM CONFIGURATION
 CHAT_INACTIVITY_TIMEOUT_MINUTES=30

SerpentRace_Frontend/src/api/userApi.js

@@ -7,48 +7,20 @@ export const API_CONFIG = {
   retryAttempts: 3,
 }
 
-const apiClient = axios.create({
+export const apiClient = axios.create({
   baseURL: API_CONFIG.baseURL,
   timeout: API_CONFIG.timeout,
   withCredentials: true, // Important for cookie-based auth
   headers: {
-    "Content-Type": "application/json",
+    'Content-Type': 'application/json'
-  },
-})
-
-// Add request interceptor for debugging
-apiClient.interceptors.request.use(
-  (config) => {
-    console.log("Request URL:", config.url)
-    console.log("Request headers:", config.headers)
-    console.log("Current cookies:", document.cookie)
-    return config
-  },
-  (error) => {
-    return Promise.reject(error)
   }
-)
+});
-
-// Add response interceptor for debugging cookies
-apiClient.interceptors.response.use(
-  (response) => {
-    console.log("Response status:", response.status)
-    console.log("Response headers:", response.headers)
-    console.log("Set-Cookie headers:", response.headers["set-cookie"])
-    console.log("Cookies after response:", document.cookie)
-    return response
-  },
-  (error) => {
-    console.error("API Error:", error.response?.data || error.message)
-    return Promise.reject(error)
-  }
-)
 
 //login
 export const login = async (username, password) => {
   try {
     const response = await apiClient.post("/users/login", { username, password })
-    return response.data
+    return response
   } catch (error) {
     throw error
   }
@@ -58,7 +30,7 @@ export const login = async (username, password) => {
 export const register = async (username, email, password, fname, lname, phone) => {
   try {
     const response = await apiClient.post("/users/create", { username, email, password, fname, lname, phone })
-    return { ...response.data, status: response.status }
+    return response
   } catch (error) {
     throw error
   }
@@ -73,3 +45,13 @@ export const verifyEmail = async (token) => {
     throw error
   }
 }
+
+// Get current user's game statistics
+export const getUserStats = async () => {
+  try {
+    const response = await apiClient.get("/users/me/stats")
+    return response.data
+  } catch (error) {
+    throw error
+  }
+}

SerpentRace_Frontend/src/components/Footer/Footer.jsx

@@ -1,54 +1,69 @@
-import React from "react"
+import React, { useEffect, useRef, useState } from "react"
 import { Link } from "react-router-dom"
 import Logo from "../../assets/pictures/Logo"
 
 const ArrowUpIcon = () => <span style={{ fontSize: "1.25rem" }}>↑</span>
 
 const Footer = () => {
+  const [isVisible, setIsVisible] = useState(false)
+  const footerRef = useRef(null)
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        setIsVisible(entry.isIntersecting)
+      },
+      { threshold: 0.3 }
+    )
+
+    if (footerRef.current) {
+      observer.observe(footerRef.current)
+    }
+
+    return () => {
+      if (footerRef.current) {
+        observer.unobserve(footerRef.current)
+      }
+    }
+  }, [])
+
   const scrollToTop = () => {
     window.scrollTo({ top: 0, behavior: "smooth" })
   }
 
   return (
     <footer
+      ref={footerRef}
       className="relative bg-zinc-900 text-white border-t-2 border-zinc-800 mt-auto py-8"
       style={{ transformOrigin: "bottom center" }}
     >
-      <style>
-        {`
-          .footer-animate {
-            transition: opacity 0.8s ease, transform 0.8s ease;
-          }
-        `}
-      </style>
-
       <div className="max-w-6xl mx-auto flex flex-wrap justify-between items-start gap-8 px-4">
         {/* Logó */}
-        <div className="flex flex-col items-center footer-animate">
+        <div className="flex flex-col items-center">
-          <a href="/" className="transition-transform duration-500 hover:scale-105 hover:brightness-125">
+          <a href="/" className="hover:scale-105 hover:brightness-125">
             <Logo size={100} />
           </a>
           <span className="font-extrabold text-xl mt-2 tracking-wide">SerpentRace</span>
         </div>
 
         {/* Oldalak */}
-        <div className="flex flex-col gap-1 footer-animate">
+        <div className="flex flex-col gap-1">
           <span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
             Oldalak
           </span>
-          <a href="/" className="hover:underline hover:text-green-400 transition">
+          <a href="/" className="hover:underline hover:text-green-400">
             Főoldal
           </a>
-          <a href="/about" className="hover:underline hover:text-green-400 transition">
+          <a href="/about" className="hover:underline hover:text-green-400">
             Rólunk
           </a>
-          <a href="/contact" className="hover:underline hover:text-green-400 transition">
+          <a href="/contact" className="hover:underline hover:text-green-400">
             Kapcsolat
           </a>
         </div>
 
         {/* Közösség */}
-        <div className="flex flex-col gap-1 footer-animate">
+        <div className="flex flex-col gap-1">
           <span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
             Közösség
           </span>
@@ -56,7 +71,7 @@ const Footer = () => {
             href="https://discord.gg/"
             target="_blank"
             rel="noopener noreferrer"
-            className="hover:underline hover:text-green-400 transition"
+            className="hover:underline hover:text-green-400"
           >
             Discord
           </a>
@@ -64,14 +79,14 @@ const Footer = () => {
             href="https://github.com/"
             target="_blank"
             rel="noopener noreferrer"
-            className="hover:underline hover:text-green-400 transition"
+            className="hover:underline hover:text-green-400"
           >
             GitHub
           </a>
         </div>
 
         {/* Elérhetőség */}
-        <div className="flex flex-col gap-1 footer-animate">
+        <div className="flex flex-col gap-1">
           <span className="text-lg font-semibold text-green-400 underline underline-offset-4 mb-2 drop-shadow-sm">
             Elérhetőség
           </span>
@@ -80,18 +95,20 @@ const Footer = () => {
         </div>
       </div>
 
-      <div className="text-center mt-8 text-sm opacity-70 footer-animate">
+      <div className="text-center mt-8 text-sm opacity-70">
         © {new Date().getFullYear()} SerpentRace. Minden jog fenntartva.
       </div>
 
       {/* Scroll to top */}
-      <button
+      {isVisible && (
-        onClick={scrollToTop}
+        <button
-        className="fixed bottom-6 right-6 bg-green-500 hover:bg-green-600 text-white p-3 rounded-full shadow-lg transition transform hover:scale-110"
+          onClick={scrollToTop}
-        aria-label="Ugrás az oldal tetejére"
+          className="fixed bottom-6 right-6 bg-green-500 hover:bg-green-600 text-white p-3 rounded-full shadow-lg hover:scale-110"
-      >
+          aria-label="Ugrás az oldal tetejére"
-        <ArrowUpIcon />
+        >
-      </button>
+          <ArrowUpIcon />
+        </button>
+      )}
     </footer>
   )
 }

SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx

@@ -6,13 +6,7 @@ import ButtonGreen from "../Buttons/ButtonGreen.jsx"
 import { FaUsers, FaPaintBrush, FaHeadset } from "react-icons/fa"
 import { motion } from "framer-motion"
 
-import { useNavigate } from "react-router-dom"
+const LandingPage = ({ onNavigateToPlay, onNavigateToAuth }) => {
-
-const LandingPage = ({ onNavigateToPlay }) => {
-  const navigate = useNavigate()
-  const handleNavigateToAuth = () => {
-    navigate("/register")
-  }
   return (
     <div className="w-full">
       {/* Hero Section */}
@@ -61,8 +55,8 @@ const LandingPage = ({ onNavigateToPlay }) => {
             animate={{ opacity: 1, y: 0 }}
             transition={{ duration: 0.7, delay: 1 }}
           >
-            <ButtonGreen text="Játék" onClick={onNavigateToPlay} width="w-60" />
+            <ButtonGreen text="Bejelntekezés" onClick={onNavigateToPlay} width="w-60" />
-            <ButtonGreen text="Regisztráció" onClick={handleNavigateToAuth} width="w-60" />
+            <ButtonGreen text="Regisztráció" onClick={onNavigateToAuth} width="w-60" />
           </motion.div>
         </div>
       </motion.section>
@@ -171,7 +165,7 @@ const LandingPage = ({ onNavigateToPlay }) => {
 
             <ButtonGreen
               text="Kapcsolatfelvétel"
-              onClick={handleNavigateToAuth}
+              onClick={onNavigateToAuth}
               className="px-12 py-4 text-xl font-bold"
             />
           </motion.div>

SerpentRace_Frontend/src/pages/Auth/LoginForm.jsx

@@ -5,7 +5,7 @@ import InputBox from "../../components/Inputs/InputBox"
 import Button from "../../components/Buttons/Button"
 import { motion } from "framer-motion"
 import { useState, useEffect } from "react"
-import { useLocation } from "react-router-dom"
+import { useLocation, useNavigate } from "react-router-dom"
 import { login } from "../../api/userApi"
 
 export default function LoginForm() {
@@ -13,7 +13,9 @@ export default function LoginForm() {
   const [password, setPassword] = useState("")
   const [error, setError] = useState("")
   const location = useLocation()
+  const navigate = useNavigate()
   const [showSuccess, setShowSuccess] = useState(false)
+  const [showErrorPopup, setShowErrorPopup] = useState(false)
 
   useEffect(() => {
     if (location.state && location.state.success) {
@@ -29,22 +31,40 @@ export default function LoginForm() {
   const handleSubmit = (e) => {
     e.preventDefault()
     setError("")
+    setShowErrorPopup(false)
     if (!email || !password) {
       setError("Minden mező kitöltése kötelező.")
+      setShowErrorPopup(true)
+      setTimeout(() => setShowErrorPopup(false), 2000)
       return
     }
     if (!validateEmail(email)) {
       setError("Hibás email formátum.")
+      setShowErrorPopup(true)
+      setTimeout(() => setShowErrorPopup(false), 2000)
       return
     }
     // Backend API
     login(email, password)
-      .then((data) => {
+      .then((response) => {
-        console.log(data)
+        console.log(response)
-        console.log("Bejelentkezés:", { email, password })
+        // Csak a response.status-t ellenőrizd!
+        if (response && response.status === 200) {
+          if (response.data && response.data.user) {
+            localStorage.setItem("username", response.data.user.username)
+            localStorage.setItem("authLevel", response.data.user.authLevel)
+          }
+          navigate("/home")
+        } else {
+          setError("Hibás bejelentkezési adatok.")
+          setShowErrorPopup(true)
+          setTimeout(() => setShowErrorPopup(false), 2000)
+        }
       })
       .catch((error) => {
         setError("Hibás bejelentkezési adatok.")
+        setShowErrorPopup(true)
+        setTimeout(() => setShowErrorPopup(false), 2000)
       })
   }
 
@@ -62,7 +82,11 @@ export default function LoginForm() {
           Sikeres regisztráció! Az email ellenőrzése után be tudsz lépni.
         </div>
       )}
-      {error && <div className="mb-4 text-red-600 text-center font-semibold">{error}</div>}
+      {showErrorPopup && error && (
+        <div className="fixed top-6 left-1/2 -translate-x-1/2 bg-red-500 text-white px-6 py-2 rounded shadow-lg z-50 text-center font-semibold transition-opacity duration-300">
+          {error}
+        </div>
+      )}
       <form onSubmit={handleSubmit} className="space-y-6">
         <InputBox
           type="email"

SerpentRace_Frontend/src/pages/Auth/RegisterForm.jsx

@@ -51,12 +51,10 @@ export default function RegisterForm() {
       // Check for 201 Created status
       if (response && response.status === 201) {
         navigate("/login", { state: { success: true } })
-        console.log(response)
-        console.log("Regisztráció:", { username, email, password, firstname, lastname, phone })
       } else {
         let msg = "Sikertelen regisztráció."
-        if (response && response.error) {
+        if (response && response.data && response.data.error) {
-          msg = response.error
+          msg = response.data.error
         }
         setError(msg)
         setShowErrorPopup(true)

SerpentRace_Frontend/src/pages/Home/Home.jsx

@@ -25,7 +25,7 @@ export default function Home() {
       <div className="fixed top-0 left-0 right-0 z-30">
         <Navbar />
       </div>
-      <main className="flex-1 flex flex-col items-center justify-start py-15 min-h-0 mt-[640px]">
+      <main className="flex-1 flex flex-col items-center justify-start py-15 min-h-0 mt-[64px]">
         <PlayMenu onJoinGame={handleJoinGame} onCreateGame={handleCreateGame} user={user} />
         {/* Ide jöhetnek további szekciók, ha szeretnél még tartalmat */}
       </main>

SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx

@@ -1,23 +1,23 @@
 // src/pages/Landing/Landingpage.jsx
 // Főoldal - Landing Page
 
-import { useState } from "react"
+
+import { useNavigate } from "react-router-dom"
 import Navbar from "../../components/Navbar/Navbar"
 import Footer from "../../components/Footer/Footer.jsx"
 import Background from "../../assets/backgrounds/Background.jsx"
 import LandingPage from "../../components/Landingpage/LandingPage.jsx"
 
 export default function LandingPageMain() {
-  // Navigációs callbackok
+  const navigate = useNavigate();
+
   const handleNavigateToPlay = () => {
-    // Itt lehet navigálni a játék oldalra
+    navigate("/login"); 
-    alert("Navigáció a játék oldalra")
+  };
-  }
 
   const handleNavigateToAuth = () => {
-    // Itt lehet navigálni a bejelentkezés oldalra
+    navigate("/register");
-    alert("Navigáció a bejelentkezés oldalra")
+  };
-  }
 
   return (
     <div className="w-full min-h-screen flex flex-col relative overflow-x-hidden">
@@ -32,5 +32,5 @@ export default function LandingPageMain() {
       </main>
       <Footer />
     </div>
-  )
+  );
 }

SerpentRace_Frontend/src/pages/Report/Reports.jsx

@@ -3,6 +3,7 @@ import { useState } from "react"
 import Navbar from "../../components/Navbar/Navbar.jsx"
 import Footer from "../../components/Footer/Footer.jsx"
 import Background from "../../assets/backgrounds/Background.jsx"
+import { getUserStats } from "../../api/userApi.js"
 
 export default function Reports() {
   return (