mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -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>
67 lines
1.8 KiB
TypeScript
67 lines
1.8 KiB
TypeScript
import config from 'app/core/config';
|
|
import coreModule from '../core_module';
|
|
import { getBackendSrv } from '@grafana/runtime/src/services';
|
|
import { promiseToDigest } from '../utils/promiseToDigest';
|
|
|
|
export class SignUpCtrl {
|
|
/** @ngInject */
|
|
constructor(private $scope: any, $location: any, contextSrv: any) {
|
|
contextSrv.sidemenu = false;
|
|
$scope.ctrl = this;
|
|
|
|
$scope.formModel = {};
|
|
|
|
const params = $location.search();
|
|
|
|
// validate email is semi ok
|
|
if (params.email && !params.email.match(/^\S+@\S+$/)) {
|
|
console.log('invalid email');
|
|
return;
|
|
}
|
|
|
|
$scope.formModel.orgName = params.email;
|
|
$scope.formModel.email = params.email;
|
|
$scope.formModel.username = params.email;
|
|
$scope.formModel.code = params.code;
|
|
|
|
$scope.verifyEmailEnabled = false;
|
|
$scope.autoAssignOrg = false;
|
|
|
|
$scope.navModel = {
|
|
main: {
|
|
icon: 'gicon gicon-branding',
|
|
text: 'Sign Up',
|
|
subTitle: 'Register your Grafana account',
|
|
breadcrumbs: [{ title: 'Login', url: 'login' }],
|
|
},
|
|
};
|
|
|
|
promiseToDigest($scope)(
|
|
getBackendSrv()
|
|
.get('/api/user/signup/options')
|
|
.then((options: any) => {
|
|
$scope.verifyEmailEnabled = options.verifyEmailEnabled;
|
|
$scope.autoAssignOrg = options.autoAssignOrg;
|
|
})
|
|
);
|
|
}
|
|
|
|
submit() {
|
|
if (!this.$scope.signUpForm.$valid) {
|
|
return;
|
|
}
|
|
|
|
getBackendSrv()
|
|
.post('/api/user/signup/step2', this.$scope.formModel)
|
|
.then((rsp: any) => {
|
|
if (rsp.code === 'redirect-to-select-org') {
|
|
window.location.href = config.appSubUrl + '/profile/select-org?signup=1';
|
|
} else {
|
|
window.location.href = config.appSubUrl + '/';
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
coreModule.controller('SignUpCtrl', SignUpCtrl);
|