From 81327e04dbca71ac661b908a934085956e0cf4f2 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Tue, 23 Apr 2024 20:56:04 -0700 Subject: [PATCH 1/2] #198 - Reset Admin Password Fix --- .../services/df-password.service.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/adf-user-management/services/df-password.service.ts b/src/app/adf-user-management/services/df-password.service.ts index 48e33754..b8b96537 100644 --- a/src/app/adf-user-management/services/df-password.service.ts +++ b/src/app/adf-user-management/services/df-password.service.ts @@ -16,6 +16,7 @@ import { SHOW_LOADING_HEADER, } from '../../shared/constants/http-headers'; import { DfUserDataService } from 'src/app/shared/services/df-user-data.service'; +import { faL } from '@fortawesome/free-solid-svg-icons'; @Injectable({ providedIn: 'root', @@ -35,9 +36,14 @@ export class DfPasswordService { } updatePassword(data: UpdatePasswordRequest) { - const url = this.userDataService.userData?.isSysAdmin - ? URLS.ADMIN_PASSWORD - : URLS.USER_PASSWORD; + let isSysAdmin = false; + // const url = this.userDataService.userData?.isSysAdmin + // ? URLS.ADMIN_PASSWORD + // : URLS.USER_PASSWORD; + this.userDataService.userData$.subscribe(userData => { + isSysAdmin = !!userData?.isSysAdmin; + }); + const url = isSysAdmin ? URLS.ADMIN_PASSWORD : URLS.USER_PASSWORD; return this.http .post(url, data, { headers: SHOW_LOADING_HEADER, From 209de241b6f23128854610e62c8dea6abc02f85f Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Wed, 24 Apr 2024 18:44:36 -0700 Subject: [PATCH 2/2] cleanup --- src/app/adf-user-management/services/df-password.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/adf-user-management/services/df-password.service.ts b/src/app/adf-user-management/services/df-password.service.ts index b8b96537..8ee0ba56 100644 --- a/src/app/adf-user-management/services/df-password.service.ts +++ b/src/app/adf-user-management/services/df-password.service.ts @@ -16,7 +16,6 @@ import { SHOW_LOADING_HEADER, } from '../../shared/constants/http-headers'; import { DfUserDataService } from 'src/app/shared/services/df-user-data.service'; -import { faL } from '@fortawesome/free-solid-svg-icons'; @Injectable({ providedIn: 'root',