IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: The /logout route should always full page reload (#10277)

Browse Source
This commit is contained in:
Johannes Schill
2017-12-19 13:39:11 +01:00
parent dd2192cccc
commit a55b42d11f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/core/services/global_event_srv.ts
View File

@@ -6,10 +6,13 @@ import appEvents from 'app/core/app_events';
// Good for communication react > angular and vice verse // Good for communication react > angular and vice verse
export class GlobalEventSrv { export class GlobalEventSrv {
private appSubUrl; private appSubUrl;
private fullPageReloadRoutes;
/** @ngInject */ /** @ngInject */
constructor(private $location, private $timeout) { constructor(private $location, private $timeout, private $window) {
this.appSubUrl = config.appSubUrl; this.appSubUrl = config.appSubUrl;
this.fullPageReloadRoutes = ['/logout'];
} }
// Angular's $location does not like <base href...> and absolute urls // Angular's $location does not like <base href...> and absolute urls
@@ -26,9 +29,13 @@ export class GlobalEventSrv {
init() { init() {
appEvents.on('location-change', payload => { appEvents.on('location-change', payload => {
const urlWithoutBase = this.stripBaseFromUrl(payload.href); const urlWithoutBase = this.stripBaseFromUrl(payload.href);
if (this.fullPageReloadRoutes.indexOf(urlWithoutBase) > -1) {
this.$window.location.href = payload.href;
return;
}
this.$timeout(() => { // A hack to use timeout when we're changing things (in this case the url) from outside of Angular. this.$timeout(() => { // A hack to use timeout when we're changing things (in this case the url) from outside of Angular.
this.$location.url(urlWithoutBase); this.$location.url(urlWithoutBase);
}); });
}); });
} }