Merge pull request 'promote: dev → uat (GRO-1757 SSO auto-provision fix)' (#19) from dev into uat

promote: dev → uat (GRO-1757 SSO auto-provision fix)

UAT_PLAYBOOK.md

@@ -183,18 +183,6 @@ export const { signIn, signOut, useSession, changePassword } = authClient;
 | TC-WEB-5.12.3 | Confirm appointment | Click confirm on pending appointment | Appointment status updated to confirmed |
 | TC-WEB-5.12.4 | Cancel appointment | Click cancel on appointment | Appointment marked as cancelled |
 
-#### 5.12b Dynamic Portal Time Slots (GRO-1793)
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-WEB-5.12.5 | BookingFlow dynamic slots | Open Book New, select pet and service, pick a date | Time slots fetched from API; "Checking availability…" shown while loading |
-| TC-WEB-5.12.6 | BookingFlow slots match wizard | Compare BookingFlow slot times with public booking wizard for same date | Same slots displayed |
-| TC-WEB-5.12.7 | BookingFlow error state | Mock API failure on availability fetch | "Failed to load time slots" error shown |
-| TC-WEB-5.12.8 | BookingFlow no slots | Select date with no availability | "No available slots on this date" shown |
-| TC-WEB-5.12.9 | RescheduleFlow dynamic slots | Open reschedule, pick a new date | Time slots fetched from API; loading state shown |
-| TC-WEB-5.12.10 | RescheduleFlow error state | Mock API failure on availability fetch | "Failed to load time slots" error shown |
-| TC-WEB-5.12.11 | RescheduleFlow no slots | Select date with no availability | "No available slots on this date" shown |
-
 ### 5.13 Reports UI
 
 | # | Scenario | Steps | Expected |

src/App.tsx

@@ -386,10 +386,9 @@ export function App() {
     return <Navigate to="/setup" replace />;
   }
 
-  // Redirect staff to /admin; allow customers to access portal (preserve impersonation via ?sessionId=)
+  // Redirect authenticated users to /admin (but preserve impersonation flow via ?sessionId=)
   const searchParams = new URLSearchParams(location.search);
-  const isStaff = session?.user && (session.user as any).role === "staff";
-  if (!authDisabled && session && !location.pathname.startsWith("/admin") && !searchParams.has("sessionId") && isStaff) {
+  if (!authDisabled && session && !location.pathname.startsWith("/admin") && !searchParams.has("sessionId")) {
     return <Navigate to="/admin" replace />;
   }
 

src/__tests__/Appointments.test.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
-import { render, screen, fireEvent, waitFor, act } from "@testing-library/react";
+import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import { parseTimeTo24Hour, isUpcoming, CustomerNotesSection, ConfirmationSection } from "../portal/sections/Appointments.tsx";
 
 const UPCOMING_APPT = {
@@ -379,142 +379,4 @@ describe("ConfirmationSection", () => {
       expect(screen.getByText(/Confirmed!/i)).toBeInTheDocument();
     });
   });
-});
-
-describe("RescheduleFlow dynamic time slots", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    global.fetch = vi.fn();
-  });
-
-  const RESCHEDULE_APPT = {
-    id: "appt-r1",
-    petId: "pet-1",
-    petName: "Buddy",
-    groomerId: "groomer-1",
-    groomerName: "Sarah",
-    services: ["Bath & Brush"],
-    serviceId: "service-1",
-    addOns: [],
-    date: "2027-01-01",
-    time: "10:00 AM",
-    duration: 60,
-    price: 50,
-    status: "confirmed" as const,
-    notes: "",
-    customerNotes: "",
-    confirmationStatus: "confirmed" as const,
-  };
-
-  it("shows loading state while fetching availability", async () => {
-    vi.mocked(global.fetch).mockReturnValue(new Promise(() => {})); // Never resolves
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-    fireEvent.change(dateInput, { target: { value: "2027-01-15" } });
-
-    await waitFor(() => {
-      expect(screen.getByText(/Checking availability/i)).toBeInTheDocument();
-    });
-  });
-
-  it("displays fetched time slots from API", async () => {
-    vi.mocked(global.fetch).mockResolvedValue({
-      ok: true,
-      json: async () => ["9:00 AM", "10:00 AM", "2:00 PM"],
-    } as Response);
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-    fireEvent.change(dateInput, { target: { value: "2027-01-15" } });
-
-    await waitFor(() => {
-      expect(screen.getByText("9:00 AM")).toBeInTheDocument();
-      expect(screen.getByText("10:00 AM")).toBeInTheDocument();
-      expect(screen.getByText("2:00 PM")).toBeInTheDocument();
-    });
-  });
-
-  it("shows error state when availability fetch fails", async () => {
-    vi.mocked(global.fetch).mockRejectedValue(new Error("Network error"));
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-    fireEvent.change(dateInput, { target: { value: "2027-01-15" } });
-
-    await waitFor(() => {
-      expect(screen.getByText(/Failed to load time slots/i)).toBeInTheDocument();
-    });
-  });
-
-  it("shows no slots message when API returns empty array", async () => {
-    vi.mocked(global.fetch).mockResolvedValue({
-      ok: true,
-      json: async () => [] as string[],
-    } as Response);
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-    fireEvent.change(dateInput, { target: { value: "2027-01-15" } });
-
-    await waitFor(() => {
-      expect(screen.getByText(/No available slots on this date/i)).toBeInTheDocument();
-    });
-  });
-
-  it("calls /api/book/availability with the selected date", async () => {
-    vi.mocked(global.fetch).mockResolvedValue({
-      ok: true,
-      json: async () => ["9:00 AM"] as string[],
-    } as Response);
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-    fireEvent.change(dateInput, { target: { value: "2027-02-20" } });
-
-    await waitFor(() => {
-      expect(global.fetch).toHaveBeenCalledWith(
-        "/api/book/availability?date=2027-02-20",
-        expect.objectContaining({
-          headers: expect.objectContaining({ "X-Impersonation-Session-Id": "test-session-id" }),
-        })
-      );
-    });
-  });
-
-  it("re-fetches slots when date changes", async () => {
-    vi.mocked(global.fetch)
-      .mockResolvedValueOnce({
-        ok: true,
-        json: async () => ["9:00 AM"] as string[],
-      } as Response)
-      .mockResolvedValueOnce({
-        ok: true,
-        json: async () => ["11:00 AM", "1:00 PM"] as string[],
-      } as Response);
-
-    const { RescheduleFlow } = await import("../portal/sections/Appointments.tsx");
-    render(<RescheduleFlow appointment={RESCHEDULE_APPT} onClose={() => {}} sessionId="test-session-id" />);
-
-    const dateInput = screen.getByLabelText(/date/i) || screen.getByRole("textbox", { name: /date/i });
-
-    fireEvent.change(dateInput, { target: { value: "2027-01-10" } });
-    await waitFor(() => expect(screen.getByText("9:00 AM")).toBeInTheDocument());
-
-    fireEvent.change(dateInput, { target: { value: "2027-01-15" } });
-    await waitFor(() => {
-      expect(screen.getByText("11:00 AM")).toBeInTheDocument();
-      expect(screen.getByText("1:00 PM")).toBeInTheDocument();
-    });
-  });
 });

