More migration fixes

projects/common-map/package-lock.json

@@ -4,10 +4,10 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "elm-pep": {
+    "@openlayers/pepjs": {
-      "version": "1.0.6",
+      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/elm-pep/-/elm-pep-1.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/@openlayers/pepjs/-/pepjs-0.5.3.tgz",
-      "integrity": "sha512-1DJ6ReFk8+GtgoqRiEhBo28K69Rxe9Bfc7h16+1VMQT2KlCuPBYj5W33OYa2AZpqkuqCBLhcNzO10zxJVakapA=="
+      "integrity": "sha512-Bgvi5c14BS0FJWyYWWFstNEnXsB30nK8Jt8hkAAdqr7E0gDdBBWVDglF3Ub19wTxvgJ/CVHyTY6VuCtnyRzglg=="
     },
     "ieee754": {
       "version": "1.1.13",
@@ -23,11 +23,11 @@
       }
     },
     "ol": {
-      "version": "6.2.1",
+      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/ol/-/ol-6.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/ol/-/ol-6.1.1.tgz",
-      "integrity": "sha512-CT2szew/COd7Zf9Bls+pdzewBYZNgyfxFivJ3L4Jv9Th7JdWjcQAT+pqMPH25L9SbVT+T17RCMq2H2m9uBCl1A==",
+      "integrity": "sha512-0dL3i3eJqgOpqIjDKEY3grkeQnjAYfV5L/JCxhOu4SxiaizRwFrFgeas6LILRoxKa03jhQFbut2r2bbgcLGQeA==",
       "requires": {
-        "elm-pep": "^1.0.4",
+        "@openlayers/pepjs": "^0.5.3",
         "pbf": "3.2.1",
         "pixelworks": "1.1.0",
         "rbush": "^3.0.1"

projects/common-map/package.json

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "ngx-openlayers": "1.0.0-next.13",
-    "ol": "6.2.1"
+    "ol": "6.1.1"
   },
   "peerDependencies": {
     "@angular/core": "^9.1.0",

projects/common-map/tsconfig.lib.json

@@ -22,7 +22,8 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "enableIvy": false
   },
   "exclude": [
     "src/test.ts",

projects/common-map/tsconfig.lib.prod.json

@@ -1,6 +0,0 @@
-{
-  "extends": "./tsconfig.lib.json",
-  "angularCompilerOptions": {
-    "enableIvy": false
-  }
-}

projects/common/src/fm/services/auth-guard.service.ts

@@ -38,24 +38,19 @@ export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  {
 
   checkLogin(url: string): boolean {
     if (!this.oauthService.hasValidAccessToken()) {
-      this.oauthService.responseType
+      if(this.oauthService.getRefreshToken() != null ) {
-      if(this.oauthService.responseType == "code")
+        this.oauthService.refreshToken().then(() => {
-        if(this.oauthService.getRefreshToken() != null ) {
+          this.store.dispatch(new appCommonActions.InitUser());
-          this.oauthService.refreshToken().then(() => {
+          return true;
-            this.store.dispatch(new appCommonActions.InitUser());
+        }).catch(() => {
-            return true;
-          }).catch(() => {
-            this.oauthService.initCodeFlow(url);
-            return false;
-          }                
-          )
-        } else {
           this.oauthService.initCodeFlow(url);
           return false;
         }                
-      else 
+        )
-        this.oauthService.initImplicitFlow(url);
+      } else {
+        this.oauthService.initCodeFlow(url);
         return false;
+      }                   
     } else {
       this.store.dispatch(new appCommonActions.InitUser());
       return true;

projects/common/src/fm/shared/app.config.factory.ts

@@ -1,7 +1,7 @@
 import { Injector } from '@angular/core';
 import { Location} from '@angular/common';
 import { Router,UrlSerializer } from '@angular/router';
-import { AuthConfig, OAuthService, JwksValidationHandler, OAuthErrorEvent, OAuthStorage  } from 'angular-oauth2-oidc';
+import { AuthConfig, OAuthService, OAuthErrorEvent, OAuthStorage  } from 'angular-oauth2-oidc';
 import { AppConfig } from "./app.config";
 import {ItemTypeService} from '../services/itemtype.service';
 import { IAuthconfigFactory } from './authconfigFactory';
@@ -26,21 +26,12 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
         });
         oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
         oauthService.setStorage(authStorage);
-        oauthService.tokenValidationHandler = new JwksValidationHandler();
-        oauthService.tokenValidationHandler.validateAtHash = function () {
-          return new Promise<boolean>((res) => { res(true); })
-        };
         oauthService.setupAutomaticSilentRefresh();
         let location = injector.get(Location);
         let router = injector.get(Router);
-        let urlPath = location.path();
         oauthService.loadDiscoveryDocument().then(() => {
-          oauthService.tryLogin({
+          oauthService.tryLoginCodeFlow().then(() => {
-            onTokenReceived: (info) => {
+            router.navigateByUrl(decodeURIComponent(oauthService.state));
-              urlPath = info.state;
-            }
-          }).then(() => {
-            router.navigateByUrl(urlPath);
           });    
         })
       }).then(() => {

projects/common/tsconfig.lib.json

@@ -29,7 +29,8 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true   
+    "enableResourceInlining": true,
+    "enableIvy": false
   },
   "exclude": [
     "src/test.ts",

projects/common/tsconfig.lib.prod.json

@@ -1,6 +0,0 @@
-{
-  "extends": "./tsconfig.lib.json",
-  "angularCompilerOptions": {
-    "enableIvy": false
-  }
-}

src/app/app.module.ts

@@ -61,7 +61,12 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
     AppCommonServiceModule.forRoot(),
     AppCommonMapModule.forRoot(),
     BrowserModule,
-    StoreModule.forRoot({}),
+    StoreModule.forRoot({},{runtimeChecks: { // TODO fix this should all be true
+			strictStateImmutability: false,
+			strictActionImmutability: false,
+			strictStateSerializability: false,
+			strictActionSerializability: false
+		}}),
     EffectsModule.forRoot([])
   ],
   providers: [

src/tsconfig.app.json

@@ -10,5 +10,8 @@
   ],
   "include": [
     "src/**/*.d.ts"
-  ]
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
 }