@@ -145,6 +151,7 @@
+ {{ confirmPasswordError$ | translate }}
+
@@ -163,7 +173,8 @@
diff --git a/src/app/user-management/change-password/change-password.component.ts b/src/app/user-management/change-password/change-password.component.ts
index fb7f0bd..595a91a 100644
--- a/src/app/user-management/change-password/change-password.component.ts
+++ b/src/app/user-management/change-password/change-password.component.ts
@@ -1,10 +1,13 @@
import { CommonModule } from '@angular/common';
-import { Component, ViewChild } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { AbstractControl, FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule, ValidationErrors, Validators } from '@angular/forms';
import { TranslateModule } from '@ngx-translate/core';
import { PasswordHideShowComponent } from '../../shared/components/password-hide-show/password-hide-show.component';
import { StorageService } from '../../shared/services/storage.service';
import { Router } from '@angular/router';
+import { URIService } from '../../app.uri';
+import { HttpURIService } from '../../app.http.uri.service';
+import { URIKey } from '../../utils/uri-enums';
@Component({
selector: 'app-change-password',
@@ -13,15 +16,12 @@ import { Router } from '@angular/router';
styleUrl: './change-password.component.scss'
})
-export class ChangePasswordComponent{
+export class ChangePasswordComponent implements OnInit{
isFirstLogin = false;
- loginForm!: FormGroup;
+ changePasswordForm!: FormGroup;
currentLanguage = new FormControl();
httpService: any;
- constructor(private storageService: StorageService, private router: Router){}
-onLangChange() {
-throw new Error('Method not implemented.');
-}
+
passwordType: string = 'password';
passwordType1: string = 'password';
passwordType2: string = 'password';
@@ -29,6 +29,7 @@ passwordType2: string = 'password';
@ViewChild('psh') passwordHideShow?: PasswordHideShowComponent;
@ViewChild('psh1') passwordHideShow1 ?: PasswordHideShowComponent;
@ViewChild('psh2') passwordHideShow2 ?: PasswordHideShowComponent;
+constructor(private fb: FormBuilder, private uriService: URIService, private httpURIService: HttpURIService){}
togglePasswordType() {
this.passwordType = this.passwordHideShow?.showPassword ? 'password' : 'text';
@@ -40,31 +41,53 @@ passwordType2: string = 'password';
this.passwordType2 = this.passwordHideShow2?.showPassword ? 'password' : 'text';
}
- ngOnInit(): void {
- // Call the method to check if first-time login
- this.checkIfFirstTimeChangePasswordOrNot();
+ passwordMatchValidator(group: AbstractControl): ValidationErrors | null {
+ const newPassword = group.get('enterNewPassword')?.value;
+ const confirmPassword = group.get('confirmPassword')?.value;
+ return newPassword === confirmPassword ? null : { passwordMismatch: true };
+ }
+
+ ngOnInit(): void {
+ this.changePasswordForm = this.fb.group({
+ oldPassword: ['', Validators.required],
+ enterNewPassword: ['',[ Validators.required, Validators.minLength(6)]],
+ confirmPassword: ['', [Validators.required, Validators.minLength(6)]]
+ },
+ {
+ validators: this.passwordMatchValidator
+ }
+ )
+ }
+ get newPasswordError$() {
+ const control = this.changePasswordForm.get('newPassword');
+ if (!control || !control.touched) return null;
+
+ if (control.hasError('required')) return 'fieldRequired';
+ if (control.hasError('minlength')) return 'passwordTooShort';
+ return null;
+ }
+
+ get confirmPasswordError$() {
+ const control = this.changePasswordForm.get('confirmPassword');
+ if (!control || !control.touched) return null;
+
+ if (control.hasError('required')) return 'fieldRequired';
+ if (control.hasError('minlength')) return 'passwordTooShort';
+ if (this.changePasswordForm.hasError('passwordMismatch')) return 'passwordsDoNotMatch';
+
+ return null;
}
- checkIfFirstTimeChangePasswordOrNot() {
- const fromMenu = history.state?.['fromMenu'];
+ onSubmit(){
+ if(this.changePasswordForm.invalid){return}
- if (fromMenu) {
- this.isFirstLogin = false;
- } else {
- try {
- const currentUser: any = JSON.parse(this.storageService.getItem('user') || '{}');
-
- // Check if user exists and has isFirstLogin flag
- if (currentUser?.user?.isFirstLogin) {
- this.isFirstLogin = true;
- } else {
- this.isFirstLogin = false;
- }
- } catch (error) {
- console.error('Error parsing user data:', error);
- this.isFirstLogin = false;
- }
+ const payload = {
+ oldPassword: this.changePasswordForm.value.oldPassword,
+ newPassword: this.changePasswordForm.value.enterNewPassword
}
+
+ this.httpURIService.requestPOST(URIKey.CHANGE_PASSWORD_URI, payload)
+ .subscribe();
}
}
diff --git a/src/app/user-management/reset-password/reset-password.component.html b/src/app/user-management/reset-password/reset-password.component.html
index 077c8bc..0c3ccaf 100644
--- a/src/app/user-management/reset-password/reset-password.component.html
+++ b/src/app/user-management/reset-password/reset-password.component.html
@@ -22,27 +22,30 @@
{{'resetPassword' | translate}}
@@ -77,22 +84,20 @@
{{ 'confirmPassword' | translate }}
*
-
+
+
+
+ {{ confirmPasswordError | translate }}
+
+
@@ -103,14 +108,12 @@
-
-
-
-
+