Merge remote-tracking branch 'origin/release/16.0.0' into config-defa…

…ult-value3
infra-geo-ouverte · Oct 10, 2023 · 82e751d · 82e751d
2 parents be289c4 + 3b75824
commit 82e751d
Show file tree

Hide file tree

Showing 67 changed files with 471 additions and 254 deletions.
diff --git a/demo/src/environments/environment.prod.ts b/demo/src/environments/environment.prod.ts
@@ -1,9 +1,7 @@
-interface Environment {
-  production: boolean;
-  igo: any;
-}
+import { EnvironmentOptions } from '@igo2/integration';
+import { CatalogQueryFormatTypes, ICatalog, TooltipType } from '@igo2/geo';
 
-export const environment: Environment = {
+export const environment: EnvironmentOptions = {
   production: true,
   igo: {
     projections: [
@@ -15,13 +13,15 @@ export const environment: Environment = {
       }
     ],
     auth: {
+      tokenKey: 'testIgo2Lib',
       intern: {
         enabled: true
       },
       allowAnonymous: true
     },
     interactiveTour: {
-      tourInMobile: true
+      tourInMobile: true,
+      activateInteractiveTour: true
     },
     importExport: {
       url: 'https://geoegl.msp.gouv.qc.ca/apis/ogre'
@@ -42,14 +42,11 @@ export const environment: Environment = {
           url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
           queryFormat: {
             html: '*',
-            'application/json': [
-              'stations_meteoroutieres',
-              'histo_stations_meteoroutieres'
-            ]
-          },
+            json: ['stations_meteoroutieres', 'histo_stations_meteoroutieres']
+          } as CatalogQueryFormatTypes,
           queryHtmlTarget: 'iframe',
           count: 30
-        },
+        } as ICatalog,
         {
           id: 'catalogwithregex',
           title: 'Filtered catalog by regex',
@@ -60,7 +57,7 @@ export const environment: Environment = {
           id: 'catalogwithtooltipcontrol',
           title: 'Controling tooltip format',
           url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
-          tooltipType: 'abstract' // or title
+          tooltipType: TooltipType.ABSTRACT
         }
       ]
     },

diff --git a/demo/src/environments/environment.ts b/demo/src/environments/environment.ts
@@ -1,15 +1,7 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---configuration production` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
+import { EnvironmentOptions } from '@igo2/integration';
+import { TooltipType, CatalogQueryFormatTypes, ICatalog } from '@igo2/geo';
 
-// import { IgoEnvironment } from '@igo2/core';
-
-interface Environment {
-  production: boolean;
-  igo: any;
-}
-
-export const environment: Environment = {
+export const environment: EnvironmentOptions = {
   production: false,
   igo: {
     importWithStyle: true,
@@ -54,14 +46,11 @@ export const environment: Environment = {
           url: 'https://ws.mapserver.transports.gouv.qc.ca/swtq',
           queryFormat: {
             html: '*',
-            'application/json': [
-              'stations_meteoroutieres',
-              'histo_stations_meteoroutieres'
-            ]
-          },
+            json: ['stations_meteoroutieres', 'histo_stations_meteoroutieres']
+          } as CatalogQueryFormatTypes,
           queryHtmlTarget: 'iframe',
           count: 30
-        },
+        } as ICatalog,
         {
           id: 'catalogwithregex',
           title: 'Filtered catalog by regex',
@@ -72,7 +61,7 @@ export const environment: Environment = {
           id: 'catalogwithtooltipcontrol',
           title: 'Controling tooltip format',
           url: 'https://geoegl.msp.gouv.qc.ca/apis/ws/igo_gouvouvert.fcgi',
-          tooltipType: 'abstract' // or title
+          tooltipType: TooltipType.ABSTRACT
         },
         {
           id: 'arcgisrestcompletecatalog',
@@ -148,7 +137,7 @@ export const environment: Environment = {
               id: 'wmts_error',
               url: 'https://servicesmatriciels.mern.gouv.qc.ca/erdas-iws/ogc/wmts/Elevation?SERVICE=WMTS&REQUEST=GetCapabilities',
               type: 'wmts',
-              crossOrigin: true,
+              setCrossOriginAnonymous: true,
               matrixSet: 'EPSG_3857',
               version: '1.0.0',
               forcedProperties: [
@@ -166,7 +155,7 @@ export const environment: Environment = {
               id: 'wms',
               url: 'https://cartes.geogratis.gc.ca/wms/canvec_fr',
               type: 'wms',
-              crossOrigin: true,
+              setCrossOriginAnonymous: true,
               version: '1.3.0',
               forcedProperties: [
                 {
@@ -223,7 +212,7 @@ export const environment: Environment = {
               id: 'wms',
               url: 'https://cartes.geogratis.gc.ca/wms/canvec_fr',
               type: 'wms',
-              crossOrigin: true,
+              setCrossOriginAnonymous: true,
               version: '1.3.0'
             },
             {
@@ -237,7 +226,7 @@ export const environment: Environment = {
               id: 'rn_wmts_1',
               url: 'https://servicesmatriciels.mern.gouv.qc.ca/erdas-iws/ogc/wmts/Cartes_Images',
               type: 'wmts',
-              crossOrigin: true,
+              setCrossOriginAnonymous: true,
               matrixSet: 'EPSG_3857',
               version: '1.0.0',
               forcedProperties: [
@@ -293,7 +282,7 @@ export const environment: Environment = {
         title: 'Feuillets SNRC',
         searchUrl: '/ws/mffpecofor.fcgi',
         storedquery_id: 'sq250et20kFeuillet',
-        fields: { name: 'no_feuillet', defaultValue: '0' },
+        fields: [{ name: 'no_feuillet', defaultValue: '0' }],
         resultTitle: 'feuillet',
         params: {
           limit: '8'

diff --git a/packages/auth/src/lib/environment/environment.interface.ts b/packages/auth/src/lib/environment/environment.interface.ts
@@ -0,0 +1,6 @@
+import { AuthOptions, AuthStorageOptions } from '../shared';
+
+export interface EnvironmentOptions {
+  auth?: AuthOptions;
+  storage?: AuthStorageOptions;
+}
diff --git a/packages/auth/src/lib/environment/index.ts b/packages/auth/src/lib/environment/index.ts
@@ -0,0 +1 @@
+export * from './environment.interface';
diff --git a/packages/auth/src/lib/shared/admin.guard.ts b/packages/auth/src/lib/shared/admin.guard.ts
@@ -7,6 +7,7 @@ import {
 
 import { ConfigService } from '@igo2/core';
 import { AuthService } from './auth.service';
+import { AuthOptions } from './auth.interface';
 
 @Injectable({
   providedIn: 'root'
@@ -26,8 +27,8 @@ export class AdminGuard {
 
     this.authService.redirectUrl = state.url;
 
-    const authConfig = this.config.getConfig('auth');
-    if (authConfig && authConfig.loginRoute) {
+    const authConfig = this.config.getConfig('auth') as AuthOptions;
+    if (authConfig?.loginRoute) {
       this.router.navigateByUrl(authConfig.loginRoute);
     }
 

diff --git a/packages/auth/src/lib/shared/auth-microsoft.provider.ts b/packages/auth/src/lib/shared/auth-microsoft.provider.ts
@@ -20,7 +20,7 @@ import { MsalServiceb2c } from './auth-msalServiceb2c.service.';
 export function MSALConfigFactory(
   config: ConfigService
 ): PublicClientApplication {
-  const msConf: BrowserAuthOptions | null = config.getConfig('auth.microsoft');
+  const msConf = config.getConfig('auth.microsoft') as AuthMicrosoftOptions;
 
   msConf.redirectUri = msConf?.redirectUri || window.location.href;
   msConf.authority =
@@ -39,9 +39,9 @@ export function MSALConfigFactory(
 export function MSALConfigFactoryb2c(
   config: ConfigService
 ): PublicClientApplication {
-  const msConf: BrowserAuthOptions | null = config.getConfig(
+  const msConf = config.getConfig(
     'auth.microsoftb2c.browserAuthOptions'
-  );
+  ) as BrowserAuthOptions;
   msConf.redirectUri = msConf?.redirectUri || window.location.href;
   msConf.authority =
     msConf?.authority || 'https://login.microsoftonline.com/organizations';
@@ -59,7 +59,7 @@ export function MSALConfigFactoryb2c(
 export function MSALAngularConfigFactory(
   config: ConfigService
 ): MSPMsalGuardConfiguration {
-  const msConf: AuthMicrosoftOptions = config.getConfig('auth.microsoft');
+  const msConf = config.getConfig('auth.microsoft') as AuthMicrosoftOptions;
 
   return {
     interactionType: InteractionType.Popup,
@@ -74,9 +74,9 @@ export function MSALAngularConfigFactory(
 export function MSALAngularConfigFactoryb2c(
   config: ConfigService
 ): MSPMsalGuardConfiguration {
-  const msConf: BrowserAuthOptions | null = config.getConfig(
+  const msConf = config.getConfig(
     'auth.microsoftb2c.browserAuthOptions'
-  );
+  ) as BrowserAuthOptions;
 
   return {
     interactionType: InteractionType.Popup,

diff --git a/packages/auth/src/lib/shared/auth.guard.ts b/packages/auth/src/lib/shared/auth.guard.ts
@@ -7,6 +7,7 @@ import {
 
 import { ConfigService } from '@igo2/core';
 import { AuthService } from './auth.service';
+import { AuthOptions } from './auth.interface';
 
 @Injectable({
   providedIn: 'root'
@@ -25,8 +26,8 @@ export class AuthGuard {
 
     this.authService.redirectUrl = state.url;
 
-    const authConfig = this.config.getConfig('auth');
-    if (authConfig && authConfig.loginRoute) {
+    const authConfig = this.config.getConfig('auth') as AuthOptions;
+    if (authConfig?.loginRoute) {
       this.router.navigateByUrl(authConfig.loginRoute);
     }
 

diff --git a/packages/auth/src/lib/shared/auth.interceptor.ts b/packages/auth/src/lib/shared/auth.interceptor.ts
@@ -11,12 +11,17 @@ import { Md5 } from 'ts-md5';
 
 import { ConfigService } from '@igo2/core';
 import { TokenService } from './token.service';
-import { AuthByKeyOptions, WithCredentialsOptions } from './auth.interface';
+import {
+  AuthByKeyOptions,
+  AuthOptions,
+  WithCredentialsOptions
+} from './auth.interface';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthInterceptor implements HttpInterceptor {
+  private authOptions: AuthOptions;
   private refreshInProgress = false;
   private trustHosts: string[];
   private hostsWithCredentials: WithCredentialsOptions[];
@@ -27,12 +32,13 @@ export class AuthInterceptor implements HttpInterceptor {
     private tokenService: TokenService,
     private http: HttpClient
   ) {
-    this.trustHosts = this.config.getConfig('auth.trustHosts') || [];
+    this.authOptions = this.config.getConfig('auth') as AuthOptions;
+
+    this.trustHosts = this.authOptions?.trustHosts || [];
     this.trustHosts.push(window.location.hostname);
 
-    this.hostsWithCredentials =
-      this.config.getConfig('auth.hostsWithCredentials') || [];
-    this.hostsWithAuthByKey = this.config.getConfig('auth.hostsByKey') || [];
+    this.hostsWithCredentials = this.authOptions?.hostsWithCredentials || [];
+    this.hostsWithAuthByKey = this.authOptions?.hostsByKey || [];
   }
 
   intercept(
@@ -171,7 +177,7 @@ export class AuthInterceptor implements HttpInterceptor {
     ) {
       this.refreshInProgress = true;
 
-      const url = this.config.getConfig('auth.url');
+      const url = this.authOptions?.url;
       return this.http.post(`${url}/refresh`, {}).subscribe(
         (data: any) => {
           this.tokenService.set(data.token);

diff --git a/packages/auth/src/lib/shared/auth.interface.ts b/packages/auth/src/lib/shared/auth.interface.ts
@@ -16,11 +16,8 @@ export interface AuthGoogleOptions {
   clientId: string;
 }
 
-export interface AuthMicrosoftOptions {
+export interface AuthMicrosoftOptions extends BrowserAuthOptions {
   enabled?: boolean;
-  clientId: string;
-  redirectUri?: string;
-  authority?: string;
 }
 
 export interface AuthMicrosoftb2cOptions {
@@ -54,7 +51,7 @@ export interface AuthMicrosoftb2cOptionsAuthority {
 
 export interface AuthOptions {
   url?: string;
-  tokenKey: string;
+  tokenKey?: string;
   allowAnonymous?: boolean;
   loginRoute?: string;
   logoutRoute?: string;