diff --git a/server/reflector/db/meetings.py b/server/reflector/db/meetings.py index 85178351..bb7366b1 100644 --- a/server/reflector/db/meetings.py +++ b/server/reflector/db/meetings.py @@ -2,7 +2,6 @@ from datetime import datetime from typing import Literal import sqlalchemy as sa -from fastapi import HTTPException from pydantic import BaseModel, Field from reflector.db import get_database, metadata @@ -178,23 +177,6 @@ class MeetingController: return None return Meeting(**result) - async def get_by_id_for_http(self, meeting_id: str, user_id: str | None) -> Meeting: - """ - Get a meeting by ID for HTTP request. - - If not found, it will raise a 404 error. - """ - query = meetings.select().where(meetings.c.id == meeting_id) - result = await get_database().fetch_one(query) - if not result: - raise HTTPException(status_code=404, detail="Meeting not found") - - meeting = Meeting(**result) - if result["user_id"] != user_id: - meeting.host_room_url = "" - - return meeting - async def update_meeting(self, meeting_id: str, **kwargs): query = meetings.update().where(meetings.c.id == meeting_id).values(**kwargs) await get_database().execute(query) diff --git a/www/app/lib/apiClient.tsx b/www/app/lib/apiClient.tsx index cd97e151..133db7c3 100644 --- a/www/app/lib/apiClient.tsx +++ b/www/app/lib/apiClient.tsx @@ -2,12 +2,6 @@ import createClient from "openapi-fetch"; import type { paths } from "../reflector-api"; -import { - queryOptions, - useMutation, - useQuery, - useSuspenseQuery, -} from "@tanstack/react-query"; import createFetchClient from "openapi-react-query"; import { assertExistsAndNonEmptyString } from "./utils"; import { isBuildPhase } from "./next"; @@ -16,16 +10,11 @@ const API_URL = !isBuildPhase ? assertExistsAndNonEmptyString(process.env.NEXT_PUBLIC_API_URL) : "http://localhost"; -// Create the base openapi-fetch client with a default URL -// The actual URL will be set via middleware in AuthProvider export const client = createClient({ baseUrl: API_URL, }); -export const $api = createFetchClient(client); - -let currentAuthToken: string | null | undefined = null; - +// has to be called BEFORE $api is created with createFetchClient(client) or onRequest doesn't fire [at least for POST] client.use({ onRequest({ request }) { if (currentAuthToken) { @@ -44,6 +33,10 @@ client.use({ }, }); +export const $api = createFetchClient(client); + +let currentAuthToken: string | null | undefined = null; + // the function contract: lightweight, idempotent export const configureApiAuth = (token: string | null | undefined) => { currentAuthToken = token;