zavadil-ts-common 1.1.70 → 1.1.72

package/src/oauth/OAuthTokenManager.ts

@@ -40,7 +40,7 @@ export class OAuthTokenManager {
 	}
 
 	isValidIdToken(idToken?: IdTokenPayload): boolean {
-		return idToken !== undefined && StringUtil.notEmpty(idToken.idToken) && !this.isTokenExpired(idToken.expires);
+		return idToken !== undefined && StringUtil.notEmpty(idToken.token) && !this.isTokenExpired(idToken.expires);
 	}
 
 	hasValidIdToken(): boolean {
@@ -48,7 +48,7 @@ export class OAuthTokenManager {
 	}
 
 	isValidAccessToken(accessToken?: AccessTokenPayload): boolean {
-		return accessToken !== undefined && StringUtil.notEmpty(accessToken.accessToken) && !this.isTokenExpired(accessToken.expires);
+		return accessToken !== undefined && StringUtil.notEmpty(accessToken.token) && !this.isTokenExpired(accessToken.expires);
 	}
 
 	hasValidAccessToken(privilege: string): boolean {
@@ -56,7 +56,8 @@ export class OAuthTokenManager {
 	}
 
 	reset() {
-		this.setIdToken(undefined);
+		this.idToken = undefined;
+		this.eventManager.triggerEvent('id-token-changed', undefined);
 		this.accessTokens.clear();
 	}
 
@@ -66,15 +67,15 @@ export class OAuthTokenManager {
 		}
 		if (this.isTokenReadyForRefresh(this.idToken.issuedAt, this.idToken.expires)) {
 			return this.oAuthServer
-				.refreshIdToken({idToken: this.idToken.idToken})
+				.refreshIdToken({idToken: this.idToken.token})
 				.then(
 					(t) => {
 						this.setIdToken(t);
-						return t.idToken;
+						return t.token;
 					}
 				);
 		}
-		return Promise.resolve(this.idToken.idToken);
+		return Promise.resolve(this.idToken.token);
 	}
 
 	setIdToken(token?: IdTokenPayload) {
@@ -86,7 +87,6 @@ export class OAuthTokenManager {
 	}
 
 	verifyIdToken(token: string): Promise<boolean> {
-		console.log('verifying id token', token);
 		return this.oAuthServer.verifyIdToken(token)
 			.then((t) => this.setIdToken(t))
 			.then(() => true)
@@ -119,10 +119,10 @@ export class OAuthTokenManager {
 
 	getAccessToken(privilege: string): Promise<string> {
 		const existing = this.accessTokens.get(privilege);
-		if (existing === undefined || !this.isValidAccessToken(existing)) return this.getAccessTokenInternal(privilege).then((t) => t.accessToken);
+		if (existing === undefined || !this.isValidAccessToken(existing)) return this.getAccessTokenInternal(privilege).then((t) => t.token);
 		// preload access token if it is going to expire soon
 		if (this.isTokenReadyForRefresh(existing.issuedAt, existing.expires)) this.getAccessTokenInternal(privilege);
-		return Promise.resolve(existing.accessToken);
+		return Promise.resolve(existing.token);
 	}
 
 }

package/src/oauth/RestClientWithOAuth.ts

@@ -3,6 +3,7 @@ import {RestClient, RestClientHeaders} from "../client";
 import {IdTokenPayload} from "./OAuthRestClient";
 import {LazyAsync} from "../cache";
 import {DateUtil, StringUtil} from "../util";
+import {JsonUtil} from "../util/JsonUtil";
 
 export type ServerOAuthInfoPayload = {
 	debugMode?: boolean;
@@ -72,6 +73,10 @@ export class RestClientWithOAuth extends RestClient {
 			);
 	}
 
+	logout(): Promise<any> {
+		return this.getTokenManager().then((m) => m.reset());
+	}
+
 	/**
 	 * Override this if a different privilege is needed for different endpoints
 	 * @param url
@@ -85,15 +90,8 @@ export class RestClientWithOAuth extends RestClient {
 		return up.get('token');
 	}
 
-	getIdTokenFromLocalStorage(): IdTokenPayload | null {
-		const raw = localStorage.getItem('id-token');
-		if (!raw) return null;
-		const obj = JSON.parse(raw);
-		return {
-			idToken: obj.idToken,
-			issuedAt: DateUtil.parseDate(obj.issuedAt) || new Date(),
-			expires: DateUtil.parseDate(obj.expires)
-		}
+	getIdTokenFromLocalStorage(): IdTokenPayload | null | undefined {
+		return JsonUtil.parse(localStorage.getItem('id-token'));
 	}
 
 	saveIdTokenToLocalStorage(token: IdTokenPayload | null) {

package/src/util/JsonUtil.ts

@@ -13,4 +13,8 @@ export class JsonUtil {
 		if (StringUtil.isBlank(json)) return undefined;
 		return JSON.parse(StringUtil.getNonEmpty(json), JsonUtil.dateParser);
 	}
+
+	static parse(json?: string | null): any {
+		return JsonUtil.parseWithDates(json);
+	}
 }