zavadil-ts-common 1.1.58 → 1.1.60

package/src/cache/LazyAsync.ts

@@ -21,6 +21,9 @@ export class LazyAsync<T> {
 					this.cache = v;
 					this.promise = undefined;
 					return v;
+				}).catch((err) => {
+					this.promise = undefined;
+					throw err;
 				});
 		}
 

package/src/oauth/OAuthTokenManager.ts

@@ -58,13 +58,13 @@ export class OAuthTokenManager {
 	}
 
 	reset() {
+		console.log('resetting');
 		this.setIdToken(undefined);
 		this.accessTokens.clear();
 	}
 
 	getIdToken(): Promise<string> {
 		if (this.idToken === undefined || !this.hasValidIdToken()) {
-			console.log('no id token?', this.idToken)
 			return Promise.reject("No valid ID token!");
 		}
 		if (this.isTokenReadyForRefresh(this.idToken.issuedAt, this.idToken.expires)) {
@@ -81,6 +81,7 @@ export class OAuthTokenManager {
 	}
 
 	setIdToken(token?: IdTokenPayload) {
+		console.log('setting id token', token);
 		if (!this.isValidIdToken(token)) {
 			throw new Error("Received ID token is not valid!");
 		}
@@ -89,6 +90,7 @@ 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)

package/src/oauth/RestClientWithOAuth.ts

@@ -48,6 +48,7 @@ export class RestClientWithOAuth extends RestClient {
 	 */
 	initialize(): Promise<boolean> {
 		return this.initializeIdToken()
+			.then((result) => console.log('initialized', result ? 'success' : 'problem'))
 			.then(() => this.checkAccessToken())
 			.catch(
 				() => this.getServerInfo().then(
@@ -131,6 +132,7 @@ export class RestClientWithOAuth extends RestClient {
 	}
 
 	setIdTokenRaw(token: string): Promise<boolean> {
+		console.log('setting raw token', token);
 		return this.getTokenManager()
 			.then(m => m.verifyIdToken(token))
 	}
@@ -153,6 +155,7 @@ export class RestClientWithOAuth extends RestClient {
 	 * This is basically only used when initializing and trying to determine whether we need to redirect user to login page
 	 */
 	checkAccessToken(privilege?: string): Promise<boolean> {
+		console.log('checking access token', privilege);
 		return this.getTokenManager()
 			.then(tm => tm.getAccessToken(StringUtil.getNonEmpty(privilege, this.defaultPrivilege)))
 			.then((accessToken) => true);