Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reject promise in checkError with logoutUser: false and without redirectTo causes an error #10172 #10177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reject promise in checkError with logoutUser: false and without redirectTo causes an error #10172 #10177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/ra-core/src/auth/useLogoutIfAccessDenied.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,17 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
if (logoutUser) {
logout({}, redirectTo);
} else {
if (redirectTo.startsWith('http')) {
// absolute link (e.g. https://my.oidc.server/login)
window.location.href = redirectTo;
if (redirectTo != null) {
if (redirectTo.startsWith('http')) {
// absolute link (e.g. https://my.oidc.server/login)
window.location.href = redirectTo;
} else {
// internal location
navigate(redirectTo);
}
} else {
// internal location
navigate(redirectTo);
// If there is not redirect return false saying loguout is not successful
return false;
Comment on lines +115 to +116
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should rather return true here, since logout was explicitly not requested, and I'm afraid this will throw another error in this code:

react-admin/packages/ra-core/src/dataProvider/useDataProvider.ts

Lines 124 to 136 in f67649d

return logoutIfAccessDenied(error).then(
loggedOut => {
if (loggedOut)
return {
data: arrayReturnTypes.includes(
type
)
? []
: {},
};
throw error;
}
);

Comment on lines 103 to +116
Copy link

@Ritzrawal Ritzrawal Dec 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better instead of using this nested if else condition we can make functions and use. This will help others to understand more easily and help to maintain the clean code e.g:


const handleRedirect = (url) => {
        if (url.startsWith('http')) {
            window.location.href = url; 
        } else {
            navigate(url); 
        }
    };



    if (logoutUser) {
        logout({}, redirectTo);
    } else if (redirectTo) {
        handleRedirect(redirectTo);
    } else {
    
        return false;
    }
};

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the long delay. Indeed, you could do that too

}
}

Expand Down
Loading