Add a message when email notifications are not setup when requesting a password reset. #1590

This commit is contained in:
Jamie.Rees 2017-10-18 16:16:06 +01:00
parent 1c7d6af029
commit 2ec87ac3d6
2 changed files with 17 additions and 9 deletions

View file

@ -6,7 +6,7 @@ include the remember me checkbox
<div class="container" id="login"> <div class="container" id="login">
<div class="card card-container"> <div class="card card-container">
<!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> --> <!-- <img class="profile-img-card" src="//lh3.googleusercontent.com/-6V8xOA6M7BA/AAAAAAAAAAI/AAAAAAAAAAA/rzlHcD0KYwo/photo.jpg?sz=120" alt="" /> -->
<div *ngIf="!customizationSettings.logo"><img id="profile-img" class="profile-img-card" src="/images/ms-icon-150x150.png" /></div> <div *ngIf="!customizationSettings.logo"><img id="profile-img" class="profile-img-card" src="{{baseUrl}}/images/logo.png" /></div>
<div *ngIf="customizationSettings.logo"><img id="profile-img" class="center" [src]="customizationSettings.logo" /></div> <div *ngIf="customizationSettings.logo"><img id="profile-img" class="center" [src]="customizationSettings.logo" /></div>
<p id="profile-name" class="profile-name-card"></p> <p id="profile-name" class="profile-name-card"></p>

View file

@ -1,7 +1,7 @@
import { Component, OnInit } from "@angular/core"; import { Component, OnInit } from "@angular/core";
import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { FormBuilder, FormGroup, Validators } from "@angular/forms";
import { ICustomizationSettings } from "../interfaces"; import { ICustomizationSettings, IEmailNotificationSettings } from "../interfaces";
import { IdentityService } from "../services"; import { IdentityService } from "../services";
import { NotificationService } from "../services"; import { NotificationService } from "../services";
import { SettingsService } from "../services"; import { SettingsService } from "../services";
@ -14,6 +14,7 @@ export class ResetPasswordComponent implements OnInit {
public form: FormGroup; public form: FormGroup;
public customizationSettings: ICustomizationSettings; public customizationSettings: ICustomizationSettings;
public emailSettings: IEmailNotificationSettings;
constructor(private identityService: IdentityService, private notify: NotificationService, constructor(private identityService: IdentityService, private notify: NotificationService,
private fb: FormBuilder, private settingsService: SettingsService) { private fb: FormBuilder, private settingsService: SettingsService) {
@ -24,17 +25,24 @@ export class ResetPasswordComponent implements OnInit {
public ngOnInit() { public ngOnInit() {
this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x); this.settingsService.getCustomization().subscribe(x => this.customizationSettings = x);
this.settingsService.getEmailNotificationSettings().subscribe(x => this.emailSettings = x);
} }
public onSubmit(form: FormGroup) { public onSubmit(form: FormGroup) {
if (form.invalid) { if (this.emailSettings && this.emailSettings.enabled) {
this.notify.error("Validation", "Email address is required");
if (form.invalid) {
this.notify.error("Validation", "Email address is required");
return;
}
this.identityService.submitResetPassword(form.value.email).subscribe(x => {
x.errors.forEach((val) => {
this.notify.success("Password Reset", val);
});
});
} else {
this.notify.error("Not Setup", "Sorry but the administrator has not set up email notitfications!");
return; return;
} }
this.identityService.submitResetPassword(form.value.email).subscribe(x => {
x.errors.forEach((val) => {
this.notify.success("Password Reset", val);
});
});
} }
} }