Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions frontend/components/FoodSearchPlaceholder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export function FoodSearchPlaceholder() {
const [isClearingAll, setIsClearingAll] = useState(false);
const [selectedLogId, setSelectedLogId] = useState<number | null>(null);
const [error, setError] = useState<string | null>(null);
const [logError, setLogError] = useState<string | null>(null);
const [logError, setLogError] = useState<string | null>(SIGN_IN_REQUIRED_LOG_MESSAGE);
const [didSearch, setDidSearch] = useState(false);
Comment thread
xrpbanks marked this conversation as resolved.
const [searchStatus, setSearchStatus] = useState<string | null>(null);

Expand Down Expand Up @@ -303,6 +303,7 @@ export function FoodSearchPlaceholder() {
const requestId = ++logsRequestIdRef.current;

setIsLogsLoading(true);
setLogError(null);
try {
const response = await backendRequest(`${BACKEND_BASE_URL}/logs`);
if (requestId !== logsRequestIdRef.current) {
Expand Down Expand Up @@ -337,10 +338,6 @@ export function FoodSearchPlaceholder() {
}
}, [clearPrivateLogState]);

useEffect(() => {
fetchLogs();
}, [fetchLogs]);

useEffect(() => {
return () => {
searchAbortControllerRef.current?.abort();
Expand Down
24 changes: 13 additions & 11 deletions frontend/components/XamanLoginPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,11 @@ export function XamanLoginPanel() {
const embeddedRequestId = useRef("");
const embeddedLoginStart = useRef<LoginStartResponse | null>(null);

const refreshCurrentUser = useCallback(async (): Promise<MeResponse | null> => {
const refreshCurrentUser = useCallback(async (signal?: AbortSignal): Promise<MeResponse | null> => {
try {
const response = await backendRequest(
`${BACKEND_BASE_URL}/api/identity/me`
`${BACKEND_BASE_URL}/api/identity/me`,
{ signal }
);
if (!response.ok) {
setCurrentUser(null);
Expand All @@ -364,8 +365,12 @@ export function XamanLoginPanel() {
}
const data = (await response.json()) as MeResponse;
setCurrentUser(data);
announceAuthState(true);
return data;
Comment thread
xrpbanks marked this conversation as resolved.
} catch {
if (signal?.aborted) {
return null;
}
setCurrentUser(null);
return null;
}
Expand All @@ -377,7 +382,7 @@ export function XamanLoginPanel() {
loginAbortController.current = controller;

async function restoreLogin() {
const user = await refreshCurrentUser();
const user = await refreshCurrentUser(controller.signal);
if (cancelled || controller.signal.aborted) {
return;
}
Expand Down Expand Up @@ -411,15 +416,13 @@ export function XamanLoginPanel() {
);
clearPendingLogin();

const restoredUser = await refreshCurrentUser();
const restoredUser = await refreshCurrentUser(controller.signal);
if (!restoredUser) {
throw new Error("Restored session was unavailable");
}
if (cancelled) {
return;
}

announceAuthState(true);
setSuccessNotice(
"Sign-in completed. Your session was restored in this browser."
);
Expand Down Expand Up @@ -448,6 +451,7 @@ export function XamanLoginPanel() {
}, [refreshCurrentUser]);

useEffect(() => {
const bridgeController = new AbortController();
let origin = trustedParentOrigin();
parentOrigin.current = origin;
setIsEmbedded(origin !== null);
Expand Down Expand Up @@ -546,13 +550,12 @@ export function XamanLoginPanel() {
throw new Error(`Callback failed with ${response.status}`);
}

const restoredUser = await refreshCurrentUser();
const restoredUser = await refreshCurrentUser(bridgeController.signal);
if (!restoredUser) {
throw new Error("CalorieApp session was unavailable");
}

embeddedLoginStart.current = null;
announceAuthState(true);
setError(null);
setLoginStatus(null);
setIsLoading(false);
Expand Down Expand Up @@ -588,6 +591,7 @@ export function XamanLoginPanel() {
window.addEventListener("message", handleParentMessage);
window.parent.postMessage({ type: "calorieapp:bridge:ready" }, "*");
return () => {
bridgeController.abort();
resizeObserver?.disconnect();
window.removeEventListener("message", handleParentMessage);
};
Expand Down Expand Up @@ -743,12 +747,10 @@ export function XamanLoginPanel() {
);
clearPendingLogin();

const restoredUser = await refreshCurrentUser();
const restoredUser = await refreshCurrentUser(controller.signal);
if (!restoredUser) {
throw new Error("Restored session was unavailable");
}

announceAuthState(true);
setSuccessNotice(
"Sign-in completed. This original CalorieApp tab is signed in too."
);
Expand Down