zavadil-ts-common 1.1.67 → 1.1.69

package/src/oauth/RestClientWithOAuth.ts

@@ -48,9 +48,17 @@ export class RestClientWithOAuth extends RestClient {
 	 */
 	initialize(): Promise<boolean> {
 		return this.initializeIdToken()
-			.then((result) => console.log('initialized', result ? 'success' : 'problem'))
-			.then(() => this.checkAccessToken())
-			.catch(
+			.then(
+				(success: boolean) => {
+					if (success) return this.checkAccessToken();
+					return Promise.reject("ID token initialization failed!");
+				}
+			).then(
+				(success: boolean) => {
+					if (!success) return Promise.reject("Access token initialization failed!");
+					return true;
+				}
+			).catch(
 				() => this.getServerInfo().then(
 					(si) => {
 						const documentlocation = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${document.location}`;
@@ -132,9 +140,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))
+		return this.getTokenManager().then(m => m.verifyIdToken(token))
 	}
 
 	getHeaders(url: string): Promise<RestClientHeaders> {
@@ -151,17 +157,16 @@ export class RestClientWithOAuth extends RestClient {
 	}
 
 	/**
-	 * Try to obtain access token, then return true or reject.
+	 * Try to obtain access token, then return true if everything is okay.
 	 * 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,
-				(r) => {
-					console.error('check failed', r);
+			.then((accessToken) => true)
+			.catch(
+				(e) => {
+					console.error('Access token check failed:', e);
 					return false;
 				}
 			);