zavadil-ts-common 1.1.47 → 1.1.48

package/package.json

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

package/src/oauth/OAuthRestClient.ts

@@ -1,4 +1,4 @@
-import {RestClient} from "../client/RestClient";
+import {RestClient} from "../client";
 import {StringUtil} from "../util";
 
 export type TokenRequestPayloadBase = {
@@ -45,7 +45,7 @@ export type JwksPayload = {
 
 /**
  * This implements rest client for OAuth server - https://github.com/lotcz/oauth-server
- * Provide basic url, /api/oauth prefix will be added automatically
+ * Provide basic url, /api/oauth path prefix will be added automatically
  */
 export class OAuthRestClient extends RestClient {
 
@@ -57,6 +57,10 @@ export class OAuthRestClient extends RestClient {
 		return this.getJson('jwks.json');
 	}
 
+	verifyIdToken(idToken: string): Promise<IdTokenPayload> {
+		return this.getJson(`id-tokens/verify/${idToken}`);
+	}
+
 	requestIdTokenFromLogin(request: RequestIdTokenFromLoginPayload): Promise<IdTokenPayload> {
 		return this.postJson('id-tokens/from-login', request);
 	}

package/src/oauth/OAuthTokenManager.ts

@@ -1,10 +1,13 @@
 import {AccessTokenPayload, IdTokenPayload, OAuthRestClient, RequestIdTokenFromLoginPayload} from "./OAuthRestClient";
+import {EventManager} from "../component";
 
 /**
  * Manages refresh of id and access tokens.
  */
 export class OAuthTokenManager {
 
+	private eventManager: EventManager = new EventManager();
+
 	oAuthServer: OAuthRestClient;
 
 	audience: string;
@@ -18,6 +21,10 @@ export class OAuthTokenManager {
 		this.oAuthServer = new OAuthRestClient(oAuthServerBaseUrl);
 	}
 
+	addIdTokenChangedHandler(handler: () => any) {
+		this.eventManager.addEventListener('id-token-changed', handler);
+	}
+
 	isTokenExpired(expires?: Date | null): boolean {
 		if (expires === undefined || expires === null) return false;
 		const now = Date.now();
@@ -49,7 +56,7 @@ export class OAuthTokenManager {
 	}
 
 	reset() {
-		this.idToken = undefined;
+		this.setIdToken(undefined);
 		this.accessToken = undefined;
 	}
 
@@ -62,10 +69,7 @@ export class OAuthTokenManager {
 				.refreshIdToken({idToken: this.idToken.idToken})
 				.then(
 					(t) => {
-						if (!this.isValidIdToken(t)) {
-							return Promise.reject("Received ID token is not valid!");
-						}
-						this.idToken = t;
+						this.setIdToken(t);
 						return t.idToken;
 					}
 				)
@@ -73,11 +77,18 @@ export class OAuthTokenManager {
 		return Promise.resolve(this.idToken.idToken);
 	}
 
-	setIdToken(token: IdTokenPayload) {
+	setIdToken(token?: IdTokenPayload) {
 		if (!this.isValidIdToken(token)) {
 			throw new Error("Received ID token is not valid!");
 		}
 		this.idToken = token;
+		this.eventManager.triggerEvent('id-token-changed');
+	}
+
+	verifyIdToken(token: string): Promise<boolean> {
+		return this.oAuthServer.verifyIdToken(token)
+			.then((t) => this.setIdToken(t))
+			.then(() => true)
 	}
 
 	login(login: string, password: string): Promise<boolean> {

package/src/oauth/RestClientWithOAuth.ts

@@ -23,6 +23,10 @@ export class RestClientWithOAuth extends RestClient {
 		this.insecureClient = new RestClient(url);
 	}
 
+	addIdTokenChangedHandler(handler: () => any) {
+		this.getTokenManager().then((m) => m.addIdTokenChangedHandler(handler));
+	}
+
 	getServerInfo(): Promise<ServerOAuthInfoPayload> {
 		if (this.serverInfo !== undefined) {
 			return Promise.resolve(this.serverInfo);
@@ -52,6 +56,11 @@ export class RestClientWithOAuth extends RestClient {
 			.then(() => true)
 	}
 
+	setIdTokenRaw(token: string): Promise<boolean> {
+		return this.getTokenManager()
+			.then(m => m.verifyIdToken(token))
+	}
+
 	getHeaders(): Promise<RestClientHeaders> {
 		return this.getTokenManager()
 			.then(sm => sm.getAccessToken())