zavadil-ts-common 1.2.35 → 1.2.37

package/src/oauth/RestClientWithOAuth.ts

@@ -23,7 +23,7 @@ export class RestClientWithOAuth extends RestClient {
 
 	private defaultPrivilege: string;
 
-	private redirecting: boolean = false;
+	private redirecting?: string;
 
 	constructor(url: string, defaultPrivilege: string = '*') {
 		super(url);
@@ -36,15 +36,28 @@ export class RestClientWithOAuth extends RestClient {
 		this.tokenManager = new LazyAsync<OAuthTokenManager>(() => this.getTokenManagerInternal());
 	}
 
+	isRedirecting(): boolean {
+		return StringUtil.isEmpty(this.redirecting);
+	}
+
+	redirectingTo(): string {
+		return StringUtil.getNonEmpty(this.redirecting);
+	}
+
+	redirectTo(url: string) {
+		console.log(`Redirecting to ${url}`);
+		this.redirecting = url;
+		document.location.href = url;
+	}
+
 	initializeIdToken(): Promise<any> {
 		const urlToken = this.getIdTokenFromUrl();
 		if (urlToken !== null) {
-			return this.setIdTokenRaw(urlToken)
-				.then(() => {
-					console.log("Redirecting to url without id token");
-					this.redirecting = true;
-					document.location.href = this.deleteIdTokenFromUrl();
-				});
+			return this
+				.setIdTokenRaw(urlToken)
+				.then(
+					() => this.redirectTo(this.deleteIdTokenFromUrl())
+				);
 		} else {
 			const storageToken = this.getIdTokenFromLocalStorage();
 			if (storageToken) return this.setIdToken(storageToken);
@@ -52,6 +65,22 @@ export class RestClientWithOAuth extends RestClient {
 		return Promise.reject("No valid ID token!");
 	}
 
+	/**
+	 * Attempt to get ID token from URL or storage, redirect to login page when not successful
+	 */
+	redirectToLogin(): Promise<any> {
+		if (this.redirecting) return Promise.reject("Already redirecting!");
+		return this.getServerInfo().then(
+			(si) => {
+				const location = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${this.deleteIdTokenFromUrl()}`;
+				this.redirectTo(location);
+			}
+		).catch((err) => {
+			console.error('Redirection failed: OAuth info not fetched:', err);
+			return Promise.reject(err);
+		});
+	}
+
 	/**
 	 * Attempt to get ID token from URL or storage, redirect to login page when not successful
 	 */
@@ -62,19 +91,8 @@ export class RestClientWithOAuth extends RestClient {
 			})
 			.catch(
 				(reason) => {
-					if (this.redirecting) return Promise.reject("Already redirecting!");
 					console.log('OAuth initialization failed:', reason);
-					return this.getServerInfo().then(
-						(si) => {
-							const location = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${this.deleteIdTokenFromUrl()}`;
-							console.log('Redirecting to login page:', location);
-							this.redirecting = true;
-							document.location.href = location;
-						}
-					).catch((err) => {
-						console.log('Cannot redirect: OAuth info not fetched:', reason);
-						return Promise.reject(err);
-					});
+					return this.redirectToLogin();
 				}
 			);
 	}
@@ -96,7 +114,7 @@ export class RestClientWithOAuth extends RestClient {
 	deleteIdTokenFromUrl(): string {
 		const url = new URL(document.location.toString());
 		url.searchParams.delete(this.tokenName);
-		return url.toString();
+		return StringUtil.trimTrailingSlashes(url.toString());
 	}
 
 	getIdTokenFromUrl(): string | null {

package/tests/index.test.ts

@@ -3,11 +3,19 @@ import {JsonUtil} from "../src/util/JsonUtil";
 import {RestClient} from "../src";
 
 describe('testing StringUtil', () => {
-	test('getNonEmpty', () => {
-		expect(StringUtil.getNonEmpty('test')).toBe('test');
-		expect(StringUtil.getNonEmpty('', 'test')).toBe('test');
-		expect(StringUtil.getNonEmpty('', null, undefined, 'test')).toBe('test');
-		expect(StringUtil.getNonEmpty('', 'test', undefined, 'test2')).toBe('test');
+	test('isEmpty', () => {
+		expect(StringUtil.isEmpty('test')).toBe(false);
+		expect(StringUtil.isEmpty('  ')).toBe(false);
+		expect(StringUtil.isEmpty('')).toBe(true);
+		expect(StringUtil.isEmpty(null)).toBe(true);
+		expect(StringUtil.isEmpty(undefined)).toBe(true);
+	});
+	test('isBlank', () => {
+		expect(StringUtil.isBlank('test')).toBe(false);
+		expect(StringUtil.isBlank('  ')).toBe(true);
+		expect(StringUtil.isBlank('')).toBe(true);
+		expect(StringUtil.isBlank(null)).toBe(true);
+		expect(StringUtil.isBlank(undefined)).toBe(true);
 	});
 	test('getNonEmpty', () => {
 		expect(StringUtil.getNonEmpty('test')).toBe('test');