ngx-sp-auth 4.22.4 → 4.22.6

package/fesm2022/ngx-sp-auth.mjs

@@ -8,7 +8,7 @@ import { LogLevel, PublicClientApplication, InteractionType } from '@azure/msal-
 import { take as take$1, tap as tap$1, map, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/router';
 import { RouterLink, NavigationEnd, RouterOutlet } from '@angular/router';
-import { BehaviorSubject, take, tap, Subject, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, map as map$1, firstValueFrom, of, lastValueFrom, from } from 'rxjs';
+import { BehaviorSubject, take, tap, Subject, firstValueFrom, Subscription, debounceTime, distinctUntilChanged, filter, switchMap, timer, map as map$1, of, lastValueFrom, from } from 'rxjs';
 import * as i3 from 'ngx-sp-infra';
 import { Utils, SearchInputComponent, InfraModule, FormUtils, Usuario, RetPasswordPolicy, RetCheckPassword, CheckPasswordRecord, PasswordPolicyComponent, LibIconsComponent, ContentContainerComponent } from 'ngx-sp-infra';
 import { openDB, deleteDB } from 'idb';
@@ -1598,7 +1598,7 @@ class MenuServicesService {
         // #region NewImg Event
         // Implementação de lógica vista no link: https://hasangalakdinu.medium.com/how-to-call-a-function-in-another-component-angular-using-rxjs-3f2e85920705
         this._subject = new Subject();
-        this._BASE_URL = `${this._customEnvironmentService.SpInfra2ErpWS}`; // SpInfra2ErpWS
+        this._BASE_URL = `${this._customEnvironmentService.Sp2LocalhostWS}`; // SpInfra2ErpWS
         this._BASE_URL = !this._customEnvironmentService.production ? this._BASE_URL : `${this._customEnvironmentService.SpInfra2ErpWS}`;
         this._BASE_URL_VERSION_INFRA = `${this._customEnvironmentService.SpInfra2AuthWS.replace('SpInfra2AuthWS', 'SpInfra2VersionWS')}`; // SpInfra2VersionWS
         this._BASE_URL_VERSION_INFRA = !this._customEnvironmentService.production ? this._BASE_URL_VERSION_INFRA : `${this._customEnvironmentService.SpInfra2AuthWS.replace('SpInfra2AuthWS', 'SpInfra2VersionWS')}`;
@@ -1819,6 +1819,28 @@ class MenuServicesService {
             }
         }));
     }
