@noatgnu/cupcake-core 1.2.13 → 1.2.14

package/fesm2022/noatgnu-cupcake-core.mjs

@@ -2,9 +2,9 @@ import * as i0 from '@angular/core';
 import { inject, InjectionToken, Injectable, signal, computed, Component, effect, ChangeDetectorRef, NgModule } from '@angular/core';
 import * as i1 from '@angular/common/http';
 import { HttpClient, HttpParams, provideHttpClient, withInterceptors, HttpClientModule } from '@angular/common/http';
-import { BehaviorSubject, catchError, throwError, switchMap, filter, take, map, tap, Subject, timer, EMPTY, debounceTime, distinctUntilChanged } from 'rxjs';
+import { BehaviorSubject, catchError, throwError, switchMap, filter, take, map, tap, Subject, interval, timer, EMPTY, debounceTime, distinctUntilChanged } from 'rxjs';
 import { Router, ActivatedRoute, RouterModule } from '@angular/router';
-import { map as map$1, takeUntil, tap as tap$1, switchMap as switchMap$1 } from 'rxjs/operators';
+import { map as map$1, tap as tap$1, takeUntil, switchMap as switchMap$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/forms';
 import { FormBuilder, Validators, ReactiveFormsModule, FormsModule, NonNullableFormBuilder } from '@angular/forms';
 import * as i2 from '@angular/common';
@@ -1255,6 +1255,18 @@ class SiteConfigService extends BaseApiService {
     constructor() {
         super();
         this.loadConfig();
+        this.startPeriodicRefresh();
+    }
+    startPeriodicRefresh() {
+        interval(60000).subscribe(() => {
+            this.fetchConfigFromBackend().subscribe({
+                next: (config) => {
+                    this.configSubject.next({ ...this.defaultConfig, ...config });
+                    localStorage.setItem('site_config', JSON.stringify(config));
+                },
+                error: () => { }
+            });
+        });
     }
     loadConfig() {
         const savedConfig = localStorage.getItem('site_config');
@@ -1284,10 +1296,16 @@ class SiteConfigService extends BaseApiService {
         return this.get(`${this.apiUrl}/site-config/public/`);
     }
     getCurrentConfig() {
-        return this.get(`${this.apiUrl}/site-config/current/`);
+        return this.get(`${this.apiUrl}/site-config/current/`).pipe(tap$1(config => {
+            this.configSubject.next({ ...this.defaultConfig, ...config });
+            localStorage.setItem('site_config', JSON.stringify(config));
+        }));
     }
     updateConfig(config) {
-        return this.put(`${this.apiUrl}/site-config/update_config/`, config);
+        return this.put(`${this.apiUrl}/site-config/update_config/`, config).pipe(tap$1(updatedConfig => {
+            this.configSubject.next({ ...this.defaultConfig, ...updatedConfig });
+            localStorage.setItem('site_config', JSON.stringify(updatedConfig));
+        }));
     }
     getSiteName() {
         return this.configSubject.value.siteName;
@@ -2084,10 +2102,32 @@ class LoginComponent {
         });
         this.authService.isAuthenticated$.subscribe(isAuthenticated => {
             if (isAuthenticated) {
-                this.router.navigate([this.returnUrl]);
+                this.navigateToReturnUrl();
             }
         });
     }
+    /**
+     * Navigate to return URL, properly handling query parameters
+     */
+    navigateToReturnUrl() {
+        const url = this.returnUrl;
+        if (!url || url === '/') {
+            this.router.navigate(['/']);
+            return;
+        }
+        const [path, queryString] = url.split('?');
+        if (queryString) {
+            const queryParams = {};
+            const params = new URLSearchParams(queryString);
+            params.forEach((value, key) => {
+                queryParams[key] = value;
+            });
+            this.router.navigate([path], { queryParams });
+        }
+        else {
+            this.router.navigate([path]);
+        }
+    }
     /**
      * Clean return URL to prevent accumulating login URLs
      */
@@ -2155,7 +2195,7 @@ class LoginComponent {
                 next: (response) => {
                     this.success.set('Login successful!');
                     setTimeout(() => {
-                        this.router.navigate([this.returnUrl]);
+                        this.navigateToReturnUrl();
                     }, 1000);
                 },
                 error: (error) => {
@@ -2199,7 +2239,7 @@ class LoginComponent {
             next: (response) => {
                 this.success.set(`Welcome, ${response.user.firstName || response.user.username}!`);
                 setTimeout(() => {
-                    this.router.navigate([this.returnUrl]);
+                    this.navigateToReturnUrl();
                 }, 1000);
             },
             error: (error) => {