MycroftAI
/
selene-ui
mirror of https://github.com/MycroftAI/selene-ui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into test

pull/8/head
Chris Veilleux 2019-05-22 20:53:44 -05:00
parent 5876222670 e5b9efdf32
commit 2fdc50b50c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
projects/sso/src/app/modules/login/internal-login/internal-login.component.ts
View File

@ -17,6 +17,7 @@ export class InternalLoginComponent implements OnInit {
public emailControl: AbstractControl;
public loginForm: FormGroup;
public passwordControl: AbstractControl;
public passwordResetForm: FormGroup;
constructor(
private authService: ApiService,
@ -36,6 +37,9 @@ export class InternalLoginComponent implements OnInit {
});
this.emailControl = this.loginForm.controls['email'];
this.passwordControl = this.loginForm.controls['password'];
this.passwordResetForm = this.formBuilder.group({
email: [null, [Validators.email, Validators.required]],
});
}
authorizeUser(): void {
@ -56,14 +60,17 @@ export class InternalLoginComponent implements OnInit {
}
onPasswordReset() {
this.passwordResetForm.controls['email'].setValue(
this.emailControl.value
);
const dialogRef = this.dialog.open(
PasswordResetComponent,
{width: '320px', data: this.loginForm}
{width: '320px', data: this.passwordResetForm}
);
dialogRef.afterClosed().subscribe(
(result) => {
if (result) {
this.loginForm.controls['email'].setValue(result);
this.passwordResetForm.setValue(result);
this.resetPassword();
}
}
@ -76,7 +83,7 @@ export class InternalLoginComponent implements OnInit {
const snackbarConfig = new MatSnackBarConfig();
snackbarConfig.duration = fiveSeconds;
snackbarConfig.panelClass = 'mycroft-no-action-snackbar';
this.authService.resetPassword(this.loginForm.controls['email']).subscribe(
this.authService.resetPassword(this.passwordResetForm.controls['email']).subscribe(
() => { this.snackBar.open(successMessage, null, snackbarConfig); },
() => { this.snackBar.open(errorMessage, null, snackbarConfig); }
);

4
projects/sso/src/app/modules/login/password-reset/password-reset.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Inject, OnInit } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { FormGroup } from '@angular/forms';
import { FormControl, FormGroup } from '@angular/forms';
@Component({
selector: 'sso-password-reset',
@ -11,7 +11,7 @@ export class PasswordResetComponent implements OnInit {
constructor(
public dialogRef: MatDialogRef<PasswordResetComponent>,
@Inject(MAT_DIALOG_DATA) public dialogData: FormGroup
@Inject(MAT_DIALOG_DATA) public dialogData: FormControl
) { }
ngOnInit() {