@acorex/connectivity 20.2.0-next.2 → 20.2.0-next.3

package/fesm2022/acorex-connectivity-api.mjs

@@ -1,4 +1,4 @@
-import { AXP_ROOT_CONFIG_TOKEN, AXPFilterOperatorMiddlewareService, AXPRegionalService, AXPFileStorageService, AXPFileStorageStatus } from '@acorex/platform/common';
+import { AXP_ROOT_CONFIG_TOKEN, AXPFilterOperatorMiddlewareService, AXPFileStorageService, AXPFileStorageStatus } from '@acorex/platform/common';
 import { AXPEntityResolver, AXPEntityStorageService } from '@acorex/platform/layout/entity';
 import * as i1 from '@angular/common/http';
 import { HttpParams, HttpClient, HttpHeaders } from '@angular/common/http';
@@ -11,10 +11,9 @@ import { AXPAuthStrategy, AXPSessionService, JwtUtil, TimeUtil, PkceUtil, AXPAut
 import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/widgets';
 import * as i1$1 from 'angular-oauth2-oidc';
 import { OAuthService, OAuthModule } from 'angular-oauth2-oidc';
-import { AXUSLocaleProfile, AXIRLocaleProfile } from '@acorex/core/locale';
-import { AXTranslationService } from '@acorex/core/translation';
 import { AXM_AUTH_CONFIG_TOKEN } from '@acorex/modules/auth';
 import { Router } from '@angular/router';
+import { AXCUtilsModule, AXCExternalAuthorizationService } from '@acorex/connectivity/utils';
 
 class AXCApiEntityStorageService {
     constructor(http) {
@@ -132,260 +131,13 @@ class AXCApiEntityStorageService {
             };
         });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiEntityStorageService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiEntityStorageService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiEntityStorageService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiEntityStorageService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiEntityStorageService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiEntityStorageService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
-class AXCRegionalApiService extends AXPRegionalService {
-    constructor() {
-        super(...arguments);
-        this.http = inject(HttpClient);
-        this.languageService = inject(AXTranslationService);
-        //#region ----   API Endpoints   ----
-        this.baseUrl = '/api/regional';
-        //#endregion
-        //#region ----   Fallback Data   ----
-        this.fallbackCountries = [
-            {
-                code: 'US',
-                title: 'United States',
-                native: 'United States',
-                regional: 'en',
-                timezone: 'America/New_York'
-            },
-            {
-                code: 'CA',
-                title: 'Canada',
-                native: 'Canada',
-                regional: 'en',
-                timezone: 'America/Toronto'
-            },
-            {
-                code: 'GB',
-                title: 'United Kingdom',
-                native: 'United Kingdom',
-                regional: 'en',
-                timezone: 'Europe/London'
-            }
-        ];
-        this.fallbackProvinces = [
-            {
-                code: 'CA',
-                title: 'California',
-                native: 'California',
-                timezone: 'America/Los_Angeles'
-            },
-            {
-                code: 'NY',
-                title: 'New York',
-                native: 'New York',
-                timezone: 'America/New_York'
-            },
-            {
-                code: 'ON',
-                title: 'Ontario',
-                native: 'Ontario',
-                timezone: 'America/Toronto'
-            }
-        ];
-        this.fallbackCities = [
-            {
-                code: 'NYC',
-                title: 'New York City',
-                native: 'New York City',
-                timezone: 'America/New_York'
-            },
-            {
-                code: 'LA',
-                title: 'Los Angeles',
-                native: 'Los Angeles',
-                timezone: 'America/Los_Angeles'
-            },
-            {
-                code: 'TOR',
-                title: 'Toronto',
-                native: 'Toronto',
-                timezone: 'America/Toronto'
-            }
-        ];
-        this.fallbackCurrencies = [
-            {
-                code: 'USD',
-                title: 'United States Dollar',
-                symbol: '$',
-                format: '${amount}'
-            },
-            {
-                code: 'CAD',
-                title: 'Canadian Dollar',
-                symbol: 'CA$',
-                format: 'CA${amount}'
-            },
-            {
-                code: 'GBP',
-                title: 'British Pound',
-                symbol: '£',
-                format: '£{amount}'
-            }
-        ];
-        this.fallbackLocaleProfiles = [
-            {
-                ...AXUSLocaleProfile,
-                code: 'en-US',
-                title: 'English (United States)',
-                nativeTitle: 'English (United States)',
-            },
-            {
-                ...AXIRLocaleProfile,
-                code: 'fa-IR',
-                title: 'Persian (Iran)',
-                nativeTitle: 'فارسی (ایران)',
-            }
-        ];
-        this.fallbackLanguages = [
-            {
-                code: 'en',
-                title: 'English'
-            },
-            {
-                code: 'fa',
-                title: 'Persian'
-            },
-            {
-                code: 'es',
-                title: 'Spanish'
-            }
-        ];
-        this.fallbackTimeZones = [
-            {
-                code: 'America/New_York',
-                title: 'Eastern Time (US & Canada)',
-                offset: '-05:00',
-                iana: 'America/New_York',
-                abbr: 'EST'
-            },
-            {
-                code: 'America/Los_Angeles',
-                title: 'Pacific Time (US & Canada)',
-                offset: '-08:00',
-                iana: 'America/Los_Angeles',
-                abbr: 'PST'
-            },
-            {
-                code: 'Europe/London',
-                title: 'Greenwich Mean Time',
-                offset: '+00:00',
-                iana: 'Europe/London',
-                abbr: 'GMT'
-            }
-        ];
-    }
-    //#endregion
-    async getCountries() {
-        const lang = await firstValueFrom(this.languageService.langChanges$);
-        try {
-            const countries = await firstValueFrom(this.http.get(`${this.baseUrl}/countries`).pipe(catchError(() => of(this.fallbackCountries))));
-            return countries.map((country) => {
-                if (lang == country.regional) {
-                    return {
-                        ...country,
-                        title: country.native,
-                    };
-                }
-                else {
-                    return country;
-                }
-            });
-        }
-        catch {
-            return this.fallbackCountries.map((country) => {
-                if (lang == country.regional) {
-                    return {
-                        ...country,
-                        title: country.native,
-                    };
-                }
-                else {
-                    return country;
-                }
-            });
-        }
-    }
-    async getProvinces(countryId) {
-        let params = new HttpParams();
-        if (countryId) {
-            params = params.set('countryId', countryId);
-        }
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/provinces`, { params }).pipe(catchError(() => of(this.fallbackProvinces))));
-        }
-        catch {
-            return this.fallbackProvinces;
-        }
-    }
-    async getCities(filter) {
-        let params = new HttpParams();
-        if (filter?.countryId) {
-            params = params.set('countryId', filter.countryId);
-        }
-        if (filter?.provinceId) {
-            params = params.set('provinceId', filter.provinceId);
-        }
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/cities`, { params }).pipe(catchError(() => of(this.fallbackCities))));
-        }
-        catch {
-            return this.fallbackCities;
-        }
-    }
-    async getCurrencies() {
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/currencies`).pipe(catchError(() => of(this.fallbackCurrencies))));
-        }
-        catch {
-            return this.fallbackCurrencies;
-        }
-    }
-    async getLocaleProfiles() {
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/locale-profiles`).pipe(catchError(() => of(this.fallbackLocaleProfiles))));
-        }
-        catch {
-            return this.fallbackLocaleProfiles;
-        }
-    }
-    async getLanguages() {
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/languages`).pipe(catchError(() => of(this.fallbackLanguages))));
-        }
-        catch {
-            return this.fallbackLanguages;
-        }
-    }
-    async getAvailableLanguages() {
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/available-languages`).pipe(catchError(() => of(this.fallbackLanguages))));
-        }
-        catch {
-            return this.fallbackLanguages;
-        }
-    }
-    async getBrowserTimeZoneCode() {
-        return Intl.DateTimeFormat().resolvedOptions().timeZone;
-    }
-    async getTimeZones() {
-        try {
-            return await firstValueFrom(this.http.get(`${this.baseUrl}/timezones`).pipe(catchError(() => of(this.fallbackTimeZones))));
-        }
-        catch {
-            return this.fallbackTimeZones;
-        }
-    }
-}
-
 class AXCFileStorageApiService extends AXPFileStorageService {
     constructor() {
         super(...arguments);
@@ -518,10 +270,10 @@ class AXCFileStorageApiService extends AXPFileStorageService {
             // Silently fail in fallback mode
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCFileStorageApiService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCFileStorageApiService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCFileStorageApiService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCFileStorageApiService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCFileStorageApiService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCFileStorageApiService, decorators: [{
             type: Injectable
         }] });
 
@@ -566,10 +318,10 @@ class AXMOidcApplicationLoader {
             // features: item.features || [],
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcApplicationLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcApplicationLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcApplicationLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcApplicationLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcApplicationLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcApplicationLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
@@ -609,10 +361,10 @@ class AXMConfigurationService {
             switchMap(() => of(this.applicationConfig)));
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMConfigurationService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMConfigurationService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMConfigurationService, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMConfigurationService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMConfigurationService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMConfigurationService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -652,13 +404,11 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
     async configureOAuth() {
         if (this.openidConfigurationInfo)
             return;
-        if (!this.authConfig) {
-            if (!this.aXMAuthConfigs.authConfig) {
-                throw new Error('authConfig is missing');
-            }
-            this.authConfig = this.aXMAuthConfigs.authConfig;
+        // Validation: اطمینان از وجود authConfig
+        if (!this.aXMAuthConfigs.authConfig) {
+            throw new Error('authConfig is missing. Please check your environment configuration.');
         }
-        this.oauthService.configure(this.authConfig);
+        this.oauthService.configure(this.aXMAuthConfigs.authConfig);
         this.oauthService.setStorage(localStorage);
         this.openidConfigurationInfo = await this.oauthService.loadDiscoveryDocument();
         if (!this.openidConfigurationInfo) {
@@ -699,7 +449,13 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
     }
     async handleOidcPasswordSignin(credentials) {
         await this.configureOAuth();
-        const loginRes = await fetch(this.authConfig.issuer + '/api/auth/manual-login', {
+        // Validation: اطمینان از وجود baseUrl
+        if (!this.aXMAuthConfigs.baseUrl) {
+            throw new Error('baseUrl is missing. Please check your environment configuration.');
+        }
+        // استفاده از baseUrl از configuration
+        const baseUrl = this.aXMAuthConfigs.baseUrl;
+        const loginRes = await fetch(baseUrl + '/auth/manual-login', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ username: credentials.username, password: credentials.password }),
@@ -743,12 +499,16 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
             if (!this.openidConfigurationInfo) {
                 await this.configureOAuth();
             }
+            // Validation: اطمینان از وجود authConfig
+            if (!this.aXMAuthConfigs.authConfig) {
+                throw new Error('authConfig is missing. Please check your environment configuration.');
+            }
             // get Token Code
             if (params['code']) {
                 // If params contains 'code', exchange it for tokens using the OpenIddict token endpoint
                 const code = params['code'];
-                const redirectUri = params['redirectUri'] || this.authConfig.redirectUri;
-                const clientId = params['clientId'] || this.authConfig.clientId;
+                const redirectUri = params['redirectUri'] || this.aXMAuthConfigs.authConfig.redirectUri;
+                const clientId = params['clientId'] || this.aXMAuthConfigs.authConfig.clientId;
                 const tokenEndpoint = params['tokenEndpoint'] ||
                     this.openidConfigurationInfo?.info?.discoveryDocument?.token_endpoint ||
                     `${this.aXMAuthConfigs?.authConfig?.issuer}/connect/token`;
@@ -819,23 +579,25 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
             }
             // get Authorizeation Code
             else {
+                // Validation: اطمینان از وجود authConfig
+                if (!this.aXMAuthConfigs.authConfig) {
+                    throw new Error('authConfig is missing. Please check your environment configuration.');
+                }
                 // Extract parameters
                 // Support both direct id fields and nested tenant/application objects
                 const tenantId = params['tenantId'] ?? params['tenant']?.id ?? null;
                 const applicationId = params['applicationId'] ?? params['application']?.id ?? null;
-                const redirectUri = params['redirectUri'] || this.authConfig.redirectUri;
-                const scope = params['scope'] || this.authConfig.scope;
+                const redirectUri = params['redirectUri'] || this.aXMAuthConfigs.authConfig.redirectUri;
+                const scope = params['scope'] || this.aXMAuthConfigs.authConfig.scope;
                 // Generate PKCE code verifier and challenge
                 const codeVerifier = PkceUtil.generateRandomString(128);
                 localStorage.setItem('pkce_code_verifier', codeVerifier);
                 const codeChallenge = await PkceUtil.generateCodeChallenge(codeVerifier);
                 // Build authorization URL
                 const authorizeEndpoint = this.openidConfigurationInfo.info.discoveryDocument.authorization_endpoint;
-                const clientId = this.authConfig.clientId;
+                const clientId = this.aXMAuthConfigs.authConfig.clientId;
                 const responseType = 'code';
                 const state = Math.random().toString(36).substring(2);
-                // const authorizeUrl = `${authorizeEndpoint}?response_type=${encodeURIComponent(responseType)}&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(scope)}&state=${encodeURIComponent(state)}&tenant_id=${encodeURIComponent(tenantId)}&application_id=${encodeURIComponent(applicationId)}&code_challenge=${encodeURIComponent(codeChallenge)}&code_challenge_method=S256`;
-                // Build query params dynamically, only add tenant_id and application_id if they have values
                 const queryParams = [
                     `response_type=${encodeURIComponent(responseType)}`,
                     `client_id=${encodeURIComponent(clientId)}`,
@@ -850,7 +612,6 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
                     .filter(Boolean)
                     .join('&');
                 const authorizeUrl = `${authorizeEndpoint}?${queryParams}`;
-                // Step 1: Redirect to authorization endpoint
                 window.location.href = authorizeUrl;
             }
         }
@@ -859,19 +620,16 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
         }
     }
     async signout() {
-        debugger;
         localStorage.removeItem('pkce_code_verifier');
         localStorage.removeItem('oauth_provider');
-        debugger;
         console.log(this.openidConfigurationInfo?.info?.discoveryDocument);
         const logoutUrl = `${this.aXMAuthConfigs?.authConfig?.issuer}/connect/logout`;
-        // Use GET instead of POST to avoid Content-Type header issues
-        await firstValueFrom(this.http.get(logoutUrl, { withCredentials: true }));
+        window.location.href = logoutUrl;
     }
     async refreshToken(context) {
         try {
             await this.configureOAuth();
-            if (!this.authConfig || !this.authConfig.clientId) {
+            if (!this.aXMAuthConfigs.authConfig || !this.aXMAuthConfigs.authConfig.clientId) {
                 throw new Error('authConfig or clientId is missing');
             }
             const authData = this.loadAuthData();
@@ -884,7 +642,7 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
             }
             const body = new HttpParams()
                 .set('grant_type', 'refresh_token')
-                .set('client_id', this.authConfig.clientId)
+                .set('client_id', this.aXMAuthConfigs.authConfig.clientId)
                 .set('refresh_token', refreshToken);
             const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded');
             const response = await firstValueFrom(this.http.post(this.openidConfigurationInfo.info.discoveryDocument.token_endpoint, body.toString(), { headers }));
@@ -949,10 +707,10 @@ class AXCAPIOidcStrategy extends AXPAuthStrategy {
     get name() {
         return 'oidc';
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCAPIOidcStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCAPIOidcStrategy }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCAPIOidcStrategy, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCAPIOidcStrategy }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCAPIOidcStrategy, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCAPIOidcStrategy, decorators: [{
             type: Injectable
         }] });
 
@@ -977,10 +735,10 @@ class AXMOidcPermissionLoader {
         const truePolicies = Object.keys(policies).filter((key) => policies[key] === true);
         return truePolicies;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcPermissionLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcPermissionLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcPermissionLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcPermissionLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcPermissionLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcPermissionLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
@@ -1006,25 +764,21 @@ class AXMOidcTenantLoader {
             // Add other fields and defaults as needed, and handle the logo if applicable
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcTenantLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcTenantLoader }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcTenantLoader, deps: [{ token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcTenantLoader }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXMOidcTenantLoader, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXMOidcTenantLoader, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
 class AXCApiModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.3", ngImport: i0, type: AXCApiModule, imports: [i1$1.OAuthModule, i2.AXPAuthModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiModule, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.1.4", ngImport: i0, type: AXCApiModule, imports: [i1$1.OAuthModule, i2.AXPAuthModule, AXCUtilsModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiModule, providers: [
             {
                 provide: AXPEntityStorageService,
                 useClass: AXCApiEntityStorageService,
             },
-            {
-                provide: AXPRegionalService,
-                useClass: AXCRegionalApiService,
-            },
             {
                 provide: AXPFileStorageService,
                 useClass: AXCFileStorageApiService,
@@ -1055,9 +809,10 @@ class AXCApiModule {
         ], imports: [OAuthModule.forRoot(),
             AXPAuthModule.forRoot({
                 strategies: [AXCAPIOidcStrategy],
-            })] }); }
+            }),
+            AXCUtilsModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: AXCApiModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: AXCApiModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [
@@ -1065,16 +820,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                         AXPAuthModule.forRoot({
                             strategies: [AXCAPIOidcStrategy],
                         }),
+                        AXCUtilsModule,
                     ],
                     providers: [
                         {
                             provide: AXPEntityStorageService,
                             useClass: AXCApiEntityStorageService,
                         },
-                        {
-                            provide: AXPRegionalService,
-                            useClass: AXCRegionalApiService,
-                        },
                         {
                             provide: AXPFileStorageService,
                             useClass: AXCFileStorageApiService,
@@ -1106,9 +858,280 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                 }]
         }] });
 
