zavadil-ts-common 1.2.78 → 2.0.0

package/src/util/OAuthUtil.ts

@@ -1,10 +1,11 @@
 import {TokenResponsePayloadBase} from "../oauth";
 import {StringUtil} from "./StringUtil";
+import {ObjectUtil} from "./ObjectUtil";
 
 export class OAuthUtil {
 
 	static isValidToken(token?: TokenResponsePayloadBase | null): boolean {
-		return token !== undefined && token !== null && StringUtil.notBlank(token.token) && !OAuthUtil.isTokenExpired(token);
+		return ObjectUtil.notEmpty(token) && StringUtil.notBlank(token.token) && !OAuthUtil.isTokenExpired(token);
 	}
 
 	static isTokenExpired(token?: TokenResponsePayloadBase | null): boolean {

package/src/util/ObjectUtil.ts

@@ -4,7 +4,7 @@ export class ObjectUtil {
 		return obj === undefined || obj === null;
 	}
 
-	static notEmpty(obj: any) {
+	static notEmpty(obj: any): obj is object {
 		return !ObjectUtil.isEmpty(obj);
 	}
 

package/src/oauth/tokenprovider/IdTokenProviderDefault.ts

@@ -1,52 +0,0 @@
-import {OAuthIdTokenProvider} from "./OAuthIdTokenProvider";
-import {IdTokenPayload} from "../OAuthRestClient";
-import {IdTokenProviderLogin} from "./IdTokenProviderLogin";
-import {RestClientWithOAuth} from "../RestClientWithOAuth";
-import {IdTokenProviderUrl} from "./IdTokenProviderUrl";
-import {IdTokenProviderStorage} from "./IdTokenProviderStorage";
-
-export class IdTokenProviderDefault implements OAuthIdTokenProvider {
-
-	login: IdTokenProviderLogin;
-
-	url: IdTokenProviderUrl;
-
-	storage: IdTokenProviderStorage;
-
-	constructor(client: RestClientWithOAuth, tokenStorageKey?: string, tokenUrlName?: string) {
-		this.login = new IdTokenProviderLogin(client, tokenUrlName);
-		this.url = new IdTokenProviderUrl(client, tokenUrlName);
-		this.storage = new IdTokenProviderStorage(tokenStorageKey);
-	}
-
-	getIdToken(): Promise<IdTokenPayload> {
-		return this.url
-			.getIdToken()
-			.catch(
-				(err) => {
-					console.log("No token in url, loading from storage:", err);
-					return this.storage
-						.getIdToken()
-						.catch(
-							(err) => {
-								console.log("No token in storage, redirecting to login page:", err);
-								return this.login.getIdToken();
-							}
-						);
-				}
-			)
-			.then(
-				(t) => {
-					console.log("Token found, saving to storage...");
-					this.storage.saveIdTokenToLocalStorage(t);
-					// redirect if token is in url
-					return this.url.reset().then(() => t);
-				}
-			);
-    }
-
-	reset(): Promise<any> {
-		return this.storage.reset().then(() => this.url.reset());
-	}
-
-}

package/src/oauth/tokenprovider/OAuthIdTokenProvider.ts

@@ -1,6 +0,0 @@
-import {IdTokenPayload} from "../OAuthRestClient";
-
-export interface OAuthIdTokenProvider {
-	getIdToken(): Promise<IdTokenPayload>;
-	reset(): Promise<any>;
-}