mirror of
https://github.com/tinyauthapp/tinyauth.git
synced 2026-08-29 17:43:33 +08:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4db1b33034 | ||
|
|
f6637c0f65 |
@@ -31,7 +31,7 @@ export const ContinuePage = () => {
|
|||||||
const searchParams = new URLSearchParams(search);
|
const searchParams = new URLSearchParams(search);
|
||||||
const screenParams = useScreenParams(searchParams);
|
const screenParams = useScreenParams(searchParams);
|
||||||
const redirectUri = screenParams.redirect_uri;
|
const redirectUri = screenParams.redirect_uri;
|
||||||
const isAppLogin = screenParams.login_for === "app";
|
const isAppLogin = screenParams.login_for === "app" || !screenParams.login_for;
|
||||||
const compiledParams = (() => {
|
const compiledParams = (() => {
|
||||||
const params = searchParamsFromObject(screenParams).toString();
|
const params = searchParamsFromObject(screenParams).toString();
|
||||||
if (params.length > 0) {
|
if (params.length > 0) {
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ export const LoginPage = () => {
|
|||||||
|
|
||||||
const [isOauthAutoRedirect, setIsOauthAutoRedirect] = useState(
|
const [isOauthAutoRedirect, setIsOauthAutoRedirect] = useState(
|
||||||
providers.find((provider) => provider.id === oauth.autoRedirect) !==
|
providers.find((provider) => provider.id === oauth.autoRedirect) !==
|
||||||
undefined && screenParams.redirect_uri !== undefined,
|
undefined && (screenParams.redirect_uri || screenParams.oidc_ticket),
|
||||||
);
|
);
|
||||||
|
|
||||||
const oauthProviders = providers.filter(
|
const oauthProviders = providers.filter(
|
||||||
@@ -174,8 +174,7 @@ export const LoginPage = () => {
|
|||||||
!auth.authenticated &&
|
!auth.authenticated &&
|
||||||
isOauthAutoRedirect &&
|
isOauthAutoRedirect &&
|
||||||
!hasAutoRedirectedRef.current &&
|
!hasAutoRedirectedRef.current &&
|
||||||
screenParams.redirect_uri &&
|
(screenParams.redirect_uri || screenParams.oidc_ticket)
|
||||||
screenParams.login_for
|
|
||||||
) {
|
) {
|
||||||
hasAutoRedirectedRef.current = true;
|
hasAutoRedirectedRef.current = true;
|
||||||
oauthMutate(oauth.autoRedirect);
|
oauthMutate(oauth.autoRedirect);
|
||||||
@@ -186,8 +185,8 @@ export const LoginPage = () => {
|
|||||||
hasAutoRedirectedRef,
|
hasAutoRedirectedRef,
|
||||||
oauth.autoRedirect,
|
oauth.autoRedirect,
|
||||||
isOauthAutoRedirect,
|
isOauthAutoRedirect,
|
||||||
screenParams.login_for,
|
|
||||||
screenParams.redirect_uri,
|
screenParams.redirect_uri,
|
||||||
|
screenParams.oidc_ticket
|
||||||
]);
|
]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user