@@ -143,87 +141,17 @@ export const NotFoundRouteContent: React.FC<{ hostname?: string }> = ({ hostname
const AppContent: React.FC = () => {
const { isDemoMode, isLoading: isDemoModeLoading } = useDemoMode();
- // Auth check state - start loading unless already on login page
- const [isLoading, setIsLoading] = useState(currentUiPathname() !== '/login');
- const [currentUser, setCurrentUser] = useState(null);
- const refreshPromiseRef = useRef | null>(null);
-
- const refreshCurrentUser = useCallback(async () => {
- if (refreshPromiseRef.current) return refreshPromiseRef.current;
- const request = getCurrentUser()
- .then(user => { setCurrentUser(user); })
- .finally(() => {
- if (refreshPromiseRef.current === request) refreshPromiseRef.current = null;
- });
- refreshPromiseRef.current = request;
- return request;
- }, []);
-
- // Perform initial auth check
- useEffect(() => {
- if (isDemoModeLoading) return;
-
- const checkSession = async () => {
- // Don't check if we are already on login page
- if (currentUiPathname() === '/login') {
- setIsLoading(false);
- return;
- }
-
- try {
- await refreshCurrentUser();
- // Session is valid
- setIsLoading(false);
- } catch (error) {
- // If error is NOT 'Authentication required', we let the app render (to show errors).
- // If it IS 'Authentication required', handleApiResponse handles the redirect,
- // so we keep isLoading=true to prevent UI flash.
- if (error instanceof Error && error.message !== 'Authentication required') {
- setIsLoading(false);
- }
- }
- };
-
- checkSession();
- }, [isDemoModeLoading, refreshCurrentUser]);
-
- useEffect(() => {
- const handleAuthorizationChanged = () => {
- void refreshCurrentUser().catch(error => {
- console.error('Failed to refresh instance authorization:', error);
- });
- };
- window.addEventListener(INSTANCE_AUTHORIZATION_CHANGED_EVENT, handleAuthorizationChanged);
- return () => window.removeEventListener(INSTANCE_AUTHORIZATION_CHANGED_EVENT, handleAuthorizationChanged);
- }, [refreshCurrentUser]);
+ const {
+ currentUser,
+ currentUserAbsent,
+ currentUserLoading,
+ isInitialLoading,
+ refreshCurrentUser,
+ } = useCurrentUserBootstrap({ isDemoMode, isDemoModeLoading });
- useEffect(() => {
- if (isDemoMode || currentUiPathname() === '/login') return;
- const refreshAuthorization = () => {
- if (document.visibilityState === 'hidden') return;
- void refreshCurrentUser().catch(error => {
- console.error('Failed to synchronize instance authorization:', error);
- });
- };
- const handleVisibilityChange = () => {
- if (document.visibilityState === 'visible') refreshAuthorization();
- };
- const interval = window.setInterval(refreshAuthorization, AUTHORIZATION_REFRESH_INTERVAL_MS);
- window.addEventListener('focus', refreshAuthorization);
- document.addEventListener('visibilitychange', handleVisibilityChange);
- return () => {
- window.clearInterval(interval);
- window.removeEventListener('focus', refreshAuthorization);
- document.removeEventListener('visibilitychange', handleVisibilityChange);
- };
- }, [isDemoMode, refreshCurrentUser]);
-
-
- // Render spinner while checking auth
- if (isDemoModeLoading || isLoading) return
+ // Keep the provider mounted for lifecycle attribution, but do not construct a
+ // socket until the active desktop scope has an authenticated REST user.
+ const content = isDemoModeLoading || isInitialLoading ?
+ );
+
+ const disableReasons = {
+ demoModeLoading: isDemoModeLoading,
+ demoMode: isDemoMode,
+ currentUserLoading,
+ currentUserAbsent,
+ };
+ return (
+
-
+
})