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

signout user if /api/login/ping returns 401 unauthorized

Browse Source
This commit is contained in:
Marcus Efraimsson
2019-02-01 01:22:56 +01:00
parent dd5a8275f1
commit bd83078025
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
public/app/core/services/backend_srv.ts
View File

@@ -1,6 +1,7 @@
import _ from 'lodash'; import _ from 'lodash';
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
import appEvents from 'app/core/app_events'; import appEvents from 'app/core/app_events';
import config from 'app/core/config';
import { DashboardModel } from 'app/features/dashboard/state/DashboardModel'; import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
export class BackendSrv { export class BackendSrv {
@@ -103,10 +104,17 @@ export class BackendSrv {
err => { err => {
// handle unauthorized // handle unauthorized
if (err.status === 401 && this.contextSrv.user.isSignedIn && firstAttempt) { if (err.status === 401 && this.contextSrv.user.isSignedIn && firstAttempt) {
return this.loginPing().then(() => { return this.loginPing()
options.retry = 1; .then(() => {
return this.request(options); options.retry = 1;
}); return this.request(options);
})
.catch(err => {
if (err.status === 401) {
window.location.href = config.appSubUrl + '/logout';
throw err;
}
});
} }
this.$timeout(this.requestErrorHandler.bind(this, err), 50); this.$timeout(this.requestErrorHandler.bind(this, err), 50);
@@ -184,13 +192,20 @@ export class BackendSrv {
// handle unauthorized for backend requests // handle unauthorized for backend requests
if (requestIsLocal && firstAttempt && err.status === 401) { if (requestIsLocal && firstAttempt && err.status === 401) {
return this.loginPing().then(() => { return this.loginPing()
options.retry = 1; .then(() => {
if (canceler) { options.retry = 1;
canceler.resolve(); if (canceler) {
} canceler.resolve();
return this.datasourceRequest(options); }
}); return this.datasourceRequest(options);
})
.catch(err => {
if (err.status === 401) {
window.location.href = config.appSubUrl + '/logout';
throw err;
}
});
} }
// populate error obj on Internal Error // populate error obj on Internal Error