end user mobile-forgot mail

ng-seed/src/app/session-services/session.service.ts

@@ -32,9 +32,9 @@ export class SessionService {
     // return this._http.post(this.apiUrl + 'login', {'email':params.email,'password':params.password})
   }
 
-  resetPasswordApi(forgotDetails,resetPassword): Observable<any> {
+  resetPasswordApi(email,token,resetPassword): Observable<any> {
-    console.log(forgotDetails,resetPassword)
+    console.log(resetPassword)
-    return this._http.post<any>(this.apiUrl + "reset-password/"+forgotDetails.email+'/'+forgotDetails.token,resetPassword)
+    return this._http.post<any>(this.apiUrl + "reset-password/"+email+'/'+token,resetPassword)
     // return this._http.post(this.apiUrl + 'login', {'email':params.email,'password':params.password})
   }
 

ng-seed/src/app/session/forgot-password/forgot-password-component.html

@@ -26,4 +26,5 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<notifier-container></notifier-container>

ng-seed/src/app/session/forgot-password/forgot-password.component.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit,ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import {Router} from "@angular/router";
+import { NotifierService } from 'angular-notifier';
 import { SessionService } from 'app/session-services/session.service';
 
 @Component({
@@ -17,7 +18,7 @@ export class ForgotPasswordComponent {
   forgotTokenEmail: any;
   forgotMailDara: any;
 
-  constructor(private router: Router,public _ser:SessionService) {
+  constructor(private router: Router,public _ser:SessionService,private notifierService: NotifierService) {
     this._ser.forgotEmail_observable$.subscribe((res) => {
       console.log('email', res); 
      this.forgotMailDara = res
@@ -34,13 +35,14 @@ export class ForgotPasswordComponent {
   submit(){
     console.log(this.form.value)   
     const mailid = this.form['value'].email.split(/\s/).join('');    
-    let forgotMail = {'email':mailid}
+    let forgotMail = {'email':mailid,'urlDomain':window.location.origin}
     console.log(forgotMail)
     this._ser.getForgotToken(forgotMail).subscribe(res => {
       console.log(res)
       this.forgotTokenEmail = res
       this._ser.getForgotDetails(this.forgotTokenEmail)
-      this.router.navigate(['authentication/reset-password'])
+      this.notifierService.notify('warning', res.message);
+      //this.router.navigate(['authentication/reset-password'])
     }, err => {
      
       //alert(err.message);

ng-seed/src/app/session/reset-password/reset-password.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { SessionService } from 'app/session-services/session.service';
 
 @Component({
@@ -12,6 +12,7 @@ import { SessionService } from 'app/session-services/session.service';
 export class ResetPasswordComponent implements OnInit {
   form: FormGroup;
   forgotApiDetails: string;
+<<<<<<< HEAD
   hide: boolean;
   hide2:boolean;
   constructor(private router: Router,public _ser:SessionService) { }
@@ -23,6 +24,19 @@ export class ResetPasswordComponent implements OnInit {
       this.forgotApiDetails = data;
       console.log(this.forgotApiDetails)
     });
+=======
+  email:any=[];
+  token:any = [];
+  constructor(private router: Router,public _ser:SessionService,private route: ActivatedRoute) { }
+
+  ngOnInit(): void {
+    // this._ser.name.subscribe(data=>{
+    //   this.forgotApiDetails = data;
+    //   console.log(this.forgotApiDetails)
+    // });
+    this.email = this.route.snapshot.paramMap.get('email');
+    this.token = this.route.snapshot.paramMap.get('token');
+>>>>>>> d71932e5e29ec8a54c96b8028b0207cb563576b2
 
     this.form = new FormGroup({     
       password: new FormControl('', [Validators.required,Validators.pattern(
@@ -39,7 +53,7 @@ export class ResetPasswordComponent implements OnInit {
 
   submit(){
     console.log(this.form.value)  
-    this._ser.resetPasswordApi(this.forgotApiDetails,this.form.value).subscribe(res => {
+    this._ser.resetPasswordApi(this.email, this.token ,this.form.value).subscribe(res => {
       console.log(res)
       if(res.status == 200){
         this.router.navigate(['authentication/login'])

ng-seed/src/app/session/session.routing.ts

@@ -28,7 +28,7 @@ export const SessionRoutes: Routes = [{
     path: 'otp',
     component: OtpComponent
   },{
-    path: 'reset-password',
+    path: 'reset-password/:email/:token',
     component: ResetPasswordComponent
   }
 ]

ng-seed/src/environments/environment.ts

@@ -7,12 +7,12 @@ export const environment = {
   production: false,
   environmentName: 'Testing Environment',//Localhost Environment.
 // apiEndpoint:'http://venbainfotech.com:5000/api/', 
-//  apiEndpoint:'http://192.168.1.20:8080/api/',
+   apiEndpoint:'http://192.168.1.19:8080/api/',
 // apiEndpoint:'https://api.venbait.in/api/', 
   // apiEndpoint:'http://venbainfotech.com:5000/api/', 
 //  apiEndpoint:'http://192.168.1.17:8080/api/',
 
- apiEndpoint:'https://api.venbait.in/api/',
+// apiEndpoint:'https://api.venbait.in/api/',
   
   //EndUser URL
   endUserUrl: window.location.origin+'/#/customer/',