zavadil-ts-common 1.2.21 → 1.2.22

package/src/oauth/OAuthTokenManager.ts

@@ -90,19 +90,17 @@ export class OAuthTokenManager {
 		this.eventManager.triggerEvent('id-token-changed', token);
 	}
 
-	verifyIdToken(token: string): Promise<boolean> {
+	verifyIdToken(token: string): Promise<any> {
 		return this.oAuthServer.verifyIdToken(token)
-			.then((t) => this.setIdToken(t))
-			.then(() => true)
+			.then((t) => this.setIdToken(t));
 	}
 
-	login(login: string, password: string): Promise<boolean> {
+	login(login: string, password: string): Promise<any> {
 		this.reset();
 		return this.oAuthServer.requestIdTokenFromLogin({login: login, password: password, targetAudience: this.audience})
 			.then(
 				(t) => {
 					this.setIdToken(t);
-					return true;
 				})
 	}
 

package/src/oauth/RestClientWithOAuth.ts

@@ -13,6 +13,8 @@ export type ServerOAuthInfoPayload = {
 
 export class RestClientWithOAuth extends RestClient {
 
+	private tokenName = 'token';
+
 	private insecureClient: RestClient;
 
 	private tokenManager: LazyAsync<OAuthTokenManager>;
@@ -32,41 +34,35 @@ export class RestClientWithOAuth extends RestClient {
 		this.tokenManager = new LazyAsync<OAuthTokenManager>(() => this.getTokenManagerInternal());
 	}
 
-	initializeIdToken(): Promise<boolean> {
+	initializeIdToken(): Promise<any> {
 		const urlToken = this.getIdTokenFromUrl();
 		if (urlToken !== null) {
-			return this.setIdTokenRaw(urlToken);
+			return this.setIdTokenRaw(urlToken)
+				.then(() => {
+					console.log("Redirecting to url without id token");
+					document.location = this.deleteIdTokenFromUrl();
+				});
 		} else {
 			const storageToken = this.getIdTokenFromLocalStorage();
 			if (storageToken) return this.setIdToken(storageToken);
 		}
-		return Promise.resolve(false);
+		return Promise.reject("No valid ID token!");
 	}
 
 	/**
 	 * Attempt to get ID token from URL or storage, redirect to login page when not successful
 	 */
-	initialize(): Promise<boolean> {
+	initialize(): Promise<any> {
 		return this.initializeIdToken()
-			.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(
+			.then(() => this.checkAccessToken())
+			.catch(
 				(reason) => {
 					console.log('OAuth initialization failed:', reason);
 					return this.getServerInfo().then(
 						(si) => {
 							const location = `${si.oauthServerUrl}/login?app_name=${si.targetAudience}&redirect_url=${document.location}`;
-							console.log('Redirecting:', location);
+							console.log('Redirecting to login page:', location);
 							document.location = location;
-							return Promise.resolve(false);
 						}
 					).catch((err) => {
 						console.log('Cannot redirect: OAuth info not fetched:', reason);
@@ -90,9 +86,15 @@ export class RestClientWithOAuth extends RestClient {
 		return this.defaultPrivilege;
 	}
 
+	deleteIdTokenFromUrl(): string {
+		const up = new URLSearchParams(document.location.search);
+		up.delete(this.tokenName);
+		return up.toString();
+	}
+
 	getIdTokenFromUrl(): string | null {
 		const up = new URLSearchParams(document.location.search);
-		return up.get('token');
+		return up.get(this.tokenName);
 	}
 
 	getIdTokenFromLocalStorage(): IdTokenPayload | null | undefined {
@@ -139,17 +141,16 @@ export class RestClientWithOAuth extends RestClient {
 		return this.tokenManager.get();
 	}
 
-	login(login: string, password: string): Promise<boolean> {
+	login(login: string, password: string): Promise<any> {
 		return this.getTokenManager().then((m) => m.login(login, password));
 	}
 
-	setIdToken(token: IdTokenPayload): Promise<boolean> {
+	setIdToken(token: IdTokenPayload): Promise<any> {
 		return this.getTokenManager()
-			.then((m) => m.setIdToken(token))
-			.then(() => true)
+			.then((m) => m.setIdToken(token));
 	}
 
-	setIdTokenRaw(token: string): Promise<boolean> {
+	setIdTokenRaw(token: string): Promise<any> {
 		return this.getTokenManager().then(m => m.verifyIdToken(token))
 	}