oip-common 0.1.1 → 0.1.3

package/fesm2022/oip-common.mjs

@@ -29,7 +29,7 @@ import { PrimeNG } from 'primeng/config';
 import * as i3 from 'primeng/selectbutton';
 import { SelectButtonModule } from 'primeng/selectbutton';
 import { OidcSecurityService, PublicEventsService, EventTypes, StsConfigHttpLoader } from 'angular-auth-oidc-client';
-import { filter, map, switchMap, catchError } from 'rxjs/operators';
+import { filter, map, distinctUntilChanged, switchMap, catchError } from 'rxjs/operators';
 import { Tabs, TabList, Tab } from 'primeng/tabs';
 import * as i2$2 from 'primeng/avatar';
 import { AvatarModule } from 'primeng/avatar';
@@ -1475,6 +1475,10 @@ class KeycloakSecurityService extends OidcSecurityService {
          * Stores the decoded access token payload.
          */
         this.payload = new BehaviorSubject(null);
+        /**
+         * Stores user-specific data from the login response.
+         */
+        this.currentUser = new BehaviorSubject(null);
         this.publicEventsService
             .registerForEvents()
             .pipe(filter((event) => event.type === EventTypes.NewAuthenticationResult))
@@ -1483,14 +1487,17 @@ class KeycloakSecurityService extends OidcSecurityService {
         });
     }
     getCurrentUser() {
-        return this.userData;
+        return this.currentUser.getValue();
+    }
+    getCurrentUser$() {
+        return this.currentUser.asObservable();
     }
     /**
      * Returns the ID token for the sign-in.
      * @returns A string with the id token.
      */
     getAccessToken() {
-        return this.loginResponse.pipe(map((data) => data?.accessToken));
+        return super.getAccessToken();
     }
     /**
      * Indicates whether the current user has the 'admin' role.
@@ -1507,7 +1514,7 @@ class KeycloakSecurityService extends OidcSecurityService {
     auth() {
         super.checkAuth().subscribe((_response) => {
             this.loginResponse.next(_response);
-            this.userData = _response.userData;
+            this.currentUser.next(_response.userData);
             this.getPayloadFromAccessToken().subscribe((_token) => {
                 this.payload.next(_token);
             });
@@ -1528,6 +1535,7 @@ class KeycloakSecurityService extends OidcSecurityService {
     ngOnDestroy() {
         this.loginResponse.complete();
         this.payload.complete();
+        this.currentUser.complete();
     }
     /**
      * Checks whether the current access token is expired based on the 'exp' claim.
@@ -1554,6 +1562,7 @@ class UserService {
     constructor() {
         this.securityService = inject(SecurityService);
         this.baseDataService = inject(BaseDataService);
+        this.requestedPhotoEmail = null;
         /**
          * Stores the user's photo as a data URL or binary blob, depending on how it's processed.
          */
