mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 00:25:46 -06:00
* Chore: Remove angular dependency from backendSrv * Refactor: Naive soultion for logging out unauthorized users * Refactor: Restructures to different streams * Refactor: Restructures datasourceRequest * Refactor: Flipped back if statement * Refactor: Extracted getFromFetchStream * Refactor: Extracts toFailureStream operation * Refactor: Fixes issue when options.params contains arrays * Refactor: Fixes broken test (but we need a lot more) * Refactor: Adds explaining comments * Refactor: Adds latest RxJs version so cancellations work * Refactor: Cleans up the takeUntil code * Refactor: Adds tests for request function * Refactor: Separates into smaller functions * Refactor: Adds last error tests * Started to changed so we require getBackendSrv from the @grafana-runtime when applicable. * Using the getBackendSrv from @grafana/runtime. * Changed so we use the getBackendSrv from the @grafana-runtime when possible. * Fixed so Server Admin -> Orgs works again. * Removed unused dependency. * Fixed digest issues on the Server Admin -> Users page. * Fix: Fixes digest problems in Playlists * Fix: Fixes digest issues in VersionHistory * Tests: Fixes broken tests * Fix: Fixes digest issues in Alerting => Notification channels * Fixed digest issues on the Intive page. * Fixed so we run digest after password reset email sent. * Fixed digest issue when trying to sign up account. * Fixed so the Server Admin -> Edit Org works with backendSrv * Fixed so Server Admin -> Users works with backend srv. * Fixed digest issues in Server Admin -> Orgs * Fix: Fixes digest issues in DashList plugin * Fixed digest issues on Server Admin -> users. * Fix: Fixes digest issues with Snapshots * Fixed digest issue when deleting a user. * Fix: Fixes digest issues with dashLink * Chore: Changes RxJs version to 6.5.4 which includes the same cancellation fix * Fix: Fixes digest issue when toggling folder in manage dashboards * Fix: Fixes bug in executeInOrder * Fix: Fixes digest issue with CreateFolderCtrl and FolderDashboardsCtrl * Fix: Fixes tslint error in test * Refactor: Changes default behaviour for emitted messages as before migration * Fix: Fixes various digest issues when saving, starring or deleting dashboards * Fix: Fixes digest issues with FolderPickerCtrl * Fixed digest issue. * Fixed digest issues. * Fixed issues with angular digest. * Removed the this.digest pattern. Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com> Co-authored-by: Marcus Andersson <systemvetaren@gmail.com>
72 lines
2.1 KiB
TypeScript
72 lines
2.1 KiB
TypeScript
import { coreModule, NavModelSrv } from 'app/core/core';
|
|
import { dateTime } from '@grafana/data';
|
|
import { UserSession } from 'app/types';
|
|
import { getBackendSrv } from '@grafana/runtime';
|
|
import { promiseToDigest } from 'app/core/utils/promiseToDigest';
|
|
import { IScope } from 'angular';
|
|
|
|
export class ProfileCtrl {
|
|
sessions: object[] = [];
|
|
navModel: any;
|
|
|
|
/** @ngInject */
|
|
constructor(private $scope: IScope, navModelSrv: NavModelSrv) {
|
|
this.getUserSessions();
|
|
this.navModel = navModelSrv.getNav('profile', 'profile-settings', 0);
|
|
}
|
|
|
|
getUserSessions() {
|
|
promiseToDigest(this.$scope)(
|
|
getBackendSrv()
|
|
.get('/api/user/auth-tokens')
|
|
.then((sessions: UserSession[]) => {
|
|
sessions.reverse();
|
|
|
|
const found = sessions.findIndex((session: UserSession) => {
|
|
return session.isActive;
|
|
});
|
|
|
|
if (found) {
|
|
const now = sessions[found];
|
|
sessions.splice(found, found);
|
|
sessions.unshift(now);
|
|
}
|
|
|
|
this.sessions = sessions.map((session: UserSession) => {
|
|
return {
|
|
id: session.id,
|
|
isActive: session.isActive,
|
|
seenAt: dateTime(session.seenAt).fromNow(),
|
|
createdAt: dateTime(session.createdAt).format('MMMM DD, YYYY'),
|
|
clientIp: session.clientIp,
|
|
browser: session.browser,
|
|
browserVersion: session.browserVersion,
|
|
os: session.os,
|
|
osVersion: session.osVersion,
|
|
device: session.device,
|
|
};
|
|
});
|
|
})
|
|
);
|
|
}
|
|
|
|
revokeUserSession(tokenId: number) {
|
|
promiseToDigest(this.$scope)(
|
|
getBackendSrv()
|
|
.post('/api/user/revoke-auth-token', {
|
|
authTokenId: tokenId,
|
|
})
|
|
.then(() => {
|
|
this.sessions = this.sessions.filter((session: UserSession) => {
|
|
if (session.id === tokenId) {
|
|
return false;
|
|
}
|
|
return true;
|
|
});
|
|
})
|
|
);
|
|
}
|
|
}
|
|
|
|
coreModule.controller('ProfileCtrl', ProfileCtrl);
|