zavadil-ts-common 1.2.40 → 1.2.41

package/dist/oauth/RestClientWithOAuth.d.ts

@@ -8,15 +8,16 @@ export type ServerOAuthInfoPayload = {
     oauthServerUrl: string;
     version: string;
 };
-export declare class RestClientWithOAuth extends RestClient {
+export declare class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvider {
     private insecureClient;
     private freshIdTokenProvider;
     private tokenManager;
     private serverInfo;
     private defaultPrivilege;
     constructor(url: string, freshIdTokenProvider?: OAuthIdTokenProvider, defaultPrivilege?: string);
+    getIdToken(): Promise<IdTokenPayload>;
     /**
-     * Attempt to get ID token from the provider, this will trigger redirect to login screen in case of the default provider
+     * Attempt to get ID token from token manager
      */
     initialize(): Promise<any>;
     logout(): Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zavadil-ts-common",
-	"version": "1.2.40",
+	"version": "1.2.41",
 	"description": "Common types and components for Typescript UI apps.",
 	"main": "dist/index.js",
 	"module": "dist/index.esm.js",

package/src/oauth/OAuthTokenManager.ts

@@ -69,6 +69,9 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 		this.accessTokens.clear();
 	}
 
+	/**
+	 * Get stored id token or ask the provider, this will trigger redirect to login screen in case of the default provider
+	 */
 	getIdTokenInternal(): Promise<IdTokenPayload> {
 		if (this.idToken === undefined || !this.hasValidIdToken()) {
 			return this.freshIdTokenProvider.getIdToken();
@@ -76,6 +79,9 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 		return Promise.resolve(this.idToken);
 	}
 
+	/**
+	 * Get id token, refresh it if needed
+	 */
 	getIdToken(): Promise<IdTokenPayload> {
 		return this.getIdTokenInternal()
 			.then(

package/src/oauth/RestClientWithOAuth.ts

@@ -1,6 +1,6 @@
 import {OAuthTokenManager} from "./OAuthTokenManager";
 import {RestClient} from "../client";
-import {IdTokenPayload} from "./OAuthRestClient";
+import {IdTokenPayload, TokenResponsePayloadBase} from "./OAuthRestClient";
 import {LazyAsync} from "../cache";
 import {OAuthIdTokenProvider} from "./tokenprovider/OAuthIdTokenProvider";
 import {IdTokenProviderDefault} from "./tokenprovider/IdTokenProviderDefault";
@@ -12,7 +12,7 @@ export type ServerOAuthInfoPayload = {
 	version: string;
 }
 
-export class RestClientWithOAuth extends RestClient {
+export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvider {
 
 	private insecureClient: RestClient;
 
@@ -37,11 +37,15 @@ export class RestClientWithOAuth extends RestClient {
 		this.tokenManager = new LazyAsync<OAuthTokenManager>(() => this.getTokenManagerInternal());
 	}
 
+	getIdToken(): Promise<IdTokenPayload> {
+        return this.getTokenManager().then(t => t.getIdToken());
+    }
+
 	/**
-	 * Attempt to get ID token from the provider, this will trigger redirect to login screen in case of the default provider
+	 * Attempt to get ID token from token manager
 	 */
 	initialize(): Promise<any> {
-		return this.getTokenManager().then(tm => tm.getIdToken())
+		return this.getIdToken();
 	}
 
 	logout(): Promise<any> {