zavadil-ts-common 1.2.23 → 1.2.25

package/src/oauth/RestClientWithOAuth.ts

@@ -40,8 +40,7 @@ export class RestClientWithOAuth extends RestClient {
 			return this.setIdTokenRaw(urlToken)
 				.then(() => {
 					console.log("Redirecting to url without id token");
-					this.deleteIdTokenFromUrl();
-					//document.location =;
+					document.location = this.deleteIdTokenFromUrl();
 				});
 		} else {
 			const storageToken = this.getIdTokenFromLocalStorage();
@@ -61,7 +60,7 @@ export class RestClientWithOAuth extends RestClient {
 					console.log('OAuth initialization failed:', reason);
 					return this.getServerInfo().then(
 						(si) => {
-							const location = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${document.location}`;
+							const location = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${this.deleteIdTokenFromUrl()}`;
 							console.log('Redirecting to login page:', location);
 							document.location = location;
 						}
@@ -87,10 +86,13 @@ export class RestClientWithOAuth extends RestClient {
 		return this.defaultPrivilege;
 	}
 
-	deleteIdTokenFromUrl() {
+	deleteIdTokenFromUrl(): string {
 		const up = new URLSearchParams(document.location.search);
 		up.delete(this.tokenName);
-		document.location.search = up.toString();
+		const loc = new Location();
+		loc.replace(document.location.toString());
+		loc.search = up.toString();
+		return loc.toString();
 	}
 
 	getIdTokenFromUrl(): string | null {
@@ -170,19 +172,13 @@ export class RestClientWithOAuth extends RestClient {
 	}
 
 	/**
-	 * Try to obtain access token, then return true if everything is okay.
+	 * Try to obtain access token, then return 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> {
+	checkAccessToken(privilege?: string): Promise<any> {
 		return this.getTokenManager()
 			.then(tm => tm.getAccessToken(StringUtil.getNonEmpty(privilege, this.defaultPrivilege)))
-			.then((accessToken) => true)
-			.catch(
-				(e) => {
-					console.error('Access token check failed:', e);
-					return false;
-				}
-			);
+			.catch((e) => Promise.reject(`Access token check failed: ${e}`));
 	}
 
 }