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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,32 +30,16 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
};
oauthService.setupAutomaticSilentRefresh();
let location = injector.get(Location);
var urlPath =location.path();
let router = injector.get(Router);
let urlPath = location.path();
oauthService.loadDiscoveryDocument().then(() => {
oauthService.tryLogin({
onTokenReceived: (info) => {
urlPath = info.state;
}
}).then(() => {
let router = injector.get(Router);
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);
}
});
router.navigateByUrl(urlPath);
});
})
});
}