@propmix/profet-common-header 3.1.1 → 3.1.2

package/fesm2020/propmix-profet-common-header.mjs

@@ -29,8 +29,8 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { DomSanitizer } from '@angular/platform-browser';
 import * as i1$1 from '@angular/router';
 import { Router } from '@angular/router';
-import { getCurrentUser, signOut } from 'aws-amplify/auth';
-import { Observable, ReplaySubject, reduce, forkJoin } from 'rxjs';
+import { signOut } from 'aws-amplify/auth';
+import { Observable, ReplaySubject, reduce } from 'rxjs';
 import * as i10 from '@angular/material/core';
 
 class CompanySwitchWarningComponent {
@@ -56,7 +56,7 @@ EndPoints.API_URLS = {
     getUserCompanies: '/api/profile/getUserCompanies',
     updateUserCompany: '/api/company/updateUserCompany',
     fetchCompanyProfile: '/fetchCompanyProfile',
-    findByEmail: '/api/users/search/findByEmail',
+    getUserDetails: '/api/user/getUserInformation',
     getCompanyList: '/api/user/getUserCompanies',
     getAppMenu: '/api/user/getAppMenu',
     updateLastAccessedApplication: '/api/user/updateLastAccessedApplication'
@@ -285,8 +285,8 @@ class CommonHeaderService {
             return acc;
         }, {}));
     }
-    getUserDetailsByEmail(reqBody) {
-        let url = `${this.baseUrl + EndPoints.API_URLS.findByEmail + '?' + Utilities.convertObjectToQueryString(reqBody)}`;
+    getUserDetails() {
+        let url = `${this.baseUrl + EndPoints.API_URLS.getUserDetails}`;
         return this._apiGatewayService.doGet(url);
     }
     getCompanyList() {
@@ -397,7 +397,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
 
 class HeaderComponent {
     constructor() {
-        this.username = '';
         this.portalUrl = '';
         this.userImageLink = null;
         this.userCompanyLogo = '';
@@ -415,24 +414,34 @@ class HeaderComponent {
     async ngOnInit() {
         this.updateLastAccessedAppInfo();
         this.getCompanyList();
-        let userInfo = await getCurrentUser();
-        if (userInfo?.username) {
-            let userDetails = this._headerSer.getUserDetailsByEmail({
-                email: userInfo.username,
-            });
-            forkJoin([userDetails]).subscribe({
-                next: (res) => {
-                    if (res && res[0]) {
-                        this.userAuthData = res[0];
-                        this.username = this.userAuthData.firstName;
-                        this.getMenuList();
-                        if (this.userAuthData?._links?.profileImage?.href) {
-                            this.getUserProfile();
-                        }
+        this._headerSer.getUserDetails().subscribe({
+            next: (res) => {
+                if (res) {
+                    this.userAuthData = res;
+                    this.getMenuList();
+                    if (res.profileImage) {
+                        this.userImageLink = res.profileImage.locationUrl
+                            ? this._domSanitizer.bypassSecurityTrustUrl(res.profileImage.locationUrl)
+                            : null;
                     }
-                },
-            });
-        }
+                }
+            }
+        });
+        // if (userInfo?.username) {
+        //   let userDetails = this._headerSer.getUserDetails();
+        //   forkJoin([userDetails]).subscribe({
+        //     next: (res) => {
+        //       if (res && res[0]) {
+        //         this.userAuthData = res[0];
+        //         this.username = this.userAuthData.firstName;
+        //         this.getMenuList();
+        //         if (this.userAuthData?._links?.profileImage?.href) {
+        //           this.getUserProfile();
+        //         }
+        //       }
+        //     },
+        //   });
+        // }
         this.resetTimer();
     }
     resetTimer() {
@@ -521,17 +530,6 @@ class HeaderComponent {
             }
         });
     }
-    getUserProfile() {
-        this._headerSer
-            .obtainDataByUrl(this.userAuthData._links.profileImage.href)
-            .subscribe((img) => {
-            if (img?.locationUrl) {
-                this.userImageLink = img.locationUrl
-                    ? this._domSanitizer.bypassSecurityTrustUrl(img.locationUrl)
-                    : null;
-            }
-        });
-    }
     profile() {
         if (this._headerSer.headerConfig.appType == PROFET_APPS.profet_portal) {
             this._router.navigateByUrl('/app/profile');