@@ -1562,7 +1571,12 @@ class UserService {
          * Indicates whether the user photo has finished loading.
          */
         this.photoLoaded = false;
-        this.getUserPhoto();
+        this.securityService
+            .getCurrentUser$()
+            .pipe(map((user) => user?.email ?? null), filter((email) => !!email), distinctUntilChanged())
+            .subscribe(() => {
+            this.getUserPhoto();
+        });
     }
     /**
      * Returns a short label composed of the user's initials.
@@ -1570,23 +1584,34 @@ class UserService {
      */
     get shortLabel() {
         const data = this.securityService.getCurrentUser();
-        return data ? data.given_name[0].toUpperCase() + data.family_name[0].toUpperCase() : '';
+        const givenNameInitial = data?.given_name?.trim()?.[0];
+        const familyNameInitial = data?.family_name?.trim()?.[0];
+        return `${givenNameInitial ?? ''}${familyNameInitial ?? ''}`.toUpperCase();
     }
     get userName() {
         const data = this.securityService.getCurrentUser();
-        return `${data.given_name} ${data.family_name}`;
+        return [data?.given_name, data?.family_name].filter(Boolean).join(' ');
     }
     /**
      * Initiates an HTTP request to fetch the user's photo based on their email,
      * and updates the `photo` and `photoLoaded` properties accordingly.
      */
     getUserPhoto() {
-        const url = this.baseDataService.buildUrl(`api/user-profile/get-user-photo?email=${this.securityService.getCurrentUser().email}`);
+        const email = this.securityService.getCurrentUser()?.email;
+        if (!email) {
+            return;
+        }
+        if (this.requestedPhotoEmail === email && (this.photoLoaded || this.photo)) {
+            return;
+        }
+        this.requestedPhotoEmail = email;
+        const url = this.baseDataService.buildUrl(`api/user-profile/get-user-photo?email=${email}`);
         this.baseDataService.getBlob(url).then((data) => {
             this.createImageFromBlob(data);
             this.photoLoaded = true;
         }, (error) => {
             console.log(error);
+            this.photoLoaded = false;
         });
     }
     /**
@@ -1980,15 +2005,18 @@ class HttpClient {
         this.layoutService = inject(LayoutService);
         this.baseUrl = "";
         this.securityData = null;
-        this.securityWorker = (securityData) => ({
-            headers: {
+        this.securityWorker = (securityData) => {
+            const headers = {
                 "Accept-language": this.layoutService.language()
                     ? this.layoutService.language()
                     : "en",
                 "X-Timezone": this.layoutService.timeZone(),
-                Authorization: `Bearer ${securityData}`,
-            },
-        });
+            };
+            if (securityData) {
+                headers.Authorization = `Bearer ${securityData}`;
+            }
+            return { headers };
+        };
         this.abortControllers = new Map();
         this.customFetch = (...fetchParams) => fetch(...fetchParams);
         this.baseApiParams = {
@@ -3120,7 +3148,8 @@ class MenuComponent {
         ];
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MenuComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: MenuComponent, isStandalone: true, selector: "app-menu", providers: [MenuApi], viewQueries: [{ propertyName: "menuItemCreateDialogComponent", first: true, predicate: MenuItemCreateDialogComponent, descendants: true }, { propertyName: "menuItemEditDialogComponent", first: true, predicate: MenuItemEditDialogComponent, descendants: true }, { propertyName: "contextMenu", first: true, predicate: ContextMenu, descendants: true }], ngImport: i0, template: ` <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: MenuComponent, isStandalone: true, selector: "app-menu", providers: [MenuApi], viewQueries: [{ propertyName: "menuItemCreateDialogComponent", first: true, predicate: MenuItemCreateDialogComponent, descendants: true }, { propertyName: "menuItemEditDialogComponent", first: true, predicate: MenuItemEditDialogComponent, descendants: true }, { propertyName: "contextMenu", first: true, predicate: ContextMenu, descendants: true }], ngImport: i0, template: `
+    <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
       <ul class="layout-menu">
         @for (item of menuService.menu; track item; let i = $index) {
           <ng-container>
@@ -3140,10 +3169,10 @@ class MenuComponent {
         }
       </ul>
     </div>
-    <p-contextMenu [target]="empty" />
-    @if (securityService.isAdmin) {
-      <menu-item-create-dialog />
-      <menu-item-edit-dialog />
+    <p-contextMenu [target]="empty"/>
+    @if (securityService.isAdmin()) {
+      <menu-item-create-dialog/>
+      <menu-item-edit-dialog/>
     }`, isInline: true, dependencies: [{ kind: "component", type: MenuItemComponent, selector: "[app-menuitem]", inputs: ["item", "index", "root", "parentKey", "menuItemCreateDialogComponent", "menuItemEditDialogComponent", "contextMenu"] }, { kind: "ngmodule", type: ButtonModule }, { kind: "ngmodule", type: ContextMenuModule }, { kind: "component", type: i1$4.ContextMenu, selector: "p-contextMenu, p-contextmenu, p-context-menu", inputs: ["model", "triggerEvent", "target", "global", "style", "styleClass", "autoZIndex", "baseZIndex", "id", "breakpoint", "ariaLabel", "ariaLabelledBy", "pressDelay", "appendTo"], outputs: ["onShow", "onHide"] }, { kind: "ngmodule", type: DialogModule }, { kind: "ngmodule", type: InputTextModule }, { kind: "component", type: MenuItemCreateDialogComponent, selector: "menu-item-create-dialog", inputs: ["visible"], outputs: ["visibleChange"] }, { kind: "ngmodule", type: FormsModule }, { kind: "component", type: MenuItemEditDialogComponent, selector: "menu-item-edit-dialog", inputs: ["visible"], outputs: ["visibleChange"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: MenuComponent, decorators: [{
@@ -3162,7 +3191,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     providers: [MenuApi],
                     selector: 'app-menu',
                     standalone: true,
-                    template: ` <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
+                    template: `
+    <div #empty class="layout-sidebar" (contextmenu)="onContextMenu($event)">
       <ul class="layout-menu">
         @for (item of menuService.menu; track item; let i = $index) {
           <ng-container>
@@ -3182,10 +3212,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         }
       </ul>
     </div>
-    <p-contextMenu [target]="empty" />
-    @if (securityService.isAdmin) {
-      <menu-item-create-dialog />
-      <menu-item-edit-dialog />
+    <p-contextMenu [target]="empty"/>
+    @if (securityService.isAdmin()) {
+      <menu-item-create-dialog/>
+      <menu-item-edit-dialog/>
     }`
                 }]
         }], propDecorators: { menuItemCreateDialogComponent: [{
@@ -5917,17 +5947,10 @@ class NotificationService {
         this.securityService = inject(SecurityService);
         this.msgService = inject(MsgService);
         this.frontendConfig = inject(OIP_FRONTEND_CONFIG);
-        this.securityService.getAccessToken().subscribe((token) => {
-            this.securityData = token;
-            if (token) {
-                this.connection.stop().then(() => {
-                    this.connection.start().then();
-                });
-            }
-        });
+        this.securityData = null;
         this.connection = new signalR.HubConnectionBuilder()
             .withUrl(this.resolveHubUrl(), {
-            accessTokenFactory: () => this.securityData,
+            accessTokenFactory: () => this.securityData ?? '',
             skipNegotiation: true,
             transport: signalR.HttpTransportType.WebSockets
         })
@@ -5942,6 +5965,19 @@ class NotificationService {
             };
             this.msgService.add(opt);
         });
+        this.securityService.getAccessToken().subscribe((token) => {
+            this.securityData = token;
+            if (!token) {
+                return;
+            }
+            if (this.connection.state === signalR.HubConnectionState.Disconnected) {
+                this.connection.start().catch((error) => console.error('Failed to start notification connection', error));
+                return;
+            }
+            this.connection.stop().then(() => {
+                this.connection.start().catch((error) => console.error('Failed to restart notification connection', error));
+            });
+        });
     }
     resolveHubUrl() {
         if (this.frontendConfig.notificationHubUrl) {