feat(*): bust cache when user changed

packages/auth/src/lib/shared/auth.interceptor.ts

@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-
 import {
   HttpEvent,
   HttpInterceptor,
   HttpHandler,
   HttpRequest
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { Md5 } from 'ts-md5';
 
 import { ConfigService } from '@igo2/core';
 import { TokenService } from './token.service';
@@ -42,9 +42,27 @@ export class AuthInterceptor implements HttpInterceptor {
     }
 
     const authHeader = `Bearer ${token}`;
-    const authReq = req.clone({
+    let authReq = req.clone({
       headers: req.headers.set('Authorization', authHeader)
     });
+
+    const tokenDecoded: any = this.tokenService.decode();
+    if (
+      authReq.params.get('_i') === 'true' &&
+      tokenDecoded &&
+      tokenDecoded.user &&
+      tokenDecoded.user.sourceId
+    ) {
+      const hashUser = Md5.hashStr(tokenDecoded.user.sourceId) as string;
+      authReq = authReq.clone({
+        params: authReq.params.set('_i', hashUser)
+      });
+    } else if (authReq.params.get('_i') === 'true') {
+      authReq = authReq.clone({
+        params: authReq.params.delete('_i')
+      });
+    }
+
     return next.handle(authReq);
   }
 

packages/auth/src/lib/shared/auth.service.ts

@@ -4,6 +4,7 @@ import { Router } from '@angular/router';
 
 import { Observable, BehaviorSubject, of } from 'rxjs';
 import { tap, catchError } from 'rxjs/operators';
+import { globalCacheBusterNotifier } from 'ngx-cacheable';
 
 import { ConfigService, LanguageService, MessageService } from '@igo2/core';
 import { Base64 } from '@igo2/utils';
@@ -28,6 +29,9 @@ export class AuthService {
     @Optional() private router: Router
   ) {
     this.authenticate$.next(this.authenticated);
+    this.authenticate$.subscribe(() => {
+      globalCacheBusterNotifier.next();
+    });
   }
 
   login(username: string, password: string): Observable<void> {

packages/context/src/lib/context-manager/shared/context.service.ts

@@ -94,7 +94,7 @@ export class ContextService {
     return this.http
       .get<DetailedContext>(url)
       .pipe(catchError(res => {
-        return this.handleError(res, id)
+        return this.handleError(res, id);
       }));
   }
 
@@ -192,7 +192,7 @@ export class ContextService {
 
     return this.http.post<ContextPermission[]>(url, JSON.stringify(association))
       .pipe(catchError(res => {
-        return [this.handleError(res, undefined, true)]
+        return [this.handleError(res, undefined, true)];
       }));
   }
 

packages/geo/src/lib/datasource/shared/capabilities.service.ts

@@ -19,8 +19,14 @@ import {
   ArcGISRestDataSourceOptions,
   TileArcGISRestDataSourceOptions
 } from './datasources';
-import { LegendOptions, ItemStyleOptions } from '../../layer/shared/layers/layer.interface';
-import { TimeFilterType, TimeFilterStyle } from '../../filter/shared/time-filter.enum';
+import {
+  LegendOptions,
+  ItemStyleOptions
+} from '../../layer/shared/layers/layer.interface';
+import {
+  TimeFilterType,
+  TimeFilterStyle
+} from '../../filter/shared/time-filter.enum';
 
 @Injectable({
   providedIn: 'root'
@@ -42,7 +48,9 @@ export class CapabilitiesService {
 
     return this.getCapabilities('wms', url, version).pipe(
       map((capabilities: any) => {
-        return capabilities ? this.parseWMSOptions(baseOptions, capabilities) : undefined;
+        return capabilities
+          ? this.parseWMSOptions(baseOptions, capabilities)
+          : undefined;
       })
     );
   }
@@ -55,7 +63,9 @@ export class CapabilitiesService {
 
     const options = this.getCapabilities('wmts', url, version).pipe(
       map((capabilities: any) => {
-        return capabilities ? this.parseWMTSOptions(baseOptions, capabilities) : undefined;
+        return capabilities
+          ? this.parseWMTSOptions(baseOptions, capabilities)
+          : undefined;
       })
     );
 
@@ -117,7 +127,9 @@ export class CapabilitiesService {
     );
   }
 
-  @Cacheable()
+  @Cacheable({
+    maxCacheCount: 20
+  })
   getCapabilities(
     service: 'wms' | 'wmts',
     baseUrl: string,
@@ -127,7 +139,8 @@ export class CapabilitiesService {
       fromObject: {
         request: 'GetCapabilities',
         service,
-        version: version || '1.3.0'
+        version: version || '1.3.0',
+        _i: 'true'
       }
     });
 
@@ -173,8 +186,7 @@ export class CapabilitiesService {
         title: layer.Title,
         maxResolution:
           getResolutionFromScale(layer.MaxScaleDenominator) || Infinity,
-        minResolution:
-          getResolutionFromScale(layer.MinScaleDenominator) || 0,
+        minResolution: getResolutionFromScale(layer.MinScaleDenominator) || 0,
         metadata: {
           url: metadata ? metadata.OnlineResource : undefined,
           extern: metadata ? true : undefined,
@@ -350,18 +362,22 @@ export class CapabilitiesService {
   }
 
   getStyle(Style): LegendOptions {
-
-    const styleOptions: ItemStyleOptions[] = Style
-    .map((style) => {
+    const styleOptions: ItemStyleOptions[] = Style.map(style => {
       return {
         name: style.Name,
         title: style.Title
       };
     })
-    // Handle repeat the style "default" in output  (MapServer or OpenLayer)
-    .filter((item, index, self) => self.findIndex((i: ItemStyleOptions) => i.name === item.name) === index);
+      // Handle repeat the style "default" in output  (MapServer or OpenLayer)
+      .filter(
+        (item, index, self) =>
+          self.findIndex((i: ItemStyleOptions) => i.name === item.name) ===
+          index
+      );
 
-    const legendOptions: LegendOptions = { stylesAvailable: styleOptions } as LegendOptions;
+    const legendOptions: LegendOptions = {
+      stylesAvailable: styleOptions
+    } as LegendOptions;
 
     return legendOptions;
   }

packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts

@@ -9,6 +9,7 @@ import {
 import { BehaviorSubject, Subscription } from 'rxjs';
 
 import { EntityRecord, EntityStore, ToolComponent } from '@igo2/common';
+import { AuthService } from '@igo2/auth';
 
 import {
   IgoMap,
@@ -51,6 +52,11 @@ export class CatalogBrowserToolComponent implements OnInit, OnDestroy {
    */
   private catalog$$: Subscription;
 
+  /**
+   * Subscription for authentication
+   */
+  private authenticate$$: Subscription;
+
   /**
    * Whether a group can be toggled when it's collapsed
    */
@@ -67,7 +73,8 @@ export class CatalogBrowserToolComponent implements OnInit, OnDestroy {
   constructor(
     private catalogService: CatalogService,
     private catalogState: CatalogState,
-    private mapState: MapState
+    private mapState: MapState,
+    private authService: AuthService
   ) {}
 
   /**
@@ -83,16 +90,20 @@ export class CatalogBrowserToolComponent implements OnInit, OnDestroy {
         if (record && record.entity) {
           const catalog = record.entity;
           this.catalog = catalog;
-          this.loadCatalogItems(catalog);
         }
       });
+
+    this.authenticate$$ = this.authService.authenticate$.subscribe(() => {
+      this.loadCatalogItems(this.catalog);
+    });
   }
 
   /**
    * @internal
    */
   ngOnDestroy() {
     this.catalog$$.unsubscribe();
+    this.authenticate$$.unsubscribe();
   }
 
   /**

packages/integration/src/lib/catalog/catalog.state.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 
+import { AuthService } from '@igo2/auth';
 import { EntityStore } from '@igo2/common';
 import { Catalog, CatalogItem } from '@igo2/geo';
 
@@ -22,8 +23,12 @@ export class CatalogState {
    */
   private catalogItemsStores = new Map<string, EntityStore<CatalogItem>>();
 
-  constructor() {
+  constructor(authService: AuthService) {
     this._catalogStore = new EntityStore([]);
+
+    authService.authenticate$.subscribe(() => {
+      this.clearCatalogItemsStores();
+    });
   }
 
   /**
@@ -43,4 +48,11 @@ export class CatalogState {
   setCatalogItemsStore(catalog: Catalog, store: EntityStore<CatalogItem>) {
     this.catalogItemsStores.set(catalog.id as string, store);
   }
+
+  /**
+   * Clear all catalog items stores
+   */
+  clearCatalogItemsStores() {
+    this.catalogItemsStores.clear();
+  }
 }

proxy.conf.json

@@ -10,7 +10,7 @@
     "changeOrigin": true
   },
   "/apis/": {
-    "target": "https://geoegl.msp.gouv.qc.ca",
+    "target": "https://testgeoegl.msp.gouv.qc.ca",
     "secure": false,
     "changeOrigin": true
   },