@acontplus/ng-infrastructure 1.0.2 → 1.0.4

package/README.md

@@ -1,6 +1,8 @@
 # @acontplus/ng-infrastructure
 
-Acontplus Angular Infrastructure library for managing HTTP interceptors and repositories.
+Angular infrastructure library for AcontPlus applications, providing HTTP
+interceptors, repositories, adapters, and core services for robust application
+architecture.
 
 ## Installation
 
@@ -10,17 +12,84 @@ npm install @acontplus/ng-infrastructure
 
 ## Features
 
-- HTTP Interceptors for API handling, authentication, logging, and spinner management
-- Repositories for data access
-- Adapters for external integrations
-- Services for core configuration and logging
+- **HTTP Interceptors**: API handling, HTTP context management, and
+  spinner/loading indicators
+- **Repositories**: Generic and specific data access repositories (base HTTP,
+  user repository)
+- **Adapters**: External integration adapters (Angular HTTP adapter)
+- **Services**: Core configuration, correlation ID management, logging, and
+  tenant services
+- **Use Cases**: Base use case patterns with commands and queries
+- **Interfaces**: Token provider interfaces for authentication
+- **TypeScript Support**: Full type safety with comprehensive TypeScript
+  definitions
+
+## Interceptors
+
+### API Interceptor
+
+Handles API requests and responses.
+
+### HTTP Context Interceptor
+
+Manages HTTP context for requests.
+
+### Spinner Interceptor
+
+Manages loading spinners during HTTP operations.
+
+## Repositories
+
+### Base HTTP Repository
+
+Base class for HTTP-based data access.
+
+### Generic Repository
+
+Generic repository implementation.
+
+### User Repository
+
+Specific repository for user data.
+
+### Repository Factory
+
+Factory for creating repository instances.
+
+## Services
+
+### Core Config Service
+
+Manages core application configuration.
+
+### Correlation Service
+
+Handles correlation IDs for request tracing.
+
+### Logging Service
+
+Provides logging functionality.
+
+### Tenant Service
+
+Manages multi-tenant configurations.
 
 ## Usage
 
 Import the desired modules and services in your Angular application.
 
 ```typescript
-import { apiInterceptor } from '@acontplus/ng-infrastructure';
+import {
+  apiInterceptor,
+  spinnerInterceptor,
+} from '@acontplus/ng-infrastructure';
+
+// In app.config.ts
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideHttpClient(withInterceptors([apiInterceptor, spinnerInterceptor])),
+  ],
+};
 ```
 
 ## Running unit tests

package/fesm2022/acontplus-ng-infrastructure.mjs

