fix: handle login expirary
This commit is contained in:
@@ -23,6 +23,12 @@ import api from '../../src/services/api';
|
|||||||
import { syncDevicesToWidget } from '../../src/services/widgetSync';
|
import { syncDevicesToWidget } from '../../src/services/widgetSync';
|
||||||
import { Device } from '../../src/types';
|
import { Device } from '../../src/types';
|
||||||
|
|
||||||
|
const isAuthError = (error: unknown) =>
|
||||||
|
typeof error === 'object' &&
|
||||||
|
error !== null &&
|
||||||
|
'isAuthError' in error &&
|
||||||
|
(error as { isAuthError?: boolean }).isAuthError === true;
|
||||||
|
|
||||||
export default function DeviceListScreen() {
|
export default function DeviceListScreen() {
|
||||||
const colorScheme = useColorScheme() ?? 'light';
|
const colorScheme = useColorScheme() ?? 'light';
|
||||||
const isDark = colorScheme === 'dark';
|
const isDark = colorScheme === 'dark';
|
||||||
@@ -44,6 +50,11 @@ export default function DeviceListScreen() {
|
|||||||
// Sync devices to iOS widget
|
// Sync devices to iOS widget
|
||||||
syncDevicesToWidget(data);
|
syncDevicesToWidget(data);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
|
if (isAuthError(error)) {
|
||||||
|
setDevices([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// For background/periodic refreshes, avoid interruptive alerts
|
// For background/periodic refreshes, avoid interruptive alerts
|
||||||
if (showLoading) {
|
if (showLoading) {
|
||||||
Alert.alert('Error', error.message || 'Failed to load devices');
|
Alert.alert('Error', error.message || 'Failed to load devices');
|
||||||
|
|||||||
@@ -32,8 +32,8 @@ export default function SettingsScreen() {
|
|||||||
text: 'Logout',
|
text: 'Logout',
|
||||||
style: 'destructive',
|
style: 'destructive',
|
||||||
onPress: async () => {
|
onPress: async () => {
|
||||||
router.replace('/login');
|
|
||||||
await logout();
|
await logout();
|
||||||
|
router.replace('/login');
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|||||||
@@ -1,9 +1,34 @@
|
|||||||
import { Ionicons } from '@expo/vector-icons';
|
import { Ionicons } from '@expo/vector-icons';
|
||||||
import { Stack, useRouter, useSegments } from 'expo-router';
|
import { Stack, useRouter, useSegments } from 'expo-router';
|
||||||
|
import { useEffect } from 'react';
|
||||||
import { Text, TouchableOpacity } from 'react-native';
|
import { Text, TouchableOpacity } from 'react-native';
|
||||||
import { useColorScheme } from '../hooks/use-color-scheme';
|
import { useColorScheme } from '../hooks/use-color-scheme';
|
||||||
import { AuthProvider, useAuth } from '../src/context/AuthContext';
|
import { AuthProvider, useAuth } from '../src/context/AuthContext';
|
||||||
|
|
||||||
|
function AuthRedirect() {
|
||||||
|
const { isAuthenticated, isLoading } = useAuth();
|
||||||
|
const router = useRouter();
|
||||||
|
const segments = useSegments();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (isLoading) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const isLoginRoute = segments[0] === 'login';
|
||||||
|
|
||||||
|
if (!isAuthenticated && !isLoginRoute) {
|
||||||
|
router.replace('/login');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isAuthenticated && isLoginRoute) {
|
||||||
|
router.replace('/(tabs)');
|
||||||
|
}
|
||||||
|
}, [isAuthenticated, isLoading, router, segments]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function DevicesHeader() {
|
function DevicesHeader() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const isDark = useColorScheme() === 'dark';
|
const isDark = useColorScheme() === 'dark';
|
||||||
@@ -45,6 +70,7 @@ export default function RootLayout() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
|
<AuthRedirect />
|
||||||
<Stack>
|
<Stack>
|
||||||
{/* Root index that performs auth redirect (app/index.tsx) */}
|
{/* Root index that performs auth redirect (app/index.tsx) */}
|
||||||
<Stack.Screen name="index" options={{ headerShown: false }} />
|
<Stack.Screen name="index" options={{ headerShown: false }} />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { createContext, useContext, useState, useEffect } from 'react';
|
import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
|
||||||
import AsyncStorage from '@react-native-async-storage/async-storage';
|
import AsyncStorage from '@react-native-async-storage/async-storage';
|
||||||
import api from '../services/api';
|
import api from '../services/api';
|
||||||
import { AuthResponse, User } from '../types';
|
import { AuthResponse, User } from '../types';
|
||||||
@@ -27,6 +27,24 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
|
|||||||
loadAuth();
|
loadAuth();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
const clearSession = useCallback(async () => {
|
||||||
|
await AsyncStorage.multiRemove(['auth_token', 'auth_user', 'auth_can_create']);
|
||||||
|
|
||||||
|
api.clearToken();
|
||||||
|
api.clearCanCreate();
|
||||||
|
setToken(null);
|
||||||
|
setUser(null);
|
||||||
|
setCanCreate(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
api.setUnauthorizedHandler(clearSession);
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
api.setUnauthorizedHandler(null);
|
||||||
|
};
|
||||||
|
}, [clearSession]);
|
||||||
|
|
||||||
const loadAuth = async () => {
|
const loadAuth = async () => {
|
||||||
try {
|
try {
|
||||||
const storedToken = await AsyncStorage.getItem('auth_token');
|
const storedToken = await AsyncStorage.getItem('auth_token');
|
||||||
@@ -75,17 +93,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children
|
|||||||
|
|
||||||
const logout = async () => {
|
const logout = async () => {
|
||||||
try {
|
try {
|
||||||
await AsyncStorage.removeItem('auth_token');
|
await clearSession();
|
||||||
await AsyncStorage.removeItem('auth_user');
|
|
||||||
await AsyncStorage.removeItem('auth_can_create');
|
|
||||||
|
|
||||||
api.clearToken();
|
|
||||||
api.clearAddress();
|
|
||||||
api.clearCanCreate();
|
|
||||||
setToken(null);
|
|
||||||
setUser(null);
|
|
||||||
setServerAddress(null);
|
|
||||||
setCanCreate(null);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to logout', error);
|
console.error('Failed to logout', error);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ class UpSnapAPI {
|
|||||||
private token: string | null = null;
|
private token: string | null = null;
|
||||||
private address: string | null = null;
|
private address: string | null = null;
|
||||||
private canCreate: boolean | null = null;
|
private canCreate: boolean | null = null;
|
||||||
|
private unauthorizedHandler: (() => Promise<void>) | null = null;
|
||||||
|
private isHandlingUnauthorized = false;
|
||||||
|
|
||||||
setToken(token: string) {
|
setToken(token: string) {
|
||||||
this.token = token;
|
this.token = token;
|
||||||
@@ -46,6 +48,54 @@ class UpSnapAPI {
|
|||||||
this.canCreate = null;
|
this.canCreate = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setUnauthorizedHandler(handler: (() => Promise<void>) | null) {
|
||||||
|
this.unauthorizedHandler = handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleUnauthorized() {
|
||||||
|
if (!this.unauthorizedHandler || this.isHandlingUnauthorized) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isHandlingUnauthorized = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await this.unauthorizedHandler();
|
||||||
|
} finally {
|
||||||
|
this.isHandlingUnauthorized = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async throwApiError(response: Response, fallbackMessage: string): Promise<never> {
|
||||||
|
let message = fallbackMessage;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const error = await response.json();
|
||||||
|
message = error.message || fallbackMessage;
|
||||||
|
} catch {
|
||||||
|
// Ignore JSON parsing errors and use the fallback message.
|
||||||
|
}
|
||||||
|
|
||||||
|
const isAuthError =
|
||||||
|
response.status === 401 ||
|
||||||
|
response.status === 403 ||
|
||||||
|
/authorization token|invalid token|unauthorized|not authenticated/i.test(message);
|
||||||
|
|
||||||
|
if (isAuthError) {
|
||||||
|
await this.handleUnauthorized();
|
||||||
|
}
|
||||||
|
|
||||||
|
const error = new Error(message) as Error & {
|
||||||
|
status?: number;
|
||||||
|
isAuthError?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
error.status = response.status;
|
||||||
|
error.isAuthError = isAuthError;
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
private getHeaders(): HeadersInit {
|
private getHeaders(): HeadersInit {
|
||||||
const headers: HeadersInit = {
|
const headers: HeadersInit = {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
@@ -85,8 +135,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = await response.json();
|
await this.throwApiError(response, 'Authentication failed');
|
||||||
throw new Error(error.message || 'Authentication failed');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const data: AuthResponse = await response.json();
|
const data: AuthResponse = await response.json();
|
||||||
@@ -106,8 +155,7 @@ class UpSnapAPI {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
if (!userPermissionResponse.ok) {
|
if (!userPermissionResponse.ok) {
|
||||||
const error = await userPermissionResponse.json();
|
await this.throwApiError(userPermissionResponse, 'Authentication failed');
|
||||||
throw new Error(error.message || 'Authentication failed');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const user: PermissionResponse = (await userPermissionResponse.json()).items[0];
|
const user: PermissionResponse = (await userPermissionResponse.json()).items[0];
|
||||||
@@ -125,7 +173,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch devices');
|
await this.throwApiError(response, 'Failed to fetch devices');
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
@@ -141,7 +189,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to fetch device');
|
await this.throwApiError(response, 'Failed to fetch device');
|
||||||
}
|
}
|
||||||
|
|
||||||
return response.json();
|
return response.json();
|
||||||
@@ -158,8 +206,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = await response.json();
|
await this.throwApiError(response, 'Failed to create device');
|
||||||
throw new Error(error.message || 'Failed to create device');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return response.json();
|
return response.json();
|
||||||
@@ -176,8 +223,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = await response.json();
|
await this.throwApiError(response, 'Failed to update device');
|
||||||
throw new Error(error.message || 'Failed to update device');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return response.json();
|
return response.json();
|
||||||
@@ -193,7 +239,7 @@ class UpSnapAPI {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to delete device');
|
await this.throwApiError(response, 'Failed to delete device');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -203,7 +249,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to wake device');
|
await this.throwApiError(response, 'Failed to wake device');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,7 +259,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to wake group');
|
await this.throwApiError(response, 'Failed to wake group');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,7 +269,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to sleep device');
|
await this.throwApiError(response, 'Failed to sleep device');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +279,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to reboot device');
|
await this.throwApiError(response, 'Failed to reboot device');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,7 +289,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to shutdown device');
|
await this.throwApiError(response, 'Failed to shutdown device');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -253,7 +299,7 @@ class UpSnapAPI {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Failed to scan network');
|
await this.throwApiError(response, 'Failed to scan network');
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|||||||
Reference in New Issue
Block a user