From 675ed2827b5a3262dd7a404a91d10ff6cc26f7ab Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Jun 2021 16:20:18 +0300 Subject: [PATCH] refactor the pipeToTokenResponse fn --- .../packages/core/src/lib/utils/auth-utils.ts | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/auth-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/auth-utils.ts index 5eb74f2eb9..44da3f7c4a 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/auth-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/auth-utils.ts @@ -28,29 +28,24 @@ export function pipeToLogin( ); } -export function pipeToTokenResponse(injector: Injector) { +export function setTokenResponseToStorage(injector: Injector, tokenRes: TokenResponse) { + const { access_token, refresh_token, scope: grantedScopes, expires_in } = tokenRes; const storage = injector.get(OAuthStorage); - return pipe( - tap((res: TokenResponse) => { - const { access_token, refresh_token, scope: grantedScopes, expires_in } = res; - - storage.setItem('access_token', access_token); - storage.setItem('refresh_token', refresh_token); - storage.setItem('access_token_stored_at', '' + Date.now()); + storage.setItem('access_token', access_token); + storage.setItem('refresh_token', refresh_token); + storage.setItem('access_token_stored_at', '' + Date.now()); - if (grantedScopes) { - storage.setItem('granted_scopes', JSON.stringify(grantedScopes.split(' '))); - } + if (grantedScopes) { + storage.setItem('granted_scopes', JSON.stringify(grantedScopes.split(' '))); + } - if (expires_in) { - const expiresInMilliSeconds = expires_in * 1000; - const now = new Date(); - const expiresAt = now.getTime() + expiresInMilliSeconds; - storage.setItem('expires_at', '' + expiresAt); - } - }), - ); + if (expires_in) { + const expiresInMilliSeconds = expires_in * 1000; + const now = new Date(); + const expiresAt = now.getTime() + expiresInMilliSeconds; + storage.setItem('expires_at', '' + expiresAt); + } } export function setRememberMe(remember: boolean) {