zavadil-ts-common 1.1.69 → 1.1.71

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;
@@ -59,13 +60,16 @@ export class RestClientWithOAuth extends RestClient {
 					return true;
 				}
 			).catch(
-				() => this.getServerInfo().then(
-					(si) => {
-						const documentlocation = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${document.location}`;
-						console.log('redirect', documentlocation);
-						return Promise.resolve(false);
-					}
-				)
+				(reason) => {
+					console.log('OAuth initialization failed:', reason);
+					return this.getServerInfo().then(
+						(si) => {
+							const documentlocation = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${document.location}`;
+							console.log('Redirecting:', documentlocation);
+							return Promise.resolve(false);
+						}
+					)
+				}
 			);
 	}
 
@@ -82,15 +86,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);
+	}
 }