coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In my testing this fixes the redirect loop on logout

Browse Source
This commit is contained in:
Tom Moor
2018-02-12 22:44:43 -08:00
parent 8ebf748cf6
commit ea471b2a19
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/components/Auth.js
View File

@ -51,7 +51,6 @@ const Auth = ({ children }: Props) => {
} }
stores.auth.logout(); stores.auth.logout();
window.location.href = BASE_URL;
return null; return null;
}; };

1
app/menus/AccountMenu.js
View File

@ -30,7 +30,6 @@ class AccountMenu extends Component {
handleLogout = () => { handleLogout = () => {
this.props.auth.logout(); this.props.auth.logout();
window.location.href = BASE_URL;
}; };
handleFeedback = () => { handleFeedback = () => {

2
app/scenes/Home/Home.js
View File

@ -11,8 +11,6 @@ type Props = {
const Home = observer(({ auth }: Props) => { const Home = observer(({ auth }: Props) => {
if (auth.authenticated) return <Redirect to="/dashboard" />; if (auth.authenticated) return <Redirect to="/dashboard" />;
auth.logout(); auth.logout();
window.location.href = BASE_URL;
return null; return null;
}); });

9
app/stores/AuthStore.js
View File

@ -42,17 +42,20 @@ class AuthStore {
this.user = res.data.user; this.user = res.data.user;
this.team = res.data.team; this.team = res.data.team;
}); });
} catch (e) { } catch (err) {
// Failure to update user info is a non-fatal error. // Failure to update user info is a non-fatal error.
console.error(err);
} }
}; };
@action @action
logout = () => { logout = async () => {
this.user = null; this.user = null;
this.token = null; this.token = null;
localForage.clear();
Cookie.remove('loggedIn', { path: '/' }); Cookie.remove('loggedIn', { path: '/' });
await localForage.clear();
window.location.href = BASE_URL;
}; };
@action @action

1
app/utils/ApiClient.js
View File

@ -67,7 +67,6 @@ class ApiClient {
// Handle 401, log out user // Handle 401, log out user
if (response.status === 401) { if (response.status === 401) {
stores.auth.logout(); stores.auth.logout();
window.location = '/';
return; return;
} }