feat(auth-interceptor): allow to pass credentials by domain, based on…

… regex (#589) * feat(portal) allow to control auto anonymous authentification * feat(portal) control if the user button is shown or not * docs(auth) autoLoginAnonymous, loginButton and hostsWithCredentials * wip * wip Co-authored-by: Pierre-Étienne Lord <[email protected]>
infra-geo-ouverte · Apr 8, 2021 · c33e3b2 · c33e3b2
1 parent 9eeef45
commit c33e3b2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/docs/config_json.rst b/docs/config_json.rst
@@ -255,7 +255,11 @@ Exemples
             "auth": {
                 "url": "/apis/users",
                 "tokenKey": "id_token_igo",
-                "allowAnonymous": true
+                "allowAnonymous": true,
+                "hostsWithCredentials": [{
+                                           withCredentials: true,
+                                           domainRegFilters: '(https:\/\/|http:\/\/)(.*domain.com)(.*)'
+                                        }]
             }
 
 Propriétés
@@ -293,12 +297,18 @@ Propriétés
                d'accéder aux contextes publics
          - true | false
          - true
-       * - ...
-         - ...
-         - .. line-block::
-               ...
-         - ...
-         - ...
+       * - hostsWithCredentials
+         - {}[] (liste d'objet)
+         - .. line-block::
+               Indique à l'application, la liste des domaines a être interceptés
+               et à y ajouter dans l'appel.
+               "withCredentials": true/false selon la valeur définie.
+               exemple: [{
+                             withCredentials: true,
+                             domainRegFilters: '(https:\/\/|http:\/\/)(.*domain.com)(.*)'
+                        }]
+         - 
+         - 
 
     Important : Les propriétés en caractère gras suivies d'un * sont obligatoires.
 

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,5 +1,5 @@
 <igo-spinner igoSpinnerActivity></igo-spinner>
 <igo-message-center></igo-message-center>
-<igo-auth-form *ngIf="authConfig"></igo-auth-form>
+<igo-auth-form *ngIf="authConfig && authConfig.url"></igo-auth-form>
 
 <app-portal igoStopDropPropagation></app-portal>
diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html
@@ -78,7 +78,9 @@
         [@mobileOffsetY]="getToastPanelStatus()">
       </igo-geolocate-button>
       <igo-rotation-button [showIfNoRotation]="showRotationButtonIfNoRotation" [map]="map" color="primary"></igo-rotation-button>
-      <igo-user-button [map]="map" color="primary"
+      <igo-user-button 
+        *ngIf="auth.url"
+        [map]="map" color="primary"
         [@controlsOffsetY]="getControlsOffsetY()"
         [@mobileOffsetY]="getToastPanelStatus()">
       </igo-user-button>

diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
@@ -34,7 +34,7 @@ import {
   Widget,
   EntityTablePaginatorOptions
 } from '@igo2/common';
-import { AuthService } from '@igo2/auth';
+import { AuthOptions, AuthService } from '@igo2/auth';
 import { DetailedContext } from '@igo2/context';
 import {
   DataSourceService,
@@ -159,6 +159,10 @@ export class PortalComponent implements OnInit, OnDestroy {
     return this.mapState.map;
   }
 
+  get auth(): AuthOptions {
+    return this.configService.getConfig('auth') || [];
+  }
+
   get toastPanelOpened(): boolean {
     return this._toastPanelOpened;
   }
@@ -1194,8 +1198,7 @@ export class PortalComponent implements OnInit, OnDestroy {
   }
 
   private initWelcomeWindow(): void {
-    const authConfig = this.configService.getConfig('auth');
-    if (authConfig) {
+    if (this.auth) {
       this.authService.logged$.subscribe((logged) => {
         if (logged) {
           this.createWelcomeWindow();

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -41,10 +41,10 @@ export const environment: Environment = {
       url: '/apis/users',
       tokenKey: 'id_token_igo',
       allowAnonymous: true,
-      trustHosts: ['geoegl.msp.gouv.qc.ca']
+      trustHosts: ['geoegl.msp.gouv.qc.ca'],
     },
     catalog: {
-      sources: [
+      sources: [               
         {
           id: 'Image Arcgis Rest',
           title: 'Image Arcgis Rest',