src/portal/sections/Appointments.tsx

@@ -573,26 +573,16 @@ export function RescheduleFlow({
   const [submitting, setSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [success, setSuccess] = useState(false);
-  const [slotsLoading, setSlotsLoading] = useState(false);
-  const [slotsError, setSlotsError] = useState<string | null>(null);
-  const [availableTimes, setAvailableTimes] = useState<string[]>([]);
 
-  useEffect(() => {
-    if (!selectedDate || !sessionId) {
-      setAvailableTimes([]);
-      return;
-    }
-    const params = new URLSearchParams({ date: selectedDate });
-    setSlotsLoading(true);
-    setSlotsError(null);
-    fetch(`/api/book/availability?${params.toString()}`, {
-      headers: { "X-Impersonation-Session-Id": sessionId ?? "" },
-    })
-      .then((r) => r.json() as Promise<string[]>)
-      .then(setAvailableTimes)
-      .catch(() => setSlotsError('Failed to load time slots'))
-      .finally(() => setSlotsLoading(false));
-  }, [selectedDate, sessionId]);
+  const availableTimes = [
+    '9:00 AM',
+    '10:00 AM',
+    '11:00 AM',
+    '1:00 PM',
+    '2:00 PM',
+    '3:00 PM',
+    '4:00 PM',
+  ];
 
   async function handleSubmit() {
     if (!selectedDate || !selectedTime) return;
@@ -671,12 +661,7 @@ export function RescheduleFlow({
               />
               {selectedDate && (
                 <div className="grid grid-cols-3 gap-2 mb-4">
-                  {slotsLoading && <p className="col-span-3 text-sm text-stone-500 py-2">Checking availability…</p>}
-                  {!slotsLoading && slotsError && <p className="col-span-3 text-sm text-red-500 py-2">{slotsError}</p>}
-                  {!slotsLoading && availableTimes.length === 0 && !slotsError && (
-                    <p className="col-span-3 text-sm text-stone-500 py-2">No available slots on this date.</p>
-                  )}
-                  {!slotsLoading && availableTimes.map((time) => (
+                  {availableTimes.map((time) => (
                     <button
                       key={time}
                       onClick={() => setSelectedTime(time)}
@@ -738,26 +723,16 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [submitting, setSubmitting] = useState(false);
-  const [slotsLoading, setSlotsLoading] = useState(false);
-  const [slotsError, setSlotsError] = useState<string | null>(null);
-  const [availableTimes, setAvailableTimes] = useState<string[]>([]);
 
-  useEffect(() => {
-    if (!selectedDate || !sessionId) {
-      setAvailableTimes([]);
-      return;
-    }
-    const params = new URLSearchParams({ date: selectedDate });
-    setSlotsLoading(true);
-    setSlotsError(null);
-    fetch(`/api/book/availability?${params.toString()}`, {
-      headers: { "X-Impersonation-Session-Id": sessionId ?? "" },
-    })
-      .then((r) => r.json() as Promise<string[]>)
-      .then(setAvailableTimes)
-      .catch(() => setSlotsError('Failed to load time slots'))
-      .finally(() => setSlotsLoading(false));
-  }, [selectedDate, sessionId]);
+  const availableTimes = [
+    '9:00 AM',
+    '10:00 AM',
+    '11:00 AM',
+    '1:00 PM',
+    '2:00 PM',
+    '3:00 PM',
+    '4:00 PM',
+  ];
 
   useEffect(() => {
     const fetchData = async () => {
@@ -1080,12 +1055,7 @@ function BookingFlow({ onClose, sessionId }: BookingFlowProps) {
                   />
                   {selectedDate && (
                     <div className="grid grid-cols-3 gap-2 mb-4">
-                      {slotsLoading && <p className="col-span-3 text-sm text-stone-500 py-2">Checking availability…</p>}
-                      {!slotsLoading && slotsError && <p className="col-span-3 text-sm text-red-500 py-2">{slotsError}</p>}
-                      {!slotsLoading && availableTimes.length === 0 && !slotsError && (
-                        <p className="col-span-3 text-sm text-stone-500 py-2">No available slots on this date.</p>
-                      )}
-                      {!slotsLoading && availableTimes.map((time) => (
+                      {availableTimes.map((time) => (
                         <button
                           key={time}
                           onClick={() => setSelectedTime(time)}