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

Refactor authentication flow
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good
Details

Browse Source
This commit is contained in:
Willem Dantuma 2020-01-31 11:24:45 +01:00
parent e53378a76b
commit 62234b3f9d
3 changed files with 73 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/common/src/fm/components/app/app.component.html
View File

@ -1,7 +1,7 @@
<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}"> <div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}">
<nav class="navbar navbar-expand-lg navbar-dark bg-primary"> <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<button type="button" class="btn btn-light" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button> <button type="button" class="btn btn-outline-light" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
<router-outlet name="menu"></router-outlet> <router-outlet name="menu ml-4 float-right"></router-outlet>
</nav> </nav>
<div class="body"> <div class="body">
<router-outlet></router-outlet> <router-outlet></router-outlet>

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

@ -40,20 +40,27 @@ export class AuthGuard implements CanActivate, CanLoad, CanActivateChild {
checkLogin(url: string): boolean { checkLogin(url: string): boolean {
if (!this.oauthService.hasValidAccessToken()) { if (!this.oauthService.hasValidAccessToken()) {
if (!this.loginDispatched) { debugger;
this.oauthService.silentRefresh().then(info => { this.oauthService.responseType
this.router.navigateByUrl(url); if(this.oauthService.responseType == "code")
}).catch(error => { if(this.oauthService.getRefreshToken() != null ) {
this.loginDispatched = true; this.oauthService.refreshToken().then(() => {
this.store.dispatch(new appCommonActions.Login(url)); this.store.dispatch(new appCommonActions.InitUser());
}) return true;
} }).catch(() => {
return false; this.oauthService.initCodeFlow(url);
return false;
}
)
} else {
this.oauthService.initCodeFlow(url);
return false;
}
else
this.oauthService.initImplicitFlow(url);
return false;
} else { } else {
if (!this.initialized) { this.store.dispatch(new appCommonActions.InitUser());
this.initialized = true;
this.store.dispatch(new appCommonActions.InitUser());
}
return true; return true;
} }
} }

22
projects/common/src/fm/shared/app.config.factory.ts
View File

@ -30,31 +30,15 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
}; };
oauthService.setupAutomaticSilentRefresh(); oauthService.setupAutomaticSilentRefresh();
let location = injector.get(Location); let location = injector.get(Location);
var urlPath =location.path(); let router = injector.get(Router);
let urlPath = location.path();
oauthService.loadDiscoveryDocument().then(() => { oauthService.loadDiscoveryDocument().then(() => {
oauthService.tryLogin({ oauthService.tryLogin({
onTokenReceived: (info) => { onTokenReceived: (info) => {
urlPath = info.state; urlPath = info.state;
} }
}).then(() => { }).then(() => {
let router = injector.get(Router); router.navigateByUrl(urlPath);
if (!oauthService.hasValidAccessToken()) {
if(appConfig.getConfig("grantType") == "code")
if(oauthService.getRefreshToken() != null ) {
oauthService.refreshToken().then(() => {
router.navigateByUrl(urlPath);
}).catch(() => {
oauthService.initCodeFlow(urlPath);
}
)
} else {
oauthService.initCodeFlow(urlPath);
}
else
oauthService.initImplicitFlow(urlPath);
} else {
router.navigateByUrl(urlPath);
}
}); });
}) })
}); });