From 528b1dbb8002b4e213cfe1e977e15bb8193ed603 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 12 Aug 2022 21:58:30 +0530
Subject: [PATCH] Forgotpassword flow changes : ps

---
 .../src/app/session/login/login.component.ts  | 28 +++++++++----------
 .../src/app/settings/users/users.module.ts    |  3 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ng6-seed/src/app/session/login/login.component.ts b/ng6-seed/src/app/session/login/login.component.ts
index 4ca8f0d..c4b047a 100755
--- a/ng6-seed/src/app/session/login/login.component.ts
+++ b/ng6-seed/src/app/session/login/login.component.ts
@@ -135,20 +135,20 @@ export class LoginComponent implements OnInit{
    * Defalut aws function 
    * @param email password,newpassword
    */
-  newpassopen() {
-    let dialogRef = this.dialog.open(NewPasswordDialog, this.config);
-    dialogRef.afterClosed().subscribe(result => {
-      if (result !== undefined) {
-        let auth = { 'Username': this.email.split(/\s/).join(''), 'Password': this.password, 'newpassword': result };
-        this.aws.dologin(auth).subscribe(res => {
-         this.getCommonSettings();
-          this.router.navigate(['/']);
-        }, err => {
-          // alert(err.message);
-        })
-      }
-    });
-  }
+  // newpassopen() {
+  //   let dialogRef = this.dialog.open(NewPasswordDialog, this.config);
+  //   dialogRef.afterClosed().subscribe(result => {
+  //     if (result !== undefined) {
+  //       let auth = { 'Username': this.email.split(/\s/).join(''), 'Password': this.password, 'newpassword': result };
+  //       this.aws.dologin(auth).subscribe(res => {
+  //        this.getCommonSettings();
+  //         this.router.navigate(['/']);
+  //       }, err => {
+  //         // alert(err.message);
+  //       })
+  //     }
+  //   });
+  // }
 
   forgotopen() {
     this.status = true;
diff --git a/ng6-seed/src/app/settings/users/users.module.ts b/ng6-seed/src/app/settings/users/users.module.ts
index 766383b..e1a74fb 100755
--- a/ng6-seed/src/app/settings/users/users.module.ts
+++ b/ng6-seed/src/app/settings/users/users.module.ts
@@ -21,7 +21,8 @@ import { RouterModule } from '@angular/router';
 import { UserRoutes} from './users.routing';
 import { UserProfileComponent, ChangePasswordDialog } from './user-profile/user-profile.component';
 import { UserService } from './../service/user.service';
-import { NewPasswordDialog, ForgotPass } from '../../session/login/login.component';
+// import { NewPasswordDialog, ForgotPass } from '../../session/login/login.component';
+import { NewPasswordDialog, ForgotPass } from '../../session/otp/otp.component';
 // import { HttpClientModule } from '@angular/common/http';
 @NgModule({
   imports: [