Fix next-auth paths and envs

Author: sebastiankrll

apps/web/Dockerfile

@@ -21,21 +21,9 @@ COPY --from=prepare /app/out/full/ .
 ARG NEXT_PUBLIC_API_URL
 ARG NEXT_PUBLIC_WEBSOCKET_URL
 ARG NEXT_PUBLIC_R2_BUCKET_URL
-ARG API_URL
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_URL
-ARG VATSIM_CLIENT_ID
-ARG VATSIM_CLIENT_SECRET
-ARG VATSIM_AUTH_URL
 ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 ENV NEXT_PUBLIC_WEBSOCKET_URL=$NEXT_PUBLIC_WEBSOCKET_URL
 ENV NEXT_PUBLIC_R2_BUCKET_URL=$NEXT_PUBLIC_R2_BUCKET_URL
-ENV API_URL=$API_URL
-ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET
-ENV NEXTAUTH_URL=$NEXTAUTH_URL
-ENV VATSIM_CLIENT_ID=$VATSIM_CLIENT_ID
-ENV VATSIM_CLIENT_SECRET=$VATSIM_CLIENT_SECRET
-ENV VATSIM_AUTH_URL=$VATSIM_AUTH_URL
 
 RUN npm run build
 

…/web/app/api/auth/[...nextauth]/route.ts apps/web/app/auth/[...nextauth]/route.tsapps/web/app/api/auth/[...nextauth]/route.ts renamed to apps/web/app/auth/[...nextauth]/route.ts apps/web/app/api/auth/[...nextauth]/route.ts renamed to apps/web/app/auth/[...nextauth]/route.ts

@@ -68,4 +68,4 @@ fieldset {
 section {
 	padding: 5.5rem 2rem 3.5rem 2rem;
 	flex: 1;
-}
+}

apps/web/app/globals.css

@@ -5,7 +5,7 @@ import { ThemeProvider } from "next-themes";
 
 export function Providers({ children }: { children: React.ReactNode }) {
 	return (
-		<SessionProvider>
+		<SessionProvider basePath="/auth">
 			<ThemeProvider>{children}</ThemeProvider>
 		</SessionProvider>
 	);

apps/web/app/providers.tsx

@@ -3,10 +3,10 @@
 import Search from "./Search";
 import "./Header.css";
 import Image from "next/image";
+import { signIn, signOut, useSession } from "next-auth/react";
 import { useEffect, useRef, useState } from "react";
 import simradar24Logo from "@/assets/images/simradar24_logo.svg";
 import Navigation from "./Navigation";
-import { signIn, signOut, useSession } from "next-auth/react";
 
 export default function Header() {
 	const [open, setOpen] = useState(false);

apps/web/app/api/user/settings/route.ts apps/web/app/user/settings/route.tsapps/web/app/api/user/settings/route.ts renamed to apps/web/app/user/settings/route.ts

@@ -31,7 +31,7 @@ export default function Loader() {
 
 		const fetchUserSettings = async () => {
 			try {
-				const res = await fetch("/api/user/settings", { cache: "no-store" });
+				const res = await fetch("/user/settings", { cache: "no-store" });
 				if (!res.ok) {
 					setStatus((prev) => ({ ...prev, initUserSettings: true }));
 					return;

apps/web/components/Header/Header.tsx

@@ -2,19 +2,23 @@
 
 import { resetMap } from "@/components/Map/utils/events";
 import "./SettingsPanel.css";
+import { useSession } from "next-auth/react";
 import { useEffect, useId, useRef, useState } from "react";
 import { HexColorPicker } from "react-colorful";
 import { getSettingValues, useSettingsStore } from "@/storage/zustand";
 
 export default function SettingsPanel() {
 	const settings = useSettingsStore();
+	const { data: session } = useSession();
 
 	const onClose = async () => {
-		await fetch("/api/user/settings", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify(getSettingValues(settings)),
-		});
+		if (session) {
+			await fetch("/user/settings", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify(getSettingValues(settings)),
+			});
+		}
 		resetMap();
 	};
 

apps/web/components/Loader/Loader.tsx

@@ -61,18 +61,18 @@ services:
         NEXT_PUBLIC_API_URL: "https://${DOMAIN}/api"
         NEXT_PUBLIC_WEBSOCKET_URL: "wss://${DOMAIN}/ws"
         NEXT_PUBLIC_R2_BUCKET_URL: ${NEXT_PUBLIC_R2_BUCKET_URL}
-        API_URL: http://api:${API_PORT}
-        NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
-        NEXTAUTH_URL: "https://${DOMAIN}"
-        VATSIM_CLIENT_ID: ${VATSIM_CLIENT_ID}
-        VATSIM_CLIENT_SECRET: ${VATSIM_CLIENT_SECRET}
-        VATSIM_AUTH_URL: ${VATSIM_AUTH_URL}
     container_name: sr24_web
     restart: always
     environment:
       NODE_ENV: production
       HOST: ${HOST}
       PORT: ${WEB_PORT}
+      API_URL: http://api:${API_PORT}
+      NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
+      NEXTAUTH_URL: https://${DOMAIN}/auth
+      VATSIM_CLIENT_ID: ${VATSIM_CLIENT_ID}
+      VATSIM_CLIENT_SECRET: ${VATSIM_CLIENT_SECRET}
+      VATSIM_AUTH_URL: ${VATSIM_AUTH_URL}
     networks:
       - traefik_proxy
     labels: