@sumaris-net/ngx-components 18.24.24 → 18.25.0

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -222,6 +222,9 @@ class Environment {
     // Default authentication /!\ For DEV only
     // (see values in the test database - XML files in Pod's module)
     defaultAuthValues;
+    // Auto login /!\ For DEV only
+    // (the order defines the method precedence)
+    startupOrder;
     // Account
     account;
     entityEditor;
@@ -16440,138 +16443,6 @@ const StorageDrivers = {
 };
 const APP_STORAGE = new InjectionToken('Storage');
 
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-/*
- * In development mode, to ignore zone related error stack frames such as
- * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
- * import the following file, but please comment it out in production mode
- * because it will have performance impact when throw error
- */
-//import 'zone.js/plugins/zone-error';
-const environment = Object.freeze({
-    name: '@sumaris-net/ngx-components', // overridden by ENVIRONMENT token
-    version: '1.0', // overridden by ENVIRONMENT token
-    // Do NOT set to false - because this value will be used by releases
-    //production: false,
-    production: true,
-    // Do NOT set - because this value will be used by releases
-    //externalEnvironmentUrl: null,
-    baseUrl: '/',
-    defaultLocale: 'fr',
-    defaultLatLongFormat: 'DDMM',
-    apolloFetchPolicy: 'cache-first',
-    useHash: false,
-    allowDarkMode: true,
-    //defaultRoute: '/home',
-    //enableMenu: true,
-    // FIXME: enable cache
-    persistCache: false,
-    // TODO: make this works
-    //offline: true,
-    peerMinVersion: '1.8.0',
-    peerDefaultPrefix: 'http://',
-    enableSelectPeerByFeature: true,
-    sendAppVersionHeaders: true,
-    defaultPeer: {
-        host: 'localhost',
-        port: 8081,
-    },
-    defaultPeers: [
-        {
-            host: 'localhost',
-            port: 8080,
-        },
-        {
-            host: 'localhost',
-            port: 8081,
-        },
-        {
-            host: '192.168.0.45',
-            port: 8080,
-        },
-        {
-            host: '192.168.0.24',
-            port: 8080,
-        },
-        {
-            host: '192.168.0.29',
-            port: 8080,
-        },
-        {
-            host: '192.168.0.107',
-            port: 8080,
-        },
-        {
-            host: 'sih.sfa.sc',
-            port: 443,
-        },
-        {
-            host: 'test.sumaris.net',
-            port: 443,
-        },
-        {
-            host: 'open.sumaris.net',
-            port: 443,
-        },
-        {
-            host: 'server.e-is.pro',
-            port: 443,
-        },
-    ],
-    defaultAppName: 'SUMARiS',
-    defaultAndroidInstallUrl: 'https://play.google.com/store/apps/details?id=net.sumaris.app',
-    defaultIOSInstallUrl: 'https://apps.apple.com/us/app/sumaris/id6736747523',
-    defaultDesktopInstallUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/releases',
-    // Storage
-    storage: {
-        driverOrder: [StorageDrivers.SQLLite, StorageDrivers.IndexedDB, StorageDrivers.WebSQL, StorageDrivers.LocalStorage],
-    },
-    // About
-    sourceUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components',
-    reportIssueUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/issues',
-    forumUrl: null, //'https://forum.sumaris.net',
-    helpUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-doc/-/blob/master/user-manual/index_fr.md',
-    privacyPolicyUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/raw/master/doc/privacy_policy_fr.md',
-    termsOfUseUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/raw/master/doc/terms_of_use_fr.md?ref_type=heads',
-    // Development
-    defaultAuthValues: {
-        // Token auth (using Person.pubkey)
-        username: 'admin@sumaris.net',
-        password: 'admin',
-    },
-    account: {
-        enableListenChanges: true,
-        listenIntervalInSeconds: 60,
-        enableAvatarEdit: true,
-    },
-    entityEditor: {
-        enableListenChanges: true,
-        listenIntervalInSeconds: 60,
-    },
-    feed: {
-        jsonFeed: {
-            fr: [
-                '/api/feed.json',
-                'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/raw/master/doc/feed/feed-fr.json',
-                // Example with JsonFeed version 1 (and not 1.1)
-                //'https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json',
-                // Example with discourse API :
-                //'https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/1.1/feed-fr-FR.json',
-            ],
-            en: [
-                '/api/feed.json',
-                'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/raw/master/doc/feed/feed-en.json'
-            ],
-        },
-        maxContentLength: 1000,
-        maxAgeInMonths: -1,
-        maxCount: 3,
-    },
-    buildDate: new Date().toISOString(),
-});
-
 class StorageService extends StartableService {
     storage;
     environment;
@@ -16587,7 +16458,7 @@ class StorageService extends StartableService {
     }
     async ngOnStart() {
         try {
-            console.debug(`[storage] Starting... {driverOrder: ${environment.storage?.driverOrder}}`);
+            console.debug(`[storage] Starting... {driverOrder: ${this.environment.storage?.driverOrder}}`);
             // Define Cordova SQLLite driver
             await this.storage.defineDriver(CordovaSQLiteDriver);
             // Create the storage instance
@@ -17106,6 +16977,139 @@ function isOnFieldMode(value) {
 }
 const APP_LOCALES = new InjectionToken('locales');
 
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+/*
+ * In development mode, to ignore zone related error stack frames such as
+ * `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
+ * import the following file, but please comment it out in production mode
+ * because it will have performance impact when throw error
+ */
+//import 'zone.js/plugins/zone-error';
+const environment = Object.freeze({
+    name: '@sumaris-net/ngx-components', // overridden by ENVIRONMENT token
+    version: '1.0', // overridden by ENVIRONMENT token
+    // Do NOT set to false - because this value will be used by releases
+    //production: false,
+    production: true,
+    // Do NOT set - because this value will be used by releases
+    //externalEnvironmentUrl: null,
+    baseUrl: '/',
+    defaultLocale: 'fr',
+    defaultLatLongFormat: 'DDMM',
+    apolloFetchPolicy: 'cache-first',
+    useHash: false,
+    allowDarkMode: true,
+    //defaultRoute: '/home',
+    //enableMenu: true,
+    // FIXME: enable cache
+    persistCache: false,
+    // TODO: make this works
+    //offline: true,
+    peerMinVersion: '1.8.0',
+    peerDefaultPrefix: 'http://',
+    enableSelectPeerByFeature: true,
+    sendAppVersionHeaders: true,
+    defaultPeer: {
+        host: 'localhost',
+        port: 8081,
+    },
+    defaultPeers: [
+        {
+            host: 'localhost',
+            port: 8080,
+        },
+        {
+            host: 'localhost',
+            port: 8081,
+        },
+        {
+            host: '192.168.0.45',
+            port: 8080,
+        },
+        {
+            host: '192.168.0.24',
+            port: 8080,
+        },
+        {
+            host: '192.168.0.29',
+            port: 8080,
+        },
+        {
+            host: '192.168.0.107',
+            port: 8080,
+        },
+        {
+            host: 'sih.sfa.sc',
+            port: 443,
+        },
+        {
+            host: 'test.sumaris.net',
+            port: 443,
+        },
+        {
+            host: 'open.sumaris.net',
+            port: 443,
+        },
+        {
+            host: 'server.e-is.pro',
+            port: 443,
+        },
+    ],
+    defaultAppName: 'SUMARiS',
+    defaultAndroidInstallUrl: 'https://play.google.com/store/apps/details?id=net.sumaris.app',
+    defaultIOSInstallUrl: 'https://apps.apple.com/us/app/sumaris/id6736747523',
+    defaultDesktopInstallUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/releases',
+    // Storage
+    storage: {
+        driverOrder: [StorageDrivers.SQLLite, StorageDrivers.IndexedDB, StorageDrivers.WebSQL, StorageDrivers.LocalStorage],
+    },
+    // About
+    sourceUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components',
+    reportIssueUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/issues',
+    forumUrl: null, //'https://forum.sumaris.net',
+    helpUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-doc/-/blob/master/user-manual/index_fr.md',
+    privacyPolicyUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/raw/master/doc/privacy_policy_fr.md',
+    termsOfUseUrl: 'https://gitlab.ifremer.fr/sih-public/sumaris/sumaris-app/-/raw/master/doc/terms_of_use_fr.md?ref_type=heads',
+    // Development
+    defaultAuthValues: {
+        // Token auth (using Person.pubkey)
+        username: 'admin@sumaris.net',
+        password: 'admin',
+    },
+    startupOrder: ['url', 'window', 'environment'],
+    account: {
+        enableListenChanges: true,
+        listenIntervalInSeconds: 60,
+        enableAvatarEdit: true,
+    },
+    entityEditor: {
+        enableListenChanges: true,
+        listenIntervalInSeconds: 60,
+    },
+    feed: {
+        jsonFeed: {
+            fr: [
+                '/api/feed.json',
+                'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/raw/master/doc/feed/feed-fr.json',
+                // Example with JsonFeed version 1 (and not 1.1)
+                //'https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/feed-fr.json',
+                // Example with discourse API :
+                //'https://raw.githubusercontent.com/duniter/cesium/master/doc/feed/1.1/feed-fr-FR.json',
+            ],
+            en: [
+                '/api/feed.json',
+                'https://gitlab.ifremer.fr/sih-public/sumaris/ngx-sumaris-components/-/raw/master/doc/feed/feed-en.json'
+            ],
+        },
+        maxContentLength: 1000,
+        maxAgeInMonths: -1,
+        maxCount: 3,
+    },
+    buildDate: new Date().toISOString(),
+});
+
 class EntityClasses {
     static CLASSES_BY_NAME = new Map();
     static register(typename, entityClass) {
@@ -23893,6 +23897,154 @@ class Base58 {
     }
 }
 
+// Standalone startup constants, with NO Angular DI dependency.
+// Kept separate from startup.service.ts so it can be safely imported by e2e tests
+// (Playwright's transpiler does not support Angular parameter decorators).
+// Key used to bridge auto-peer/login data across a version-check reload.
+// platform.service may reload the page via location.href = ..., which destroys both
+// URL params (hash/search) and the window object. sessionStorage survives same-tab
+// reloads, is tab-scoped, non-persistent (cleared on tab close), and not accessible
+// cross-origin — making it safe for transient credential bridging.
+const STARTUP_DATA_STORAGE_KEY = '__appStartupData';
+
+class StartupService {
+    _data = { password: null, username: null, offline: null, peerUrl: null };
+    storage = inject(StorageService);
+    environment = inject(ENVIRONMENT, { optional: true });
+    get data() {
+        return this._data;
+    }
+    set data(data) {
+        if (isNotNilOrBlank(data.username))
+            this._data.username = data.username;
+        if (isNotNilOrBlank(data.password))
+            this._data.password = data.password;
+        if (isNotNil(data.offline))
+            this._data.offline = data.offline;
+        if (isNotNilOrBlank(data.peerUrl))
+            this._data.peerUrl = data.peerUrl;
+    }
+    hasPeer() {
+        return isNotNilOrBlank(this._data?.peerUrl);
+    }
+    consumePeer() {
+        if (!this._data)
+            return null;
+        const autoPeer = this._data?.peerUrl;
+        this._data.peerUrl = null;
+        return autoPeer;
+    }
+    hasAuth() {
+        return isNotNilOrBlank(this._data?.username) && isNotNilOrBlank(this._data?.password);
+    }
+    consumeAuth() {
+        if (!this._data)
+            return null;
+        const { username, password, offline } = this._data;
+        this._data.username = null;
+        this._data.password = null;
+        this._data.offline = null;
+        return { username, password, offline };
+    }
+    async start() {
+        const authMethods = this.environment?.startupOrder;
+        if (isEmptyArray(authMethods))
+            return; // Skip if no auth methods configured
+        await this.storage.ready();
+        console.debug(`[startup] Initializing methods: ${authMethods.join(' -> ')}`);
+        const urlHashParams = new URLSearchParams(window.location.hash?.slice(1) || '');
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const windowStartupData = window[STARTUP_DATA_STORAGE_KEY];
+        const rawData = sessionStorage.getItem(STARTUP_DATA_STORAGE_KEY);
+        const data = rawData ? JSON.parse(rawData) : null;
+        const settingsRaw = await this.storage.get('settings');
+        const settings = typeof settingsRaw === 'string' ? JSON.parse(settingsRaw) : (settingsRaw ?? {});
+        // Resolve auto auth data from each configured source
+        if (data) {
+            // Restore from sessionStorage in case of a previous version-check reload
+            this.data = data;
+        }
+        else {
+            // Resolve each configured source by priority (first method has highest priority)
+            let username = null;
+            let password = null;
+            let offline = null;
+            let peerUrl = null;
+            for (const authMethod of authMethods.reverse()) {
+                switch (authMethod) {
+                    case 'url':
+                        username = urlHashParams.get('username') || urlSearchParams.get('username');
+                        password = urlHashParams.get('password') || urlSearchParams.get('password');
+                        offline = urlHashParams.get('offline') === 'true' || urlSearchParams.get('offline') === 'true';
+                        peerUrl = urlHashParams.get('peerUrl') || urlSearchParams.get('peerUrl');
+                        break;
+                    case 'window':
+                        username = windowStartupData?.username ?? null;
+                        password = windowStartupData?.password ?? null;
+                        offline = windowStartupData?.offline ?? null;
+                        peerUrl = windowStartupData?.peerUrl ?? null;
+                        break;
+                    case 'environment':
+                        username = this.environment?.defaultAuthValues?.username;
+                        password = this.environment?.defaultAuthValues?.password;
+                        offline = this.environment?.offline;
+                        peerUrl = Peer.fromObject(this.environment?.peer)?.url ||
+                            settings?.peerUrl || Peer.fromObject(this.environment.defaultPeer)?.url;
+                        break;
+                    default:
+                        console.warn('[startup] Unknown method:', authMethod);
+                }
+                this.data = { username, password, offline, peerUrl };
+            }
+        }
+        const sensitiveParams = ['username', 'password', 'offline', 'peerUrl'];
+        const hasHashSensitiveParam = sensitiveParams.some((p) => urlHashParams.has(p));
+        const hasSearchSensitiveParam = sensitiveParams.some((p) => urlSearchParams.has(p));
+        const hasWindowData = !!windowStartupData;
+        const hasExternalSource = hasHashSensitiveParam || hasSearchSensitiveParam || hasWindowData;
+        // Persist to sessionStorage so data survives a potential version-check reload
+        if (hasExternalSource && (this.hasPeer() || this.hasAuth())) {
+            sessionStorage.setItem(STARTUP_DATA_STORAGE_KEY, JSON.stringify(this._data));
+        }
+        // Apply auto peer by saving peerUrl to localStorage so the app connects to the right peer
+        if (this.hasPeer()) {
+            settings.peerUrl = this.consumePeer();
+            console.debug(`[startup] Set peer URL to ${settings.peerUrl}`);
+            await this.storage.set('settings', JSON.stringify(settings));
+        }
+        // Remove sensitive parameters from the URL
+        if (hasHashSensitiveParam || hasSearchSensitiveParam) {
+            sensitiveParams.forEach((p) => urlSearchParams.delete(p));
+            const search = urlSearchParams.toString() ? `?${urlSearchParams}` : '';
+            window.history.replaceState(null, '', window.location.pathname + search);
+        }
+        // Clear sessionStorage bridge after consumption (post-reload path only)
+        if (data) {
+            sessionStorage.removeItem(STARTUP_DATA_STORAGE_KEY);
+        }
+        // Remove the window bridge object
+        delete window[STARTUP_DATA_STORAGE_KEY];
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: StartupService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: StartupService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: StartupService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }] });
+/**
+ * Factory function for the app startup initializer.
+ * In Angular 18, this is used with APP_INITIALIZER:
+ *   { provide: APP_INITIALIZER, useFactory: createAppStartupInitializer, multi: true }
+ *
+ * inject() is called during factory execution (in injection context), then the
+ * returned function calls the already-injected service.
+ */
+function createAppStartupInitializer() {
+    const service = inject(StartupService);
+    return () => service.start();
+}
+
 const TOKEN_STORAGE_KEY = 'token';
 const PUBKEY_STORAGE_KEY = 'pubkey';
 const SECKEY_STORAGE_KEY = 'seckey';
@@ -24089,6 +24241,7 @@ class AccountService extends BaseGraphqlService {
     settings;
     storage;
     file;
+    startupService;
     translate;
     toastController;
     environment;
@@ -24164,13 +24317,14 @@ class AccountService extends BaseGraphqlService {
     get remoteLocalSettingsKeys() {
         return this._remoteLocalSettingsKeys;
     }
-    constructor(network, graphql, settings, storage, file, translate, toastController, environment, options, accountOptions) {
+    constructor(network, graphql, settings, storage, file, startupService, translate, toastController, environment, options, accountOptions) {
         super(graphql, environment);
         this.network = network;
         this.graphql = graphql;
         this.settings = settings;
         this.storage = storage;
         this.file = file;
+        this.startupService = startupService;
         this.translate = translate;
         this.toastController = toastController;
         this.environment = environment;
@@ -24213,7 +24367,11 @@ class AccountService extends BaseGraphqlService {
                 this.restart();
             }
         }));
-        await this.restoreLocally();
+        // Try to auto login, or restore locally
+        const autoLogin = await this.autoLogin();
+        if (!autoLogin) {
+            await this.restoreLocally();
+        }
         await this.listenSettings();
         return this._data;
     }
@@ -24859,6 +25017,20 @@ class AccountService extends BaseGraphqlService {
             .pipe(debounceTime(2000), filter(() => this.isLogin() && this.network.online))
             .subscribe((settings) => this.saveLocalSettingsRemotely(settings)));
     }
+    async autoLogin() {
+        if (!this.startupService?.hasAuth())
+            return false; // Skip if no auth data
+        try {
+            const authData = this.startupService.consumeAuth();
+            console.debug('[account] Attempting auto login as:', authData.username);
+            await this.login(authData);
+            return true;
+        }
+        catch (error) {
+            console.warn('[account] Auto auth failed:', error);
+            return false;
+        }
+    }
     async restoreLocally() {
         // Restore from storage
         const values = await Promise.all([
@@ -25238,13 +25410,15 @@ class AccountService extends BaseGraphqlService {
     showToast(opts) {
         return Toasts.show(this.toastController, this.translate, opts);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: AccountService, deps: [{ token: NetworkService }, { token: GraphqlService }, { token: LocalSettingsService }, { token: i2$4.Storage }, { token: FileService }, { token: i1$1.TranslateService, optional: true }, { token: i2$1.ToastController, optional: true }, { token: ENVIRONMENT }, { token: APP_USER_SETTINGS_OPTIONS, optional: true }, { token: APP_ACCOUNT_SERVICE_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: AccountService, deps: [{ token: NetworkService }, { token: GraphqlService }, { token: LocalSettingsService }, { token: i2$4.Storage }, { token: FileService }, { token: StartupService, optional: true }, { token: i1$1.TranslateService, optional: true }, { token: i2$1.ToastController, optional: true }, { token: ENVIRONMENT }, { token: APP_USER_SETTINGS_OPTIONS, optional: true }, { token: APP_ACCOUNT_SERVICE_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: AccountService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: AccountService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root', deps: [ENVIRONMENT] }]
-        }], ctorParameters: () => [{ type: NetworkService }, { type: GraphqlService }, { type: LocalSettingsService }, { type: i2$4.Storage }, { type: FileService }, { type: i1$1.TranslateService, decorators: [{
+        }], ctorParameters: () => [{ type: NetworkService }, { type: GraphqlService }, { type: LocalSettingsService }, { type: i2$4.Storage }, { type: FileService }, { type: StartupService, decorators: [{
+                    type: Optional
+                }] }, { type: i1$1.TranslateService, decorators: [{
                     type: Optional
                 }] }, { type: i2$1.ToastController, decorators: [{
                     type: Optional
@@ -26278,7 +26452,8 @@ class PlatformService extends StartableService {
             // Hide accessory bar (iOS only)
             if (this.isApp() && this.isIOS()) {
                 pluginName = CapacitorPlugins.Keyboard;
-                await Keyboard.setAccessoryBarVisible({ isVisible: false });
+                // Let Capacitor config handle accessory bar
+                //await Keyboard.setAccessoryBarVisible({ isVisible: false });
             }
         }
         catch (err) {
@@ -27346,7 +27521,7 @@ class SharedModule {
                         },
                         {
                             provide: ENVIRONMENT,
-                            deps: [EnvironmentLoader, APP_INITIALIZER],
+                            deps: [EnvironmentLoader],
                             useFactory: (loader) => loader.get(),
                         },
                     ]