YunoHost-Apps/outline_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/outline_ynh.git synced 2024-09-03 19:56:12 +02:00
Code Issues Activity Actions

Remove auto-redirect

Browse source
This commit is contained in:
Limezy 2024-02-14 16:52:45 +07:00
parent ebe8eafc35
commit c9fcdddaec
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sources/patches/diff.txt
View file

@ -107,10 +107,23 @@ index 5d564453d..9e3c5b55b 100644
})} })}
</ButtonLarge> </ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 9a9650b48..5357d5cf5 100644 index 9a9650b48..e642869b1 100644
--- a/app/scenes/Login/index.tsx --- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx
@@ -264,7 +264,7 @@ function Login({ children }: Props) { @@ -228,12 +228,6 @@ function Login({ children }: Props) {
);
}
- // If there is only one provider and it's OIDC, redirect immediately.
- if (config.providers.length === 1 && config.providers[0].id === "oidc") {
- window.location.href = getRedirectUrl(config.providers[0].authUrl);
- return null;
- }
-
return (
<Background>
<BackButton config={config} />
@@ -264,7 +258,7 @@ function Login({ children }: Props) {
) : ( ) : (
<> <>
<StyledHeading as="h2" centered> <StyledHeading as="h2" centered>
@ -119,7 +132,7 @@ index 9a9650b48..5357d5cf5 100644
authProviderName: config.name || env.APP_NAME, authProviderName: config.name || env.APP_NAME,
})} })}
</StyledHeading> </StyledHeading>
@@ -282,7 +282,7 @@ function Login({ children }: Props) { @@ -282,7 +276,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && ( {hasMultipleProviders && (
<> <>
<Note> <Note>

19
sources/patches/main-03-login.patch
View file

@ -36,10 +36,23 @@ index 5d564453d..9e3c5b55b 100644
})} })}
</ButtonLarge> </ButtonLarge>
diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx diff --git a/app/scenes/Login/index.tsx b/app/scenes/Login/index.tsx
index 9a9650b48..5357d5cf5 100644 index 9a9650b48..e642869b1 100644
--- a/app/scenes/Login/index.tsx --- a/app/scenes/Login/index.tsx
+++ b/app/scenes/Login/index.tsx +++ b/app/scenes/Login/index.tsx
@@ -264,7 +264,7 @@ function Login({ children }: Props) { @@ -228,12 +228,6 @@ function Login({ children }: Props) {
);
}
- // If there is only one provider and it's OIDC, redirect immediately.
- if (config.providers.length === 1 && config.providers[0].id === "oidc") {
- window.location.href = getRedirectUrl(config.providers[0].authUrl);
- return null;
- }
-
return (
<Background>
<BackButton config={config} />
@@ -264,7 +258,7 @@ function Login({ children }: Props) {
) : ( ) : (
<> <>
<StyledHeading as="h2" centered> <StyledHeading as="h2" centered>
@ -48,7 +61,7 @@ index 9a9650b48..5357d5cf5 100644
authProviderName: config.name || env.APP_NAME, authProviderName: config.name || env.APP_NAME,
})} })}
</StyledHeading> </StyledHeading>
@@ -282,7 +282,7 @@ function Login({ children }: Props) { @@ -282,7 +276,7 @@ function Login({ children }: Props) {
{hasMultipleProviders && ( {hasMultipleProviders && (
<> <>
<Note> <Note>