@@ -24,7 +24,7 @@ const apiInterceptor = (req, next) => {
     const token = tokenProvider?.getToken();
     if (token) {
         modifiedReq = req.clone({
-            setHeaders: { Authorization: `Bearer ${token}` }
+            setHeaders: { Authorization: `Bearer ${token}` },
         });
     }
     return next(modifiedReq).pipe(
@@ -120,7 +120,9 @@ function handleToastNotifications(response, notificationService, req) {
     if (skipNotification)
         return;
     // Dynamic handling: Use show() for runtime type selection
-    if (response.message && showNotifications && ['success', 'warning', 'error'].includes(response.status)) {
+    if (response.message &&
+        showNotifications &&
+        ['success', 'warning', 'error'].includes(response.status)) {
         notificationService.show({
             type: response.status,
             message: response.message,
@@ -242,8 +244,88 @@ function getCriticalErrorMessage(error) {
     return error.error?.message || error.message || 'An unexpected error occurred';
 }
 
+class LoggingService {
+    environment = inject(ENVIRONMENT);
+    log(level, message, context) {
+        if (this.environment.isProduction) {
+            // Production logging (e.g., to external service)
+            this.logToExternalService(level, message, context);
+        }
+        else {
+            // Development logging - only log in development mode
+            if (!this.environment.isProduction) {
+                console[level](`[${level.toUpperCase()}] ${message}`, context);
+            }
+        }
+    }
+    info(message, context) {
+        this.log('info', message, context);
+    }
+    warn(message, context) {
+        this.log('warn', message, context);
+    }
+    error(message, context) {
+        this.log('error', message, context);
+    }
+    // HTTP Request Logging
+    logHttpRequest(log) {
+        this.info(`HTTP Request - ${log.method} ${log.url}`, {
+            requestId: log.requestId,
+            correlationId: log.correlationId,
+            tenantId: log.tenantId,
+            headers: log.headers,
+            isCustomUrl: log.isCustomUrl,
+            timestamp: log.timestamp,
+        });
+    }
+    // HTTP Error Logging
+    logHttpError(error) {
+        this.error(`HTTP Error - ${error.method} ${error.url}`, {
+            status: error.status,
+            statusText: error.statusText,
+            requestId: error.requestId,
+            correlationId: error.correlationId,
+            tenantId: error.tenantId,
+            errorDetails: error.errorDetails,
+            environment: error.environment,
+            timestamp: error.timestamp,
+        });
+    }
+    // Network Error Logging
+    logNetworkError(correlationId) {
+        this.error('Network connection failed', {
+            type: 'network-error',
+            correlationId,
+            userAgent: navigator.userAgent,
+            online: navigator.onLine,
+        });
+    }
+    // Rate Limit Error Logging
+    logRateLimitError(correlationId, url) {
+        this.warn('Rate limit exceeded', {
+            type: 'rate-limit-error',
+            correlationId,
+            url,
+        });
+    }
+    logToExternalService(_level, _message, _context) {
+        // Implement external logging service integration
+        // e.g., Sentry, LogRocket, etc.
+        // This is a placeholder for production logging implementation
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+
 class TenantService {
     tenantId = null;
+    logger = inject(LoggingService);
     getTenantId() {
         if (!this.tenantId) {
             // Get from localStorage, sessionStorage, or JWT token
@@ -266,7 +348,7 @@ class TenantService {
         this.setTenantId(tenantId);
     }
     handleForbidden() {
-        console.error('Access forbidden for tenant:', this.tenantId);
+        this.logger.error('Access forbidden for tenant:', this.tenantId);
         // Redirect to tenant selection or show error message
         // this.router.navigate(['/tenant-access-denied']);
     }
@@ -298,7 +380,6 @@ class CorrelationService {
     getOrCreateCorrelationId() {
         if (!this.correlationId()) {
             // Try to get from sessionStorage first (for page refreshes)
-            // @ts-ignore
             const id = sessionStorage.getItem(this.CORRELATION_KEY) || v4();
             this.correlationId.set(id);
             sessionStorage.setItem(this.CORRELATION_KEY, id);
@@ -326,83 +407,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImpor
                 }]
         }] });
 
-class LoggingService {
-    environment = inject(ENVIRONMENT);
-    log(level, message, context) {
-        if (this.environment.isProduction) {
-            // Production logging (e.g., to external service)
-            this.logToExternalService(level, message, context);
-        }
-        else {
-            // Development logging
-            console[level](`[${level.toUpperCase()}] ${message}`, context);
-        }
-    }
-    info(message, context) {
-        this.log('info', message, context);
-    }
-    warn(message, context) {
-        this.log('warn', message, context);
-    }
-    error(message, context) {
-        this.log('error', message, context);
-    }
-    // HTTP Request Logging
-    logHttpRequest(log) {
-        this.info(`HTTP Request - ${log.method} ${log.url}`, {
-            requestId: log.requestId,
-            correlationId: log.correlationId,
-            tenantId: log.tenantId,
-            headers: log.headers,
-            isCustomUrl: log.isCustomUrl,
-            timestamp: log.timestamp,
-        });
-    }
-    // HTTP Error Logging
-    logHttpError(error) {
-        this.error(`HTTP Error - ${error.method} ${error.url}`, {
-            status: error.status,
-            statusText: error.statusText,
-            requestId: error.requestId,
-            correlationId: error.correlationId,
-            tenantId: error.tenantId,
-            errorDetails: error.errorDetails,
-            environment: error.environment,
-            timestamp: error.timestamp,
-        });
-    }
-    // Network Error Logging
-    logNetworkError(correlationId) {
-        this.error('Network connection failed', {
-            type: 'network-error',
-            correlationId,
-            userAgent: navigator.userAgent,
-            online: navigator.onLine,
-        });
-    }
-    // Rate Limit Error Logging
-    logRateLimitError(correlationId, url) {
-        this.warn('Rate limit exceeded', {
-            type: 'rate-limit-error',
-            correlationId,
-            url,
-        });
-    }
-    logToExternalService(level, message, context) {
-        // Implement external logging service integration
-        // e.g., Sentry, LogRocket, etc.
-        // This is a placeholder for production logging implementation
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: LoggingService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }] });
-
 // HTTP Context tokens
 const CUSTOM_URL = new HttpContextToken(() => false);
 const SKIP_CONTEXT_HEADERS = new HttpContextToken(() => false);
@@ -546,7 +550,7 @@ const httpContextInterceptor = (req, next) => {
                         // Retry the original request with new token
                         const retryReq = req.clone({
                             url: finalUrl,
-                            setHeaders: { ...headers, 'Authorization': `Bearer ${newTokens.token}` },
+                            setHeaders: { ...headers, Authorization: `Bearer ${newTokens.token}` },
                         });
                         return next(retryReq);
                     }), catchError$1(refreshError => {
@@ -615,9 +619,9 @@ const httpContextInterceptor = (req, next) => {
             // Handle specific error scenarios
             switch (error.status) {
                 case 401:
-                    console.error('Unauthorized access - token expired or invalid');
+                    loggingService.error('Unauthorized access - token expired or invalid');
                     // Note: Token clearing should be handled by the auth service, not infrastructure
-                    router.navigate(['/login']);
+                    router.navigate([environment.loginRoute]);
                     break;
                 case 403:
                     tenantService.handleForbidden();
@@ -693,7 +697,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.2", ngImpor
  */
 const spinnerInterceptor = (req, next) => {
     // Track active requests requiring spinner
-    console.log(requests);
     const activeRequests = inject(ActiveRequestsTracker);
     const overlayService = inject(OverlayService);
     // Skip spinner if disabled for this request
@@ -864,16 +867,30 @@ class UserRepository {
                 decodedToken['email'] ??
                 decodedToken['sub'] ??
                 decodedToken['user_id'];
-            const name = decodedToken['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'] ??
+            const displayName = decodedToken['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'] ??
+                decodedToken['displayName'] ??
+                decodedToken['display_name'] ??
                 decodedToken['name'] ??
-                decodedToken['given_name'] ??
-                decodedToken['display_name'];
+                decodedToken['given_name'];
+            const name = decodedToken['name'] ?? displayName;
             if (!email) {
                 return null;
             }
             const userData = {
                 email: email.toString(),
-                displayName: name?.toString() ?? 'Unknown User',
+                displayName: displayName?.toString() ?? 'Unknown User',
+                name: name?.toString(),
+                roles: this.extractArrayField(decodedToken, ['roles', 'role']),
+                permissions: this.extractArrayField(decodedToken, ['permissions', 'perms']),
+                tenantId: decodedToken['tenantId']?.toString() ??
+                    decodedToken['tenant_id']?.toString() ??
+                    decodedToken['tenant']?.toString(),
+                companyId: decodedToken['companyId']?.toString() ??
+                    decodedToken['company_id']?.toString() ??
+                    decodedToken['organizationId']?.toString() ??
+                    decodedToken['org_id']?.toString(),
+                locale: decodedToken['locale']?.toString(),
+                timezone: decodedToken['timezone']?.toString() ?? decodedToken['tz']?.toString(),
             };
             return userData;
         }
@@ -881,6 +898,25 @@ class UserRepository {
             return null;
         }
     }
+    /**
+     * Extract array field from decoded token, trying multiple possible field names
+     */
+    extractArrayField(decodedToken, fieldNames) {
+        for (const fieldName of fieldNames) {
+            const value = decodedToken[fieldName];
+            if (Array.isArray(value)) {
+                return value.map(v => v.toString());
+            }
+            if (typeof value === 'string') {
+                // Handle comma-separated string values
+                return value
+                    .split(',')
+                    .map(v => v.trim())
+                    .filter(v => v.length > 0);
+            }
+        }
+        return undefined;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: UserRepository, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: UserRepository, providedIn: 'root' });
 }
@@ -1075,7 +1111,7 @@ class BaseUseCase {
 // Only create commands if you have complex validation logic
 class Command extends BaseUseCase {
     // Simple validation - override only when needed
-    validate(request) {
+    validate(_request) {
         return []; // Return array of error messages
     }
     execute(request) {
@@ -1091,7 +1127,8 @@ class Command extends BaseUseCase {
         }
         return this.executeInternal(request).pipe(catchError(error => {
             // Log the error for debugging
-            console.error('An error occurred during command execution:', error);
+            const logger = inject(LoggingService);
+            logger.error('An error occurred during command execution:', error);
             // Re-throw the error so the caller can handle it
             return throwError(() => error);
         }));
@@ -1101,7 +1138,8 @@ class Command extends BaseUseCase {
 class Query extends BaseUseCase {
     execute(request) {
         return this.executeInternal(request).pipe(catchError(error => {
-            console.error('An error occurred during query execution:', error);
+            const logger = inject(LoggingService);
+            logger.error('An error occurred during query execution:', error);
             return throwError(() => error);
         }));
     }