+//#region ----   Class Definition   ----
+class APIGoogleStrategy extends AXPAuthStrategy {
+    constructor() {
+        super();
+        this.aXMAuthConfigs = inject(AXM_AUTH_CONFIG_TOKEN);
+        this.oauthService = inject(OAuthService);
+        this.http = inject(HttpClient);
+        this.sessionService = inject(AXPSessionService);
+        this.router = inject(Router);
+        this.externalAuthorizationService = inject(AXCExternalAuthorizationService);
+        this.tenantLoader = inject(AXP_TENANT_LOADER);
+        this.applicationLoader = inject(AXP_APPLICATION_LOADER);
+    }
+    get name() {
+        return 'google';
+    }
+    async configureOAuth() {
+        if (this.openidConfigurationInfo)
+            return;
+        if (!this.authConfig) {
+            if (!this.aXMAuthConfigs.authConfig) {
+                throw new Error('authConfig is missing');
+            }
+            this.authConfig = this.aXMAuthConfigs.authConfig;
+        }
+        this.oauthService.configure(this.authConfig);
+        this.oauthService.setStorage(localStorage);
+        this.openidConfigurationInfo = await this.oauthService.loadDiscoveryDocument();
+        if (!this.openidConfigurationInfo) {
+            throw new Error('openidConfigurationInfo is missing');
+        }
+        this.oauthService.events.subscribe(async (event) => {
+            // console.log('event', event);
+            // if (event.type === 'token_received') {
+            //   console.log('Token has been refreshed');
+            // }
+            // if (event.type === 'token_expires') {
+            //   console.log('Token is about to expire. Triggering silent refresh...');
+            // }
+        });
+        const oidcJson = localStorage.getItem(AXPSessionService.SESSION_KEY);
+        if (oidcJson) {
+            const authData = JSON.parse(oidcJson);
+            if (authData) {
+                this.sessionService.setSession(authData);
+                if (authData.expiresIn && new Date(authData.expiresIn) < new Date()) {
+                    if (authData.expiresIn) {
+                        this.sessionService.refreshToken();
+                    }
+                    else {
+                        this.signout();
+                    }
+                }
+            }
+        }
+    }
+    async signin(credentials) {
+        const providerName = credentials['strategy'];
+        await this.externalAuthorizationService.signin(providerName);
+    }
+    async signout() {
+        localStorage.removeItem('pkce_code_verifier');
+        localStorage.removeItem('oauth_provider');
+        console.log('User signed out');
+    }
+    async refreshToken(context) {
+        try {
+            await this.configureOAuth();
+            if (!this.authConfig || !this.authConfig.clientId) {
+                throw new Error('authConfig or clientId is missing');
+            }
+            const authData = this.loadAuthData();
+            if (!authData) {
+                return { succeed: false };
+            }
+            const refreshToken = authData.refreshToken;
+            if (!refreshToken) {
+                return { succeed: false };
+            }
+            const body = new URLSearchParams({
+                grant_type: 'refresh_token',
+                client_id: this.authConfig.clientId,
+                refresh_token: refreshToken,
+            });
+            const response = await fetch(this.openidConfigurationInfo.info.discoveryDocument.token_endpoint, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: body.toString(),
+            });
+            if (!response.ok) {
+                throw new Error(`Token refresh failed: ${response.status} ${response.statusText}`);
+            }
+            const tokenData = await response.json();
+            // Extract user information from the refreshed token
+            const payload = JwtUtil.parseJwt(tokenData.id_token);
+            const user = {
+                id: payload['sub'] || '',
+                title: payload['name'] || payload['email'] || '',
+                name: payload['name'] || payload['email'] || '',
+                avatar: payload['picture'] || '',
+            };
+            const tenant = payload['tenantid'] || payload['tenant']
+                ? {
+                    id: payload['tenantid'] || payload['tenant'] || '',
+                    name: payload['tenantname'] || '',
+                    title: payload['tenanttitle'] || '',
+                }
+                : undefined;
+            const application = payload['applicationid'] || payload['application']
+                ? {
+                    id: payload['applicationid'] || payload['application'] || '',
+                    name: payload['applicationname'] || '',
+                    title: payload['applicationtitle'] || '',
+                }
+                : undefined;
+            const sessionData = {
+                accessToken: tokenData.access_token,
+                refreshToken: tokenData.refresh_token,
+                idToken: tokenData.id_token,
+                strategy: 'google',
+                expiresIn: TimeUtil.calculateExpireInDate(tokenData.expires_in || 0),
+                user,
+                tenant,
+                application,
+            };
+            return {
+                succeed: true,
+                data: {
+                    ...sessionData,
+                    user: sessionData.user,
+                },
+            };
+        }
+        catch (error) {
+            console.error('Error refreshing token', error);
+            return { succeed: false };
+        }
+    }
+    async updateToken(params) {
+        try {
+            // Ensure OAuth is configured first
+            if (!this.openidConfigurationInfo) {
+                await this.configureOAuth();
+            }
+            // If params contains 'code', exchange it for tokens
+            if (params['code']) {
+                const code = params['code'];
+                const redirectUri = params['redirectUri'] || this.authConfig.redirectUri;
+                const clientId = params['clientId'] || this.authConfig.clientId;
+                const tokenEndpoint = this.openidConfigurationInfo.info.discoveryDocument.token_endpoint;
+                // Get code_verifier from localStorage (PKCE)
+                const codeVerifier = localStorage.getItem('pkce_code_verifier');
+                localStorage.removeItem('pkce_code_verifier');
+                if (!codeVerifier) {
+                    throw new Error('Code verifier not found. Please try signing in again.');
+                }
+                // Prepare body for token request
+                const body = new URLSearchParams({
+                    grant_type: 'authorization_code',
+                    client_id: clientId,
+                    code_verifier: codeVerifier,
+                    code: code,
+                    redirect_uri: redirectUri,
+                });
+                // Call the token endpoint
+                const response = await fetch(tokenEndpoint, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                    body: body.toString(),
+                });
+                if (!response.ok) {
+                    throw new Error(`Token exchange failed: ${response.status} ${response.statusText}`);
+                }
+                const tokenData = await response.json();
+                if (!tokenData) {
+                    throw new Error('Token data not found');
+                }
+                // Parse the ID token to extract user information
+                const payload = JwtUtil.parseJwt(tokenData.id_token);
+                if (!payload) {
+                    throw new Error('Payload not found');
+                }
+                const user = {
+                    id: payload['sub'] || '',
+                    title: payload['name'] || payload['email'] || '',
+                    name: payload['name'] || payload['email'] || '',
+                    avatar: payload['picture'] || '',
+                };
+                const tenant = payload['tenantid'] || payload['tenant']
+                    ? {
+                        id: payload['tenantid'] || payload['tenant'] || '',
+                        name: payload['tenantname'] || '',
+                        title: payload['tenanttitle'] || '',
+                    }
+                    : undefined;
+                const application = payload['applicationid'] || payload['application']
+                    ? {
+                        id: payload['applicationid'] || payload['application'] || '',
+                        name: payload['applicationname'] || '',
+                        title: payload['applicationtitle'] || '',
+                    }
+                    : undefined;
+                return {
+                    succeed: true,
+                    data: {
+                        accessToken: tokenData.access_token,
+                        refreshToken: tokenData.refresh_token,
+                        idToken: tokenData.id_token,
+                        expiresIn: TimeUtil.calculateExpireInDate(tokenData.expires_in || 0),
+                        user,
+                        tenant,
+                        application,
+                    },
+                };
+            }
+            // get Authorizeation Code
+            else {
+                // Extract parameters
+                // Support both direct id fields and nested tenant/application objects
+                const tenantId = params['tenantId'] ?? params['tenant']?.id ?? null;
+                const applicationId = params['applicationId'] ?? params['application']?.id ?? null;
+                const redirectUri = params['redirectUri'] || this.authConfig.redirectUri;
+                const scope = params['scope'] || this.authConfig.scope;
+                // Generate PKCE code verifier and challenge
+                const codeVerifier = PkceUtil.generateRandomString(128);
+                localStorage.setItem('pkce_code_verifier', codeVerifier);
+                const codeChallenge = await PkceUtil.generateCodeChallenge(codeVerifier);
+                // Build authorization URL
+                const authorizeEndpoint = this.openidConfigurationInfo.info.discoveryDocument.authorization_endpoint;
+                const clientId = this.authConfig.clientId;
+                const responseType = 'code';
+                const state = Math.random().toString(36).substring(2);
+                const queryParams = [
+                    `response_type=${encodeURIComponent(responseType)}`,
+                    `client_id=${encodeURIComponent(clientId)}`,
+                    `redirect_uri=${encodeURIComponent(redirectUri)}`,
+                    `scope=${encodeURIComponent(scope)}`,
+                    `state=${encodeURIComponent(state)}`,
+                    tenantId ? `tenant_id=${encodeURIComponent(tenantId)}` : null,
+                    applicationId ? `application_id=${encodeURIComponent(applicationId)}` : null,
+                    `code_challenge=${encodeURIComponent(codeChallenge)}`,
+                    `code_challenge_method=S256`,
+                ]
+                    .filter(Boolean)
+                    .join('&');
+                const authorizeUrl = `${authorizeEndpoint}?${queryParams}`;
+                window.location.href = authorizeUrl;
+                await new Promise(() => { });
+                return;
+            }
+        }
+        catch (error) {
+            console.error('Error in updateToken:', error);
+            throw error;
+        }
+    }
+    loadAuthData() {
+        const sessionData = this.sessionService.getSessionData();
+        return sessionData || undefined;
+    }
+    handleError(error) {
+        console.error('Authentication error:', error);
+        throw error;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: APIGoogleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: APIGoogleStrategy }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.4", ngImport: i0, type: APIGoogleStrategy, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [] });
+
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
+export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
 //# sourceMappingURL=acorex-connectivity-api.mjs.map