From d906c6832170d131dc93fa53be2172564e7b0a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinan=20=C3=96zt=C3=BCrk?= Date: Thu, 18 Jan 2024 14:19:08 +0300 Subject: [PATCH 1/2] add new methods to abstract class and oauth.service --- .../core/src/lib/abstracts/auth.service.ts | 30 ++++++++++++++++++- .../oauth/src/lib/services/oauth.service.ts | 16 ++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts b/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts index 8527232d5f..024f4ba413 100644 --- a/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts +++ b/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts @@ -31,7 +31,7 @@ export class AuthService implements IAuthService { return of(undefined); } - navigateToLogin(queryParams?: Params): void {} + navigateToLogin(queryParams?: Params): void { } get isInternalAuth(): boolean { throw new Error('not implemented'); @@ -50,6 +50,26 @@ export class AuthService implements IAuthService { console.log({ grantType, parameters, headers }); return Promise.reject(new Error('not implemented')); } + + getAccessTokenExpiration(): number { + this.warningMessage(); + return 0; + } + + getRefreshToken(): string { + this.warningMessage(); + return ''; + } + + getAccessToken(): string { + this.warningMessage(); + return ''; + } + + refreshToken(): Promise { + this.warningMessage(); + return Promise.resolve(undefined); + } } export interface IAuthService { @@ -70,4 +90,12 @@ export interface IAuthService { parameters: object, headers?: HttpHeaders, ): Promise; + + getAccessTokenExpiration(): number; + + getRefreshToken(): string; + + getAccessToken(): string; + + refreshToken(): void; } diff --git a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts index 2e615c95a5..aea8fa1167 100644 --- a/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts +++ b/npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts @@ -83,4 +83,20 @@ export class AbpOAuthService implements IAuthService { return this.oAuthService.fetchTokenUsingGrant(grantType, p, headers); } + + getRefreshToken(): string { + return this.oAuthService.getRefreshToken(); + } + + getAccessToken(): string { + return this.oAuthService.getAccessToken(); + } + + refreshToken(): Promise { + return this.oAuthService.refreshToken(); + } + + getAccessTokenExpiration(): number { + return this.oAuthService.getAccessTokenExpiration(); + } } From 9a1f489dbadd8d7605886c1c882d0e2f33e45f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sinan=20=C3=96zt=C3=BCrk?= Date: Fri, 19 Jan 2024 10:16:22 +0300 Subject: [PATCH 2/2] set return type of refreshToken() method in interface --- npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts b/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts index 024f4ba413..fd28a88e68 100644 --- a/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts +++ b/npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts @@ -97,5 +97,5 @@ export interface IAuthService { getAccessToken(): string; - refreshToken(): void; + refreshToken(): Promise; }