diff --git a/src/app/services/lastfm_user.ts b/frontend/src/app/services/lastfm_user.ts similarity index 84% rename from src/app/services/lastfm_user.ts rename to frontend/src/app/services/lastfm_user.ts index 97ebad5..e6a0cad 100644 --- a/src/app/services/lastfm_user.ts +++ b/frontend/src/app/services/lastfm_user.ts @@ -15,3 +15,7 @@ export async function logIntoLastFM() { const { data } = await csrfRoute.get('lastfm/start/'); window.location.assign(data.auth_url); } + +export async function logoutUser() { + await djangoRoute.get('logout/'); +} diff --git a/src/lib/api/csrfApi.ts b/frontend/src/lib/api/csrfApi.ts similarity index 100% rename from src/lib/api/csrfApi.ts rename to frontend/src/lib/api/csrfApi.ts diff --git a/src/lib/api/djangoApi.ts b/frontend/src/lib/api/djangoApi.ts similarity index 100% rename from src/lib/api/djangoApi.ts rename to frontend/src/lib/api/djangoApi.ts diff --git a/src/lib/components/Navbar.tsx b/frontend/src/lib/components/Navbar.tsx similarity index 93% rename from src/lib/components/Navbar.tsx rename to frontend/src/lib/components/Navbar.tsx index a5dbf63..8049d06 100644 --- a/src/lib/components/Navbar.tsx +++ b/frontend/src/lib/components/Navbar.tsx @@ -5,6 +5,7 @@ import { useState } from "react"; import { Menu, X } from "lucide-react"; import { useRouter } from "next/navigation"; import { useAuthStore } from "../providers/auth-store-provider"; +import { logoutUser } from "../../app/services/lastfm_user"; export default function Navbar() { const [open, setOpen] = useState(false); @@ -17,17 +18,26 @@ export default function Navbar() { // Make Music Map the primary "home" landing page const navItems = [ { href: "/music-map", label: "Home" }, - { href: "/library", label: "Library" }, ]; - function signOut() { + async function signOut() { + try { + await logoutUser(); + } catch (error) { + console.error('Logout failed:', error); + } + + // Clear client-side state clearUser(); + + // Clear localStorage try { localStorage.removeItem("lastfm-store"); } catch (e) { // ignore (server-side render or restricted storage) } - router.push("/music-map"); + + router.replace("/"); } if (!isAuthenticated) { diff --git a/src/lib/providers/auth-store-provider.tsx b/frontend/src/lib/providers/auth-store-provider.tsx similarity index 100% rename from src/lib/providers/auth-store-provider.tsx rename to frontend/src/lib/providers/auth-store-provider.tsx diff --git a/src/lib/stores/auth-store.ts b/frontend/src/lib/stores/auth-store.ts similarity index 100% rename from src/lib/stores/auth-store.ts rename to frontend/src/lib/stores/auth-store.ts diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts new file mode 100644 index 0000000..a43a896 --- /dev/null +++ b/frontend/src/middleware.ts @@ -0,0 +1,37 @@ +import { NextRequest, NextResponse } from 'next/server' + +const protectedRoutes = ['/music-map'] + +export default async function middleware(req: NextRequest) { + const path = req.nextUrl.pathname + const isProtectedRoute = protectedRoutes.some(route => path.startsWith(route)) + const sessionCookie = req.cookies.get('sessionid')?.value + const hasSession = !!sessionCookie + + if (path.includes('/lastfm-callback')) { + return NextResponse.next() + } + + if (isProtectedRoute && !hasSession) { + return NextResponse.redirect(new URL('/login', req.nextUrl)) + } + + if (path === '/login' && hasSession) { + return NextResponse.redirect(new URL('/music-map', req.nextUrl)) + } + + if (path === '/') { + if (hasSession) { + return NextResponse.redirect(new URL('/music-map', req.nextUrl)) + } + } + + return NextResponse.next() +} + +// Routes middleware should run on +export const config = { + matcher: [ + '/((?!api|_next/static|_next/image|favicon.ico|.*\\.png$|.*\\.jpg$|.*\\.jpeg$|.*\\.gif$|.*\\.svg$|.*\\.css$|.*\\.js$).*)', + ], +} \ No newline at end of file diff --git a/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from tsconfig.json rename to frontend/tsconfig.json From 3a6216512894e6a6b1948e72b5e038a618654a61 Mon Sep 17 00:00:00 2001 From: jakevanhalder <124746901+jakevanhalder@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:51:36 -0800 Subject: [PATCH 2/4] Fix failing vercel builds. --- .github/workflows/build-check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml index 9e268dc..540be9d 100644 --- a/.github/workflows/build-check.yml +++ b/.github/workflows/build-check.yml @@ -12,8 +12,10 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 'lts/*' + node-version: "lts/*" - name: Install dependencies run: npm install + working-directory: ./frontend - name: Run build run: npm run build + working-directory: ./frontend From 531d8579d70d00ab67d9c5602d5a39d297b4dd6a Mon Sep 17 00:00:00 2001 From: jakevanhalder <124746901+jakevanhalder@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:59:49 -0800 Subject: [PATCH 3/4] Add missing require http method to logout view. --- backend/musicRecommendationService/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/musicRecommendationService/views.py b/backend/musicRecommendationService/views.py index da79efa..0e48270 100644 --- a/backend/musicRecommendationService/views.py +++ b/backend/musicRecommendationService/views.py @@ -1,7 +1,7 @@ import secrets from urllib.parse import urlencode from django_ratelimit.decorators import ratelimit -from django.views.decorators.http import require_GET +from django.views.decorators.http import require_GET, require_http_methods from django.shortcuts import redirect from rest_framework.views import APIView from django.middleware.csrf import get_token @@ -116,6 +116,7 @@ def csrfTokenView(request): return JsonResponse({'csrfToken': token}) # Logout endpoint to properly clear Django session +@require_http_methods(['POST']) def logout_view(request): logout(request) return JsonResponse({'success': True}) \ No newline at end of file From a6c79d0eee0c18fac5d2c4c2fcdb34ff62963c8e Mon Sep 17 00:00:00 2001 From: jakevanhalder <124746901+jakevanhalder@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:00:49 -0800 Subject: [PATCH 4/4] Remove unused imports. --- backend/musicRecommendationService/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/musicRecommendationService/views.py b/backend/musicRecommendationService/views.py index 0e48270..2c4f903 100644 --- a/backend/musicRecommendationService/views.py +++ b/backend/musicRecommendationService/views.py @@ -7,12 +7,9 @@ from django.middleware.csrf import get_token from django.conf import settings from django.utils.decorators import method_decorator -from django.shortcuts import render -from django.core.cache import cache from django.http import JsonResponse from django.contrib.auth.decorators import login_required from django.contrib.auth import get_user_model, login, logout -from .lastfm_stuff import get_session from .models import LastfmLinking from .songRecModel import musicRecommendationSystem