alteropen/streamyfin
1
0
Fork 0
mirror of https://github.com/streamyfin/streamyfin.git synced 2026-03-26 19:26:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(auth): distinguish session expiry from network errors

Browse Source
This commit is contained in:
Fredrik Burmester
2026-02-01 12:27:22 +01:00
parent fea3e1449a
commit d17414bc93
5 changed files with 124 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/PreviousServersList.tsx
View File

@@ -73,10 +73,19 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
setLoadingServer(server.address);
try {
await onQuickLogin(server.address, account.userId);
} catch {
Alert.alert(
} catch (error) {
const errorMessage =
error instanceof Error
? error.message
: t("server.session_expired");
const isSessionExpired = errorMessage.includes(
t("server.session_expired"),
t("server.please_login_again"),
);
Alert.alert(
isSessionExpired
? t("server.session_expired")
: t("login.connection_failed"),
isSessionExpired ? t("server.please_login_again") : errorMessage,
[{ text: t("common.ok"), onPress: () => onServerSelect(server) }],
);
} finally {
@@ -122,10 +131,17 @@ export const PreviousServersList: React.FC<PreviousServersListProps> = ({
setLoadingServer(selectedServer.address);
try {
await onQuickLogin(selectedServer.address, selectedAccount.userId);
} catch {
Alert.alert(
} catch (error) {
const errorMessage =
error instanceof Error ? error.message : t("server.session_expired");
const isSessionExpired = errorMessage.includes(
t("server.session_expired"),
t("server.please_login_again"),
);
Alert.alert(
isSessionExpired
? t("server.session_expired")
: t("login.connection_failed"),
isSessionExpired ? t("server.please_login_again") : errorMessage,
[
{
text: t("common.ok"),

18
components/login/Login.tsx
View File

@@ -72,22 +72,24 @@ export const Login: React.FC = () => {
password: string;
} | null>(null);
// Handle URL params for server connection
useEffect(() => {
(async () => {
if (_apiUrl) {
await setServer({
address: _apiUrl,
});
setTimeout(() => {
if (_username && _password) {
setCredentials({ username: _username, password: _password });
login(_username, _password);
}
}, 0);
}
})();
}, [_apiUrl, _username, _password]);
}, [_apiUrl]);
// Handle auto-login when api is ready and credentials are provided via URL params
useEffect(() => {
if (api?.basePath && _apiUrl && _username && _password) {
setCredentials({ username: _username, password: _password });
login(_username, _password);
}
}, [api?.basePath, _apiUrl, _username, _password]);
useEffect(() => {
navigation.setOptions({

44
components/login/TVLogin.tsx
View File

@@ -122,19 +122,21 @@ export const TVLogin: React.FC = () => {
};
}, [stopQuickConnectPolling]);
// Auto login from URL params
// Handle URL params for server connection
useEffect(() => {
(async () => {
if (_apiUrl) {
await setServer({ address: _apiUrl });
setTimeout(() => {
if (_username && _password) {
login(_username, _password);
}
}, 0);
}
})();
}, [_apiUrl, _username, _password]);
}, [_apiUrl]);
// Handle auto-login when api is ready and credentials are provided via URL params
useEffect(() => {
if (api?.basePath && _apiUrl && _username && _password) {
login(_username, _password);
}
}, [api?.basePath, _apiUrl, _username, _password]);
// Update header
useEffect(() => {
@@ -263,10 +265,19 @@ export const TVLogin: React.FC = () => {
setLoading(true);
try {
await loginWithSavedCredential(currentServer.address, account.userId);
} catch {
Alert.alert(
} catch (error) {
const errorMessage =
error instanceof Error
? error.message
: t("server.session_expired");
const isSessionExpired = errorMessage.includes(
t("server.session_expired"),
t("server.please_login_again"),
);
Alert.alert(
isSessionExpired
? t("server.session_expired")
: t("login.connection_failed"),
isSessionExpired ? t("server.please_login_again") : errorMessage,
[
{
text: t("common.ok"),
@@ -301,10 +312,17 @@ export const TVLogin: React.FC = () => {
currentServer.address,
selectedAccount.userId,
);
} catch {
Alert.alert(
} catch (error) {
const errorMessage =
error instanceof Error ? error.message : t("server.session_expired");
const isSessionExpired = errorMessage.includes(
t("server.session_expired"),
t("server.please_login_again"),
);
Alert.alert(
isSessionExpired
? t("server.session_expired")
: t("login.connection_failed"),
isSessionExpired ? t("server.please_login_again") : errorMessage,
);
} finally {
setLoading(false);