FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Read both farmmaps currentuser and authenticate userinfo
All checks were successful
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2020-06-10 21:53:54 +02:00
parent e0d585e125
commit 978cbdabfc
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/common/src/fm/actions/app-common.actions.ts
View File

@ -4,6 +4,7 @@ import { IItemTypes } from '../models/item.types';
import { IListItem } from '../models/list.item'; import { IListItem } from '../models/list.item';
import { IUser } from '../models/user'; import { IUser } from '../models/user';
import { IItem } from '../models/item'; import { IItem } from '../models/item';
import { UserInfo } from 'angular-oauth2-oidc';
export const INITUSER = '[AppCommon] InitUser'; export const INITUSER = '[AppCommon] InitUser';
export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess'; export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess';
@ -62,7 +63,7 @@ export class InitUser implements Action {
export class InitUserSuccess implements Action { export class InitUserSuccess implements Action {
readonly type = INITUSERSUCCESS; readonly type = INITUSERSUCCESS;
constructor(public user:IUser ) { } constructor(public user:IUser,public userinfo:UserInfo ) { }
} }
export class InitUserPackagesSuccess implements Action { export class InitUserPackagesSuccess implements Action {

9
projects/common/src/fm/effects/app-common.effects.ts
View File

@ -1,9 +1,9 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
import { Store, Action } from '@ngrx/store'; import { Store, Action } from '@ngrx/store';
import { Effect, Actions,ofType } from '@ngrx/effects'; import { Effect, Actions,ofType } from '@ngrx/effects';
import { Observable , defer , of } from 'rxjs'; import { Observable , defer , of,from } from 'rxjs';
import { withLatestFrom,mergeMap,switchMap,map,catchError} from 'rxjs/operators'; import { withLatestFrom,mergeMap,switchMap,map,catchError} from 'rxjs/operators';
import * as appCommonActions from '../actions/app-common.actions'; import * as appCommonActions from '../actions/app-common.actions';
import * as appCommonReducers from '../reducers/app-common.reducer'; import * as appCommonReducers from '../reducers/app-common.reducer';
@ -44,9 +44,10 @@ export class AppCommonEffects {
ofType(appCommonActions.INITUSER), ofType(appCommonActions.INITUSER),
withLatestFrom(this.store$.select(appCommonReducers.selectGetInitialized)), withLatestFrom(this.store$.select(appCommonReducers.selectGetInitialized)),
switchMap(([action, initialized]) => { switchMap(([action, initialized]) => {
if(!initialized) { if(!initialized) {
return this.userService$.getCurrentUser().pipe( return this.userService$.getCurrentUser().pipe(
map((user: IUser) => new appCommonActions.InitUserSuccess(user)), withLatestFrom(from(this.oauthService$.loadUserProfile())),
switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
catchError(error => of(new appCommonActions.Fail(error)))) catchError(error => of(new appCommonActions.Fail(error))))
} else { } else {
return []; return [];

7
projects/common/src/fm/reducers/app-common.reducer.ts
View File

@ -36,7 +36,12 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
switch (action.type) { switch (action.type) {
case appCommonActions.INITUSERSUCCESS: { case appCommonActions.INITUSERSUCCESS: {
let a = action as appCommonActions.InitUserSuccess; let a = action as appCommonActions.InitUserSuccess;
return tassign(state, { user: a.user,initialized: true }); var user:IUser = {
code:a.user.code,
email:a.userinfo["email"],
name:a.userinfo["name"]
};
return tassign(state, { user: user,initialized: true });
} }
case appCommonActions.INITROOTSUCCESS: { case appCommonActions.INITROOTSUCCESS: {
let a = action as appCommonActions.InitRootSuccess; let a = action as appCommonActions.InitRootSuccess;

2
src/app/id4AuthconfigFactory.ts
View File

@ -14,7 +14,7 @@ export class Id4AuthconfigFactory implements IAuthconfigFactory {
authConfig.redirectUri = window.location.origin + "/cb"; authConfig.redirectUri = window.location.origin + "/cb";
authConfig.clientId = appConfig.getConfig("clientId"); authConfig.clientId = appConfig.getConfig("clientId");
authConfig.customQueryParams = { audience: appConfig.getConfig("audience") }; authConfig.customQueryParams = { audience: appConfig.getConfig("audience") };
authConfig.scope = "profile api offline_access"; authConfig.scope = "openid profile api offline_access";
authConfig.disableAtHashCheck = true; authConfig.disableAtHashCheck = true;
authConfig.responseType = "code"; authConfig.responseType = "code";
authConfig.requireHttps = appConfig.getConfig("requireHttps"); authConfig.requireHttps = appConfig.getConfig("requireHttps");