Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Use shared logout function when revoking all sessions

This commit is contained in:
David Taylor 2019-11-26 16:27:14 +00:00
parent cab9c7c77e
commit 13a0da8c39
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/controllers/preferences/account.js.es6
View File

@ -1,4 +1,3 @@
import { isEmpty } from "@ember/utils";
import { not, or, gt } from "@ember/object/computed"; import { not, or, gt } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
@ -11,6 +10,7 @@ import showModal from "discourse/lib/show-modal";
import { findAll } from "discourse/models/login-method"; import { findAll } from "discourse/models/login-method";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { userPath } from "discourse/lib/url"; import { userPath } from "discourse/lib/url";
import logout from "discourse/lib/logout";
// Number of tokens shown by default. // Number of tokens shown by default.
const DEFAULT_AUTH_TOKENS_COUNT = 2; const DEFAULT_AUTH_TOKENS_COUNT = 2;
@ -240,14 +240,7 @@ export default Controller.extend(CanCheckEmails, PreferencesTabController, {
} }
) )
.then(() => { .then(() => {
if (!token) { if (!token) logout(); // All sessions revoked
const redirect = this.siteSettings.logout_redirect;
if (isEmpty(redirect)) {
window.location = Discourse.getURL("/");
} else {
window.location.href = redirect;
}
}
}) })
.catch(popupAjaxError); .catch(popupAjaxError);
}, },