zavadil-ts-common 1.2.78 → 2.0.0

package/dist/oauth/OAuthRestClient.d.ts

@@ -3,13 +3,13 @@ export type TokenRequestPayloadBase = {
     targetAudience: string;
 };
 export type RequestAccessTokenPayload = TokenRequestPayloadBase & {
-    idToken: string;
+    refreshToken: string;
     privilege: string;
 };
-export type RequestIdTokenFromPrevTokenPayload = {
-    idToken: string;
+export type RenewRefreshTokenPayload = {
+    refreshToken: string;
 };
-export type RequestIdTokenFromLoginPayload = TokenRequestPayloadBase & {
+export type RequestRefreshTokenFromLoginPayload = TokenRequestPayloadBase & {
     login: string;
     password: string;
 };
@@ -20,6 +20,7 @@ export type TokenResponsePayloadBase = {
 };
 export type IdTokenPayload = TokenResponsePayloadBase & {};
 export type AccessTokenPayload = TokenResponsePayloadBase & {};
+export type RefreshTokenPayload = TokenResponsePayloadBase & {};
 export type JwKeyPayload = {
     kty: string;
     kid: string;
@@ -36,8 +37,10 @@ export type JwksPayload = {
 export declare class OAuthRestClient extends RestClient {
     constructor(oauthUrl: string);
     jwks(): Promise<JwksPayload>;
+    verifyRefreshToken(refreshToken: string): Promise<RefreshTokenPayload>;
+    verifyAccessToken(accessToken: string): Promise<AccessTokenPayload>;
     verifyIdToken(idToken: string): Promise<IdTokenPayload>;
-    requestIdTokenFromLogin(request: RequestIdTokenFromLoginPayload): Promise<IdTokenPayload>;
-    refreshIdToken(request: RequestIdTokenFromPrevTokenPayload): Promise<IdTokenPayload>;
+    requestRefreshTokenFromLogin(request: RequestRefreshTokenFromLoginPayload): Promise<RefreshTokenPayload>;
+    renewRefreshToken(request: RenewRefreshTokenPayload): Promise<RefreshTokenPayload>;
     requestAccessToken(request: RequestAccessTokenPayload): Promise<AccessTokenPayload>;
 }

package/dist/oauth/OAuthTokenManager.d.ts

@@ -1,28 +1,28 @@
-import { AccessTokenPayload, IdTokenPayload, OAuthRestClient } from "./OAuthRestClient";
-import { OAuthIdTokenProvider } from "./tokenprovider/OAuthIdTokenProvider";
+import { AccessTokenPayload, IdTokenPayload, OAuthRestClient, RefreshTokenPayload } from "./OAuthRestClient";
+import { OAuthRefreshTokenProvider } from "./tokenprovider/OAuthRefreshTokenProvider";
 /**
  * Manages refresh of id and access tokens.
  */
-export declare class OAuthTokenManager implements OAuthIdTokenProvider {
+export declare class OAuthTokenManager implements OAuthRefreshTokenProvider {
     oAuthServer: OAuthRestClient;
     audience: string;
-    idToken?: IdTokenPayload;
-    freshIdTokenProvider: OAuthIdTokenProvider;
+    refreshToken?: RefreshTokenPayload;
+    initialRefreshTokenProvider: OAuthRefreshTokenProvider;
     accessTokens: Map<string, AccessTokenPayload>;
-    constructor(oAuthServerBaseUrl: string, targetAudience: string, freshIdTokenProvider: OAuthIdTokenProvider);
-    hasValidIdToken(): boolean;
+    constructor(oAuthServerBaseUrl: string, targetAudience: string, initialRefreshTokenProvider: OAuthRefreshTokenProvider);
+    hasValidRefreshToken(): boolean;
     hasValidAccessToken(privilege: string): boolean;
     reset(): Promise<any>;
     /**
      * Get stored id token or ask the provider, this will trigger redirect to login screen in case of the default provider
      */
-    getIdTokenInternal(): Promise<IdTokenPayload>;
+    getRefreshTokenInternal(): Promise<RefreshTokenPayload>;
     /**
      * Get id token, refresh it if needed
      */
-    getIdToken(): Promise<IdTokenPayload>;
-    getIdTokenRaw(): Promise<string>;
-    setIdToken(token?: IdTokenPayload): void;
+    getRefreshToken(): Promise<IdTokenPayload>;
+    getRefreshTokenRaw(): Promise<string>;
+    setRefreshToken(token?: IdTokenPayload): void;
     verifyIdToken(token: string): Promise<IdTokenPayload>;
     login(login: string, password: string): Promise<any>;
     private getAccessTokenInternal;

package/dist/oauth/RestClientWithOAuth.d.ts

@@ -1,21 +1,21 @@
 import { OAuthTokenManager } from "./OAuthTokenManager";
 import { RestClient } from "../client";
 import { IdTokenPayload } from "./OAuthRestClient";
-import { OAuthIdTokenProvider } from "./tokenprovider/OAuthIdTokenProvider";
+import { OAuthRefreshTokenProvider } from "./tokenprovider/OAuthRefreshTokenProvider";
 export type ServerOAuthInfoPayload = {
     debugMode?: boolean;
     targetAudience: string;
     oauthServerUrl: string;
     version: string;
 };
-export declare class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvider {
+export declare class RestClientWithOAuth extends RestClient implements OAuthRefreshTokenProvider {
     private insecureClient;
     private freshIdTokenProvider;
     private tokenManager;
     private serverInfo;
     private defaultPrivilege;
-    constructor(url: string, freshIdTokenProvider?: OAuthIdTokenProvider, defaultPrivilege?: string);
-    getIdToken(): Promise<IdTokenPayload>;
+    constructor(url: string, freshIdTokenProvider?: OAuthRefreshTokenProvider, defaultPrivilege?: string);
+    getRefreshToken(): Promise<IdTokenPayload>;
     /**
      * Attempt to get ID token from token manager
      */

package/dist/oauth/tokenprovider/OAuthRefreshTokenProvider.d.ts

@@ -0,0 +1,5 @@
+import { RefreshTokenPayload } from "../OAuthRestClient";
+export interface OAuthRefreshTokenProvider {
+    getRefreshToken(): Promise<RefreshTokenPayload>;
+    reset(): Promise<any>;
+}

package/dist/oauth/tokenprovider/RefreshTokenProviderDefault.d.ts

@@ -0,0 +1,14 @@
+import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
+import { IdTokenPayload } from "../OAuthRestClient";
+import { RefreshTokenProviderLogin } from "./RefreshTokenProviderLogin";
+import { RestClientWithOAuth } from "../RestClientWithOAuth";
+import { RefreshTokenProviderUrl } from "./RefreshTokenProviderUrl";
+import { RefreshTokenProviderStorage } from "./RefreshTokenProviderStorage";
+export declare class RefreshTokenProviderDefault implements OAuthRefreshTokenProvider {
+    login: RefreshTokenProviderLogin;
+    url: RefreshTokenProviderUrl;
+    storage: RefreshTokenProviderStorage;
+    constructor(client: RestClientWithOAuth, tokenStorageKey?: string, tokenUrlName?: string);
+    getRefreshToken(): Promise<IdTokenPayload>;
+    reset(): Promise<any>;
+}

package/dist/oauth/tokenprovider/RefreshTokenProviderLogin.d.ts

@@ -0,0 +1,12 @@
+import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
+import { IdTokenPayload } from "../OAuthRestClient";
+import { RedirectionProvider } from "./RedirectionProvider";
+import { RestClientWithOAuth } from "../RestClientWithOAuth";
+export declare class RefreshTokenProviderLogin extends RedirectionProvider implements OAuthRefreshTokenProvider {
+    client: RestClientWithOAuth;
+    tokenQueryName: string;
+    constructor(client: RestClientWithOAuth, tokenQueryName?: string);
+    redirectToLogin(): Promise<any>;
+    getRefreshToken(): Promise<IdTokenPayload>;
+    reset(): Promise<any>;
+}

package/dist/oauth/tokenprovider/RefreshTokenProviderStorage.d.ts

@@ -0,0 +1,10 @@
+import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
+import { RefreshTokenPayload } from "../OAuthRestClient";
+export declare class RefreshTokenProviderStorage implements OAuthRefreshTokenProvider {
+    key: string;
+    constructor(storageKey?: string);
+    saveRefreshTokenToLocalStorage(token: RefreshTokenPayload | null): void;
+    getRefreshTokenFromLocalStorage(): RefreshTokenPayload | null | undefined;
+    getRefreshToken(): Promise<RefreshTokenPayload>;
+    reset(): Promise<any>;
+}

package/dist/oauth/tokenprovider/RefreshTokenProviderUrl.d.ts

@@ -0,0 +1,12 @@
+import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
+import { RefreshTokenPayload } from "../OAuthRestClient";
+import { RestClientWithOAuth } from "../RestClientWithOAuth";
+import { RedirectionProvider } from "./RedirectionProvider";
+export declare class RefreshTokenProviderUrl extends RedirectionProvider implements OAuthRefreshTokenProvider {
+    client: RestClientWithOAuth;
+    tokenQueryName: string;
+    constructor(client: RestClientWithOAuth, tokenQueryName?: string);
+    getRefreshTokenFromUrl(): string | null;
+    getRefreshToken(): Promise<RefreshTokenPayload>;
+    reset(): Promise<any>;
+}

package/dist/util/NumberUtil.d.ts

@@ -1,5 +1,5 @@
-import { ObjectUtil } from "./ObjectUtil";
-export declare class NumberUtil extends ObjectUtil {
+export declare class NumberUtil {
+    static isEmpty(n: any): n is null | undefined;
     static notEmpty(n?: number | null): n is number;
     static parseNumber(str: string | null | undefined): number | null;
     static round(n: number, d?: number): number;

package/dist/util/ObjectUtil.d.ts

@@ -1,6 +1,6 @@
 export declare class ObjectUtil {
     static isEmpty(obj: any): obj is null | undefined;
-    static notEmpty(obj: any): boolean;
+    static notEmpty(obj: any): obj is object;
     static clone<T>(obj: T): T;
     static getNestedValue(obj: any, path: string): string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zavadil-ts-common",
-	"version": "1.2.78",
+	"version": "2.0.0",
 	"description": "Common types and components for Typescript UI apps.",
 	"main": "dist/index.js",
 	"module": "dist/index.esm.js",

package/src/oauth/OAuthRestClient.ts

@@ -6,15 +6,15 @@ export type TokenRequestPayloadBase = {
 }
 
 export type RequestAccessTokenPayload = TokenRequestPayloadBase & {
-	idToken: string;
+	refreshToken: string;
 	privilege: string;
 }
 
-export type RequestIdTokenFromPrevTokenPayload = {
-	idToken: string;
+export type RenewRefreshTokenPayload = {
+	refreshToken: string;
 }
 
-export type RequestIdTokenFromLoginPayload = TokenRequestPayloadBase & {
+export type RequestRefreshTokenFromLoginPayload = TokenRequestPayloadBase & {
 	login: string;
 	password: string;
 }
@@ -31,6 +31,9 @@ export type IdTokenPayload = TokenResponsePayloadBase & {
 export type AccessTokenPayload = TokenResponsePayloadBase & {
 }
 
+export type RefreshTokenPayload = TokenResponsePayloadBase & {
+}
+
 export type JwKeyPayload = {
 	kty: string;
 	kid: string;
@@ -56,20 +59,28 @@ export class OAuthRestClient extends RestClient {
 		return this.getJson('jwks.json');
 	}
 
+	verifyRefreshToken(refreshToken: string): Promise<RefreshTokenPayload> {
+		return this.getJson(`refresh-tokens/verify/${refreshToken}`);
+	}
+
+	verifyAccessToken(accessToken: string): Promise<AccessTokenPayload> {
+		return this.getJson(`access-tokens/verify/${accessToken}`);
+	}
+
 	verifyIdToken(idToken: string): Promise<IdTokenPayload> {
 		return this.getJson(`id-tokens/verify/${idToken}`);
 	}
 
-	requestIdTokenFromLogin(request: RequestIdTokenFromLoginPayload): Promise<IdTokenPayload> {
-		return this.postJson('id-tokens/from-login', request);
+	requestRefreshTokenFromLogin(request: RequestRefreshTokenFromLoginPayload): Promise<RefreshTokenPayload> {
+		return this.postJson('refresh-tokens/from-login', request);
 	}
 
-	refreshIdToken(request: RequestIdTokenFromPrevTokenPayload): Promise<IdTokenPayload> {
-		return this.postJson('id-tokens/refresh', request);
+	renewRefreshToken(request: RenewRefreshTokenPayload): Promise<RefreshTokenPayload> {
+		return this.postJson('refresh-tokens/renew', request);
 	}
 
 	requestAccessToken(request: RequestAccessTokenPayload): Promise<AccessTokenPayload> {
-		return this.postJson('access-tokens/from-id-token', request);
+		return this.postJson('access-tokens/from-refresh-token', request);
 	}
 
 }

package/src/oauth/OAuthTokenManager.ts

@@ -1,31 +1,31 @@
-import {AccessTokenPayload, IdTokenPayload, OAuthRestClient} from "./OAuthRestClient";
-import {OAuthIdTokenProvider} from "./tokenprovider/OAuthIdTokenProvider";
+import {AccessTokenPayload, IdTokenPayload, OAuthRestClient, RefreshTokenPayload} from "./OAuthRestClient";
+import {OAuthRefreshTokenProvider} from "./tokenprovider/OAuthRefreshTokenProvider";
 import {OAuthUtil} from "../util/OAuthUtil";
 
 /**
  * Manages refresh of id and access tokens.
  */
-export class OAuthTokenManager implements OAuthIdTokenProvider {
+export class OAuthTokenManager implements OAuthRefreshTokenProvider {
 
 	oAuthServer: OAuthRestClient;
 
 	audience: string;
 
-	idToken?: IdTokenPayload;
+	refreshToken?: RefreshTokenPayload;
 
-	freshIdTokenProvider: OAuthIdTokenProvider;
+	initialRefreshTokenProvider: OAuthRefreshTokenProvider;
 
 	accessTokens: Map<string, AccessTokenPayload>;
 
-	constructor(oAuthServerBaseUrl: string, targetAudience: string, freshIdTokenProvider: OAuthIdTokenProvider) {
-		this.freshIdTokenProvider = freshIdTokenProvider;
+	constructor(oAuthServerBaseUrl: string, targetAudience: string, initialRefreshTokenProvider: OAuthRefreshTokenProvider) {
+		this.initialRefreshTokenProvider = initialRefreshTokenProvider;
 		this.audience = targetAudience;
 		this.oAuthServer = new OAuthRestClient(oAuthServerBaseUrl);
 		this.accessTokens = new Map<string, AccessTokenPayload>();
 	}
 
-	hasValidIdToken(): boolean {
-		return OAuthUtil.isValidToken(this.idToken);
+	hasValidRefreshToken(): boolean {
+		return OAuthUtil.isValidToken(this.refreshToken);
 	}
 
 	hasValidAccessToken(privilege: string): boolean {
@@ -33,26 +33,26 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 	}
 
 	reset(): Promise<any> {
-		this.idToken = undefined;
+		this.refreshToken = undefined;
 		this.accessTokens.clear();
-		return this.freshIdTokenProvider.reset();
+		return this.initialRefreshTokenProvider.reset();
 	}
 
 	/**
 	 * Get stored id token or ask the provider, this will trigger redirect to login screen in case of the default provider
 	 */
-	getIdTokenInternal(): Promise<IdTokenPayload> {
-		if (this.idToken === undefined || !this.hasValidIdToken()) {
-			return this.freshIdTokenProvider.getIdToken();
+	getRefreshTokenInternal(): Promise<RefreshTokenPayload> {
+		if (this.hasValidRefreshToken() && this.refreshToken !== undefined) {
+			return Promise.resolve(this.refreshToken);
 		}
-		return Promise.resolve(this.idToken);
+		return this.initialRefreshTokenProvider.getRefreshToken();
 	}
 
 	/**
 	 * Get id token, refresh it if needed
 	 */
-	getIdToken(): Promise<IdTokenPayload> {
-		return this.getIdTokenInternal()
+	getRefreshToken(): Promise<IdTokenPayload> {
+		return this.getRefreshTokenInternal()
 			.then(
 				(t: IdTokenPayload) => {
 					if (!OAuthUtil.isValidToken(t)) {
@@ -61,26 +61,26 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 					}
 					if (OAuthUtil.isTokenReadyForRefresh(t)) {
 						return this.oAuthServer
-							.refreshIdToken({idToken: t.token})
+							.renewRefreshToken({refreshToken: t.token})
 							.then(
 								(t) => {
-									this.setIdToken(t);
+									this.setRefreshToken(t);
 									return t;
 								}
 							);
 					}
-					this.setIdToken(t);
+					this.setRefreshToken(t);
 					return Promise.resolve(t);
 				}
 			);
 	}
 
-	getIdTokenRaw(): Promise<string> {
-		return this.getIdToken().then(t => t.token);
+	getRefreshTokenRaw(): Promise<string> {
+		return this.getRefreshToken().then(t => t.token);
 	}
 
-	setIdToken(token?: IdTokenPayload) {
-		this.idToken = token;
+	setRefreshToken(token?: IdTokenPayload) {
+		this.refreshToken = token;
 	}
 
 	verifyIdToken(token: string): Promise<IdTokenPayload> {
@@ -90,15 +90,15 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 	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));
+			.requestRefreshTokenFromLogin({login: login, password: password, targetAudience: this.audience})
+			.then((t) => this.setRefreshToken(t));
 	}
 
 	private getAccessTokenInternal(privilege: string): Promise<AccessTokenPayload> {
-		return this.getIdTokenRaw()
+		return this.getRefreshTokenRaw()
 			.then(
-				(idToken: string) => this.oAuthServer
-					.requestAccessToken({idToken: idToken, targetAudience: this.audience, privilege: privilege})
+				(refreshToken: string) => this.oAuthServer
+					.requestAccessToken({refreshToken: refreshToken, targetAudience: this.audience, privilege: privilege})
 					.then((act: AccessTokenPayload) => {
 						if (!OAuthUtil.isValidToken(act)) {
 							return Promise.reject("Received access token is not valid!");

package/src/oauth/RestClientWithOAuth.ts

@@ -2,8 +2,8 @@ import {OAuthTokenManager} from "./OAuthTokenManager";
 import {RestClient} from "../client";
 import {IdTokenPayload, TokenResponsePayloadBase} from "./OAuthRestClient";
 import {LazyAsync} from "../cache";
-import {OAuthIdTokenProvider} from "./tokenprovider/OAuthIdTokenProvider";
-import {IdTokenProviderDefault} from "./tokenprovider/IdTokenProviderDefault";
+import {OAuthRefreshTokenProvider} from "./tokenprovider/OAuthRefreshTokenProvider";
+import {RefreshTokenProviderDefault} from "./tokenprovider/RefreshTokenProviderDefault";
 
 export type ServerOAuthInfoPayload = {
 	debugMode?: boolean;
@@ -12,11 +12,11 @@ export type ServerOAuthInfoPayload = {
 	version: string;
 }
 
-export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvider {
+export class RestClientWithOAuth extends RestClient implements OAuthRefreshTokenProvider {
 
 	private insecureClient: RestClient;
 
-	private freshIdTokenProvider: OAuthIdTokenProvider;
+	private freshIdTokenProvider: OAuthRefreshTokenProvider;
 
 	private tokenManager: LazyAsync<OAuthTokenManager>;
 
@@ -24,10 +24,10 @@ export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvi
 
 	private defaultPrivilege: string;
 
-	constructor(url: string, freshIdTokenProvider?: OAuthIdTokenProvider, defaultPrivilege: string = '*') {
+	constructor(url: string, freshIdTokenProvider?: OAuthRefreshTokenProvider, defaultPrivilege: string = '*') {
 		super(url);
 
-		this.freshIdTokenProvider = freshIdTokenProvider || new IdTokenProviderDefault(this);
+		this.freshIdTokenProvider = freshIdTokenProvider || new RefreshTokenProviderDefault(this);
 		this.defaultPrivilege = defaultPrivilege;
 
 		// rest client without OAuth headers
@@ -37,15 +37,15 @@ export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvi
 		this.tokenManager = new LazyAsync<OAuthTokenManager>(() => this.getTokenManagerInternal());
 	}
 
-	getIdToken(): Promise<IdTokenPayload> {
-        return this.getTokenManager().then(t => t.getIdToken());
+	getRefreshToken(): Promise<IdTokenPayload> {
+        return this.getTokenManager().then(t => t.getRefreshToken());
     }
 
 	/**
 	 * Attempt to get ID token from token manager
 	 */
 	initialize(): Promise<any> {
-		return this.getIdToken();
+		return this.getRefreshToken();
 	}
 
 	logout(): Promise<any> {
@@ -75,7 +75,7 @@ export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvi
 	protected getTokenManagerInternal(): Promise<OAuthTokenManager> {
 		return this
 			.getServerInfo()
-			.then((info) =>  new OAuthTokenManager(info.oauthServerUrl, info.targetAudience, this.freshIdTokenProvider));
+			.then((info) => new OAuthTokenManager(info.oauthServerUrl, info.targetAudience, this.freshIdTokenProvider));
 	}
 
 	getTokenManager(): Promise<OAuthTokenManager> {
@@ -88,7 +88,7 @@ export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvi
 
 	setIdToken(token: IdTokenPayload): Promise<any> {
 		return this.getTokenManager()
-			.then((m) => m.setIdToken(token));
+			.then((m) => m.setRefreshToken(token));
 	}
 
 	getHeaders(endpoint: string): Promise<Headers> {

package/src/oauth/tokenprovider/OAuthRefreshTokenProvider.ts

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

package/src/oauth/tokenprovider/RefreshTokenProviderDefault.ts

@@ -0,0 +1,52 @@
+import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
+import {IdTokenPayload} from "../OAuthRestClient";
+import {RefreshTokenProviderLogin} from "./RefreshTokenProviderLogin";
+import {RestClientWithOAuth} from "../RestClientWithOAuth";
+import {RefreshTokenProviderUrl} from "./RefreshTokenProviderUrl";
+import {RefreshTokenProviderStorage} from "./RefreshTokenProviderStorage";
+
+export class RefreshTokenProviderDefault implements OAuthRefreshTokenProvider {
+
+	login: RefreshTokenProviderLogin;
+
+	url: RefreshTokenProviderUrl;
+
+	storage: RefreshTokenProviderStorage;
+
+	constructor(client: RestClientWithOAuth, tokenStorageKey?: string, tokenUrlName?: string) {
+		this.login = new RefreshTokenProviderLogin(client, tokenUrlName);
+		this.url = new RefreshTokenProviderUrl(client, tokenUrlName);
+		this.storage = new RefreshTokenProviderStorage(tokenStorageKey);
+	}
+
+	getRefreshToken(): Promise<IdTokenPayload> {
+		return this.url
+			.getRefreshToken()
+			.catch(
+				(err) => {
+					console.log("No token in url, loading from storage:", err);
+					return this.storage
+						.getRefreshToken()
+						.catch(
+							(err) => {
+								console.log("No token in storage, redirecting to login page:", err);
+								return this.login.getRefreshToken();
+							}
+						);
+				}
+			)
+			.then(
+				(t) => {
+					console.log("Token found, saving to storage...");
+					this.storage.saveRefreshTokenToLocalStorage(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/{IdTokenProviderLogin.ts → RefreshTokenProviderLogin.ts}

@@ -1,10 +1,10 @@
-import {OAuthIdTokenProvider} from "./OAuthIdTokenProvider";
+import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
 import {IdTokenPayload} from "../OAuthRestClient";
 import {RedirectionProvider} from "./RedirectionProvider";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
 import {UrlUtil} from "../../util";
 
-export class IdTokenProviderLogin extends RedirectionProvider implements OAuthIdTokenProvider {
+export class RefreshTokenProviderLogin extends RedirectionProvider implements OAuthRefreshTokenProvider {
 
 	client: RestClientWithOAuth;
 
@@ -29,7 +29,7 @@ export class IdTokenProviderLogin extends RedirectionProvider implements OAuthId
 		});
 	}
 
-	getIdToken(): Promise<IdTokenPayload> {
+	getRefreshToken(): Promise<IdTokenPayload> {
         return this.redirectToLogin();
     }
 

package/src/oauth/tokenprovider/{IdTokenProviderStorage.ts → RefreshTokenProviderStorage.ts}

@@ -1,17 +1,17 @@
-import {OAuthIdTokenProvider} from "./OAuthIdTokenProvider";
-import {IdTokenPayload} from "../OAuthRestClient";
+import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
+import {RefreshTokenPayload} from "../OAuthRestClient";
 import {JsonUtil} from "../../util";
 import {OAuthUtil} from "../../util/OAuthUtil";
 
-export class IdTokenProviderStorage implements OAuthIdTokenProvider {
+export class RefreshTokenProviderStorage implements OAuthRefreshTokenProvider {
 
 	key: string;
 
 	constructor(storageKey?: string) {
-		this.key = storageKey || 'id-token';
+		this.key = storageKey || 'refresh-token';
 	}
 
-	saveIdTokenToLocalStorage(token: IdTokenPayload | null) {
+	saveRefreshTokenToLocalStorage(token: RefreshTokenPayload | null) {
 		const raw = token ? JSON.stringify(token) : null;
 		if (raw === null) {
 			localStorage.removeItem(this.key);
@@ -20,18 +20,18 @@ export class IdTokenProviderStorage implements OAuthIdTokenProvider {
 		localStorage.setItem(this.key, raw);
 	}
 
-	getIdTokenFromLocalStorage(): IdTokenPayload | null | undefined {
+	getRefreshTokenFromLocalStorage(): RefreshTokenPayload | null | undefined {
 		return JsonUtil.parse(localStorage.getItem(this.key));
 	}
 
-	getIdToken(): Promise<IdTokenPayload> {
-        const token = this.getIdTokenFromLocalStorage();
+	getRefreshToken(): Promise<RefreshTokenPayload> {
+        const token = this.getRefreshTokenFromLocalStorage();
 		if (token && OAuthUtil.isValidToken(token)) return Promise.resolve(token);
 		return Promise.reject("No valid token found in storage!");
     }
 
 	reset(): Promise<any> {
-		this.saveIdTokenToLocalStorage(null);
+		this.saveRefreshTokenToLocalStorage(null);
 		return Promise.resolve();
 	}
 }

package/src/oauth/tokenprovider/{IdTokenProviderUrl.ts → RefreshTokenProviderUrl.ts}

@@ -1,11 +1,11 @@
-import {OAuthIdTokenProvider} from "./OAuthIdTokenProvider";
-import {IdTokenPayload} from "../OAuthRestClient";
+import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
+import {RefreshTokenPayload} from "../OAuthRestClient";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
 import {StringUtil} from "../../util";
 import {UrlUtil} from "../../util";
 import {RedirectionProvider} from "./RedirectionProvider";
 
-export class IdTokenProviderUrl extends RedirectionProvider implements OAuthIdTokenProvider {
+export class RefreshTokenProviderUrl extends RedirectionProvider implements OAuthRefreshTokenProvider {
 
 	client: RestClientWithOAuth;
 
@@ -17,12 +17,12 @@ export class IdTokenProviderUrl extends RedirectionProvider implements OAuthIdTo
 		this.tokenQueryName = tokenQueryName || 'token';
 	}
 
-	getIdTokenFromUrl(): string | null {
+	getRefreshTokenFromUrl(): string | null {
 		return UrlUtil.extractParamFromUrl(document.location.toString(), this.tokenQueryName);
 	}
 
-	getIdToken(): Promise<IdTokenPayload> {
-		const raw = this.getIdTokenFromUrl();
+	getRefreshToken(): Promise<RefreshTokenPayload> {
+		const raw = this.getRefreshTokenFromUrl();
 		if (raw === null || StringUtil.isBlank(raw)) return Promise.reject("No token in URL!");
 		return this.client
 			.getTokenManager()
@@ -30,7 +30,7 @@ export class IdTokenProviderUrl extends RedirectionProvider implements OAuthIdTo
     }
 
 	reset(): Promise<any> {
-		const raw = this.getIdTokenFromUrl();
+		const raw = this.getRefreshTokenFromUrl();
 		if (raw === null || StringUtil.isBlank(raw)) return Promise.resolve();
 		console.log("Token in URL, redirecting...");
 		const thisUrl = UrlUtil.deleteParamFromUrl(document.location.toString(), this.tokenQueryName);

package/src/util/NumberUtil.ts

@@ -1,6 +1,10 @@
 import { ObjectUtil } from "./ObjectUtil";
 
-export class NumberUtil extends ObjectUtil {
+export class NumberUtil {
+
+	static isEmpty(n: any): n is null | undefined {
+		return n === undefined || n === null || Number.isNaN(n);
+	}
 
 	static notEmpty(n?: number | null): n is number {
 		return !ObjectUtil.isEmpty(n);