From eabaa1db197d86a3e5353378b6d0f6a25122804d Mon Sep 17 00:00:00 2001
From: Willem Dantuma <willem.dantuma@dobs.nl>
Date: Tue, 5 Oct 2021 20:56:27 +0200
Subject: [PATCH] oauth2 fixes

---
 projects/common-map/ng-package.json                        | 2 +-
 .../feature-list-croppingscheme.component.html             | 2 +-
 projects/common/ng-package.json                            | 2 +-
 projects/common/package.json                               | 2 +-
 .../common/src/fm/components/avatar/avatar.component.ts    | 1 +
 projects/common/src/fm/reducers/app-common.reducer.ts      | 7 ++++---
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/projects/common-map/ng-package.json b/projects/common-map/ng-package.json
index 1e00865..2516fa8 100644
--- a/projects/common-map/ng-package.json
+++ b/projects/common-map/ng-package.json
@@ -4,7 +4,7 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "."
   ]
 }
\ No newline at end of file
diff --git a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
index 885d2af..1d6d49e 100644
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
@@ -1,7 +1,7 @@
 <div class="card border-0">
   <div class="card-body">
       <fm-back-button></fm-back-button>
-      <h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3>
+      <h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3>
       <div *ngIf="features;let features">
       <div class="farms">
         <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
diff --git a/projects/common/ng-package.json b/projects/common/ng-package.json
index 23ce9f8..2fd2a1c 100644
--- a/projects/common/ng-package.json
+++ b/projects/common/ng-package.json
@@ -7,7 +7,7 @@
       "my-data": "my-data"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "."
   ]
 }
\ No newline at end of file
diff --git a/projects/common/package.json b/projects/common/package.json
index 7ce0346..6cfae04 100644
--- a/projects/common/package.json
+++ b/projects/common/package.json
@@ -16,7 +16,7 @@
     "bootstrap": "^4.4.1",
     "@microsoft/signalr": "^3.1.3",
     "ngx-uploadx": "^3.3.4",
-    "angular-oauth2-oidc": "^10.0.3",
+    "angular-oauth2-oidc": "^12.0",
     "moment": "^2.27.0",
     "ngx-avatar": "^4.0.0",
     "ngx-image-cropper": "^3.3.5",
diff --git a/projects/common/src/fm/components/avatar/avatar.component.ts b/projects/common/src/fm/components/avatar/avatar.component.ts
index 5672e66..5de8eba 100644
--- a/projects/common/src/fm/components/avatar/avatar.component.ts
+++ b/projects/common/src/fm/components/avatar/avatar.component.ts
@@ -40,6 +40,7 @@ export class AvatarComponent implements OnInit {
 
   refresh(user: IUser) {
     if (!user) return null;
+    debugger;
     const apiEndpoint = this.appConfig.getConfig("apiEndPoint");
     this.src = `${apiEndpoint}/api/v1/users/${user.code}/avatar`;
     this.name = user.firstName && user.lastName ? 
diff --git a/projects/common/src/fm/reducers/app-common.reducer.ts b/projects/common/src/fm/reducers/app-common.reducer.ts
index bc5dcbb..ea881c3 100644
--- a/projects/common/src/fm/reducers/app-common.reducer.ts
+++ b/projects/common/src/fm/reducers/app-common.reducer.ts
@@ -8,6 +8,7 @@ import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/s
 
 import { MODULE_NAME } from '../module-name';
 import { IItem } from '../models/item';
+import { userInfo } from 'os';
 
 export interface State {
   openedModalName: string,
@@ -57,13 +58,13 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
     case appCommonActions.INITUSERSUCCESS: {
       let a = action as appCommonActions.InitUserSuccess;
       let claims = {}
-      Object.getOwnPropertyNames(a.userinfo).forEach((k) => {
+      Object.getOwnPropertyNames(a.userinfo.info).forEach((k) => {
          claims[k] = a.userinfo[k];
       });
       var user:IUser = {
         code:a.user.code,
-        email:a.userinfo["email"],
-        name:a.userinfo["name"],
+        email:a.user?.name?a.user.name : claims["email"],
+        name:a.user?.email?a.user.email : claims["name"],
         claims:claims,
         searchable: false
       };