@infrab4a/connect-angular 4.17.0-beta.9 → 4.17.0

package/fesm2020/infrab4a-connect-angular.mjs

@@ -3,7 +3,7 @@ import { NgModule, InjectionToken, PLATFORM_ID, Injectable, Inject } from '@angu
 import * as i1$4 from '@angular/fire/app';
 import { FirebaseApp, provideFirebaseApp, getApp, initializeApp } from '@angular/fire/app';
 import * as i2 from '@angular/fire/app-check';
-import { provideAppCheck, ReCaptchaEnterpriseProvider, initializeAppCheck } from '@angular/fire/app-check';
+import { provideAppCheck, initializeAppCheck, ReCaptchaEnterpriseProvider } from '@angular/fire/app-check';
 import * as i3 from '@angular/fire/storage';
 import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
 import * as i1$2 from '@infrab4a/connect';
@@ -2617,8 +2617,6 @@ class AngularConnectModule {
         return {
             ngModule: AngularConnectModule,
             providers: [
-                { provide: FIREBASE_APP_NAME, useValue: nameOrConfig },
-                { provide: RECAPTCHA_SITE_KEY, useValue: options.recaptchaSiteKey },
                 {
                     provide: CATEGORY_STRUCTURE,
                     useClass: isNil(options?.oldCategoryStructure) || options?.oldCategoryStructure
@@ -2628,11 +2626,15 @@ class AngularConnectModule {
                 { provide: PERSISTENCE_PROVIDER, useClass: options?.persistenceProvider || CookieDataPersistence },
                 ...(isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]),
                 ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_OPTIONS, useValue: options?.firebase }]),
+                ...(isNil(options?.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),
                 ...(isNil(options?.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
                 ...(isNil(options?.vertexConfig) ? [] : [{ provide: VERTEX_CONFIG, useValue: options.vertexConfig }]),
                 ...(isNil(options?.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]),
                 ...(isNil(options?.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]),
                 ...(isNil(options?.storageBaseUrl) ? [] : [{ provide: STORAGE_BASE_URL, useValue: options.storageBaseUrl }]),
+                ...(isNil(options?.recaptchaSiteKey)
+                    ? []
+                    : [{ provide: RECAPTCHA_SITE_KEY, useValue: options.recaptchaSiteKey }]),
             ],
         };
     }
@@ -2674,34 +2676,28 @@ AngularConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", ve
             useExisting: ProductsVertexSearch,
         },
     ], imports: [provideFirebaseApp((injector) => {
-            const appName = injector.get(FIREBASE_APP_NAME);
+            const appName = injector.get(FIREBASE_APP_NAME) || '[DEFAULT]';
             try {
-                return appName ? getApp(appName) : getApp();
+                return getApp(appName);
             }
             catch (error) {
-                console.warn('Firebase app not found, initializing new app');
-                if (error instanceof Error) {
-                    console.error(error.message);
-                }
                 return initializeApp(injector.get(FIREBASE_OPTIONS), appName);
             }
         }),
         provideAppCheck((injector) => {
             const app = injector.get(FirebaseApp);
-            console.log('Connect APP', app.name);
             try {
                 const siteKey = injector.get(RECAPTCHA_SITE_KEY);
-                console.log('RECAPTCHA_SITE_KEY', isEmpty(siteKey) ? undefined : new ReCaptchaEnterpriseProvider(siteKey));
-                return initializeAppCheck(app, {
-                    provider: isEmpty(siteKey) ? undefined : new ReCaptchaEnterpriseProvider(siteKey),
-                    isTokenAutoRefreshEnabled: true,
-                });
+                if (siteKey && siteKey.trim() !== '')
+                    return initializeAppCheck(app, {
+                        provider: new ReCaptchaEnterpriseProvider(siteKey),
+                        isTokenAutoRefreshEnabled: true,
+                    });
             }
             catch (error) {
-                if (error instanceof Error)
-                    console.error(error.message);
-                return;
+                console.warn('ReCAPTCHA site key not provided or invalid, App Check not initialized');
             }
+            return;
         }),
         provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
         AngularElasticSeachModule,
@@ -2714,34 +2710,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
             args: [{
                     imports: [
                         provideFirebaseApp((injector) => {
-                            const appName = injector.get(FIREBASE_APP_NAME);
+                            const appName = injector.get(FIREBASE_APP_NAME) || '[DEFAULT]';
                             try {
-                                return appName ? getApp(appName) : getApp();
+                                return getApp(appName);
                             }
                             catch (error) {
-                                console.warn('Firebase app not found, initializing new app');
-                                if (error instanceof Error) {
-                                    console.error(error.message);
-                                }
                                 return initializeApp(injector.get(FIREBASE_OPTIONS), appName);
                             }
                         }),
                         provideAppCheck((injector) => {
                             const app = injector.get(FirebaseApp);
-                            console.log('Connect APP', app.name);
                             try {
                                 const siteKey = injector.get(RECAPTCHA_SITE_KEY);
-                                console.log('RECAPTCHA_SITE_KEY', isEmpty(siteKey) ? undefined : new ReCaptchaEnterpriseProvider(siteKey));
-                                return initializeAppCheck(app, {
-                                    provider: isEmpty(siteKey) ? undefined : new ReCaptchaEnterpriseProvider(siteKey),
-                                    isTokenAutoRefreshEnabled: true,
-                                });
+                                if (siteKey && siteKey.trim() !== '')
+                                    return initializeAppCheck(app, {
+                                        provider: new ReCaptchaEnterpriseProvider(siteKey),
+                                        isTokenAutoRefreshEnabled: true,
+                                    });
                             }
                             catch (error) {
-                                if (error instanceof Error)
-                                    console.error(error.message);
-                                return;
+                                console.warn('ReCAPTCHA site key not provided or invalid, App Check not initialized');
                             }
+                            return;
                         }),
                         provideStorage((injector) => getStorage(injector.get(FirebaseApp))),
                         AngularElasticSeachModule,