+    /** Método executado para pegar o HostName de direcionamento para a V6. */
+    GetHostServerV6() {
+        const url = `${this._BASE_URL}/Menu/GetHostServerV6`;
+        return this._httpClient.get(url, { headers: this._HTTP_HEADERS })
+            .pipe(take(1), tap((response) => { if (response.Error)
+            throw Error(response.ErrorMessage); }));
+    }
+    /**
+     * **ESTE MÉTODO FOI DUPLICADO DO MÉTODO `GetHostServerOutSystems` PARA SER UTILIZADO DE FORMA ASSÍNCRONA, SEM *OBSERVABLE*, PARA EVITAR PROBLEMAS DE SINCRONIA NA CONSTRUÇÃO DO MENU DINÂMICO.**
+     *
+     * Método async executado para pegar o HostName de direcionamento para OS de forma estática, sem Observable.
+     * Este método utiliza a função `firstValueFrom` do RxJS para converter o Observable retornado pelo HttpClient em uma Promise.
+     *
+     * @returns Promise<RetString> - Retorna uma Promise que resolve para um objeto RetString contendo o HostName de direcionamento para OS.
+     * @throws Error - Lança um erro se a resposta da API contiver um erro.
+    */
+    async getHostServerOutSystemsStatic() {
+        const url = `${this._BASE_URL}/Menu/GetHostServerOutSystems`;
+        const response = await firstValueFrom(this._httpClient.get(url, { headers: this._HTTP_HEADERS }).pipe(take(1), tap(response => { if (response.Error)
+            throw Error(response.ErrorMessage); })));
+        return response;
+    }
     getMenuFooterImg() {
         const cachedFooterImg = JSON.parse(localStorage.getItem('menuFooterImg'));
         if (cachedFooterImg) {
@@ -3504,8 +3526,8 @@ class MenuLateralComponent {
                 // Método com customizações obter o Módulo para montagem do Menu Dinâmico Lateral
                 const projetoId = this._customMenuService.menuDynamicGetProjetoId();
                 this._menuServices.getMenuLateral(projetoId).subscribe({
-                    next: response => {
-                        const menus = this.constroiRegrasDynamicMenu(response.MenuSubmenu);
+                    next: async (response) => {
+                        const menus = await this.constroiRegrasDynamicMenu(response.MenuSubmenu);
                         this._customMenuService.menuItems = this._customMenuService.menuConfig.initializeMenu(this._router.url, menus);
                     }, error: error => {
                         this._customMenuService.menuItems = this._customMenuService.menuConfig.initializeMenu(this._router.url);
@@ -3668,9 +3690,10 @@ class MenuLateralComponent {
             return url;
         return (isOutroModulo ? `https://${window.location.host}/SisproErpCloud/${url}` : `${this.HostServerOutSystems == "" ? `https://${window.location.host}` : this.HostServerOutSystems}/${url}`);
     }
-    constroiRegrasDynamicMenu(menus) {
+    async constroiRegrasDynamicMenu(menus) {
+        const hostOutsystems = await this._menuServices.getHostServerOutSystemsStatic();
         const home = { id: 0, label: "Início", descricao: "Tela inicial", icon: "casa", route: "home", isExternal: false, isSelected: this._router.url.includes("home"), isOutroModulo: false };
-        const cloud = { id: 1, label: "Ir para a Cloud", descricao: "Cloud OS", icon: "p-nuvem", route: `https://${this._hostServeUrlOutSystems}/SisproErp/`, isExternal: true, isSelected: this._router.url.includes("cloud"), isOutroModulo: true };
+        const cloud = { id: 1, label: "Ir para a Cloud", descricao: "Cloud OS", icon: "p-nuvem", route: `${hostOutsystems.String}/SisproErp/`, isExternal: true, isSelected: this._router.url.includes("cloud"), isOutroModulo: true };
         menus.unshift(cloud);
         menus.unshift(home);
         return menus;
@@ -4744,20 +4767,32 @@ class SubMenuCardComponent {
         // #region ==========> PROPERTIES <==========
         // #region PUBLIC
         this.subMenuCards = [];
-        this.hostName = "";
-        this.getExternalUrl = (url, isOutroModulo) => { return (isOutroModulo ? `${this.hostName}/SisproErpCloud/${url}` : `${this.hostName == "" ? `https://${window.location.host}` : this.hostName}/${url}`); };
+        this.hostnameOS = "";
+        this.hostnameV6 = "";
+        this.getOutroModuloUrl = (url) => { return !this.hostnameV6.startsWith('https://') ? `https://${this.hostnameV6}/SisproErpCloud/${url}` : `${this.hostnameV6}/SisproErpCloud/${url}`; };
+        this.getOutsystemsUrl = (url, isOutroModulo) => { return (isOutroModulo ? `${this.hostnameOS}/SisproErpCloud/${url}` : `${this.hostnameOS == "" ? `https://${window.location.host}` : this.hostnameOS}/${url}`); };
     }
     ngOnInit() {
-        this.GetHostName();
+        this.GetHostNameOS();
+        this.GetHostNameV6();
     }
     // #region ==========> API METHODS <==========
     // #region GET
-    GetHostName() {
+    GetHostNameOS() {
         // Validação adicionada para ignorar esta chamada caso o componente seja exibido na docs
         if (this._customEnv.product === "InfraCodeDocs")
             return;
         this._menuService.GetHostServerOutSystems().subscribe({
-            next: response => this.hostName = response.String,
+            next: response => this.hostnameOS = response.String,
+            error: error => this._authUtilService.showHttpError(error)
+        });
+    }
+    GetHostNameV6() {
+        // Validação adicionada para ignorar esta chamada caso o componente seja exibido na docs
+        if (this._customEnv.product === "InfraCodeDocs")
+            return;
+        this._menuService.GetHostServerV6().subscribe({
+            next: response => this.hostnameV6 = response.String,
             error: error => this._authUtilService.showHttpError(error)
         });
     }
@@ -4765,8 +4800,25 @@ class SubMenuCardComponent {
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.25", type: SubMenuCardComponent, isStandalone: true, selector: "sub-menu-card, lib-submenu-card", inputs: { subMenuCards: "subMenuCards" }, ngImport: i0, template: `
     <div class="max-card-menu row">
       @for(card of subMenuCards; track $index) {
-        @if (card.isExternal || card.is_OutroModulo) {
-          <a [href]="getExternalUrl(card.urlPath, card.is_OutroModulo)" target="_blank" class="card-link col-4">
+
+        <!-- VALIDAÇÃO DE 'IS_EXTERNAL' SIGNIFICA QUE A ROTA É OS -->
+        @if (card.isExternal) {
+          <a [href]="getOutsystemsUrl(card.urlPath, card.is_OutroModulo)" target="_blank" class="card-link col-4">
+            <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
+              <div class="card-icon">
+                <div class="card-icon2">
+                  <lib-icon class="bold" [iconName]="card.icon ? card.icon : 'engrenagem'" iconColor="blue" [iconSize]="35" />
+                </div>
+              </div>
+
+              <h3 class="card-title">{{ card.titulo }}</h3>
+              <p class="card-text" [title]="card.descricao"> {{ card.descricao }} </p>
+            </div>
+          </a>
+        }
+        <!-- VALIDAÇÃO DE 'IS_OUTROMODULO' SIGNIFICA QUE A ROTA É V6 PORÉM DE OUTRO PROJETO FRONTEND -->
+        @else if (card.is_OutroModulo) {
+          <a [href]="getOutroModuloUrl(card.urlPath)" target="_blank" class="card-link col-4">
             <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
               <div class="card-icon">
                 <div class="card-icon2">
@@ -4779,8 +4831,9 @@ class SubMenuCardComponent {
             </div>
           </a>
         }
+        <!-- CASO CONTRÁRIO DE TUDO SIGNIFICA QUE A ROTA É V6 E DENTRO DO MESMO MÓDULO -->
         @else {
-          <a [routerLink]="[ '/'+card.urlPath ]" class="card-link col-4">
+          <a routerLink="/{{ card.urlPath }}" class="card-link col-4">
             <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
               <div class="card-icon">
                 <div class="card-icon2">
@@ -4805,8 +4858,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
                     ], template: `
     <div class="max-card-menu row">
       @for(card of subMenuCards; track $index) {
-        @if (card.isExternal || card.is_OutroModulo) {
-          <a [href]="getExternalUrl(card.urlPath, card.is_OutroModulo)" target="_blank" class="card-link col-4">
+
+        <!-- VALIDAÇÃO DE 'IS_EXTERNAL' SIGNIFICA QUE A ROTA É OS -->
+        @if (card.isExternal) {
+          <a [href]="getOutsystemsUrl(card.urlPath, card.is_OutroModulo)" target="_blank" class="card-link col-4">
+            <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
+              <div class="card-icon">
+                <div class="card-icon2">
+                  <lib-icon class="bold" [iconName]="card.icon ? card.icon : 'engrenagem'" iconColor="blue" [iconSize]="35" />
+                </div>
+              </div>
+
+              <h3 class="card-title">{{ card.titulo }}</h3>
+              <p class="card-text" [title]="card.descricao"> {{ card.descricao }} </p>
+            </div>
+          </a>
+        }
+        <!-- VALIDAÇÃO DE 'IS_OUTROMODULO' SIGNIFICA QUE A ROTA É V6 PORÉM DE OUTRO PROJETO FRONTEND -->
+        @else if (card.is_OutroModulo) {
+          <a [href]="getOutroModuloUrl(card.urlPath)" target="_blank" class="card-link col-4">
             <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
               <div class="card-icon">
                 <div class="card-icon2">
@@ -4819,8 +4889,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
             </div>
           </a>
         }
+        <!-- CASO CONTRÁRIO DE TUDO SIGNIFICA QUE A ROTA É V6 E DENTRO DO MESMO MÓDULO -->
         @else {
-          <a [routerLink]="[ '/'+card.urlPath ]" class="card-link col-4">
+          <a routerLink="/{{ card.urlPath }}" class="card-link col-4">
             <div class="card w-100 border-0 rounded text-center glb-cursor-pointer">
               <div class="card-icon">
                 <div class="card-icon2">