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 b79f669..2b74034 100644 --- a/src/app/user-management/change-password/change-password.component.ts +++ b/src/app/user-management/change-password/change-password.component.ts @@ -122,7 +122,8 @@ constructor(private fb: FormBuilder, private httpURIService: HttpURIService, pri oldPassword: form.get('oldPassword')?.value || null, // confirmPassword: form.get('confirmPassword')?.value || null, newPassword: form.get('newPassword')?.value, - userId: this.storageService.getItem('USER_ID') + userId: this.storageService.getItem('USER_ID'), + porOrgaCode: this.storageService.getItem('POR_ORGACODE') }; } onSubmit(){ diff --git a/src/app/user-management/reset-password/reset-password.component.ts b/src/app/user-management/reset-password/reset-password.component.ts index c810314..88eb407 100644 --- a/src/app/user-management/reset-password/reset-password.component.ts +++ b/src/app/user-management/reset-password/reset-password.component.ts @@ -5,6 +5,7 @@ import { CommonModule } from '@angular/common'; import { PasswordHideShowComponent } from '../../shared/components/password-hide-show/password-hide-show.component'; import { URIKey } from '../../utils/uri-enums'; import { HttpURIService } from '../../app.http.uri.service'; +import { StorageService } from '../../shared/services/storage.service'; @Component({ selector: 'app-reset-password', @@ -20,11 +21,13 @@ export class ResetPasswordComponent implements OnInit{ @ViewChild('psh1') passwordHideShow1?: PasswordHideShowComponent; @ViewChild('psh2') passwordHideShow2?: PasswordHideShowComponent; - constructor(private fb: FormBuilder, private httpURIService: HttpURIService){} - + constructor(private fb: FormBuilder, private httpURIService: HttpURIService, private storageService: StorageService){} + ngOnInit(): void { + const userIdValue = this.storageService.getItem('USER_ID') this.resetPasswordForm = this.fb.group({ - userId: ['', Validators.required], + + userId: [userIdValue || '', Validators.required], newPassword: ['', [Validators.required, Validators.minLength(6)]], confirmPassword: ['', [Validators.required, Validators.minLength(6)]] }, @@ -76,7 +79,8 @@ export class ResetPasswordComponent implements OnInit{ const payload = { userId: this.resetPasswordForm.value.userId, - newPassword: this.resetPasswordForm.value.newPassword + newPassword: this.resetPasswordForm.value.newPassword, + porOrgaCode: this.storageService.getItem('POR_ORGACODE') }; this.httpURIService.requestPOST(URIKey.RESET_PASSWORD_URI, payload) .subscribe(); diff --git a/src/assets/data/app.uri.json b/src/assets/data/app.uri.json index 17fbb50..3efbf11 100644 --- a/src/assets/data/app.uri.json +++ b/src/assets/data/app.uri.json @@ -49,7 +49,7 @@ }, { "Id" : "ENTITY_RESET_PASSWORD_URI", - "URI": "/user/resetPassword", + "URI": "/authentication/reset-password", "UUID": "RESET_PASSWORD_URI" }, {