zavadil-ts-common 1.2.44 → 1.2.46

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

@@ -6,9 +6,7 @@ export declare class IdTokenProviderLogin extends RedirectionProvider implements
     client: RestClientWithOAuth;
     tokenQueryName: string;
     constructor(client: RestClientWithOAuth, tokenQueryName?: string);
-    /**
-     * Attempt to get ID token from URL or storage, redirect to login page when not successful
-     */
     redirectToLogin(): Promise<any>;
     getIdToken(): Promise<IdTokenPayload>;
+    reset(): Promise<any>;
 }

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

@@ -6,4 +6,5 @@ export declare class IdTokenProviderStorage implements OAuthIdTokenProvider {
     saveIdTokenToLocalStorage(token: IdTokenPayload | null): void;
     getIdTokenFromLocalStorage(): IdTokenPayload | null | undefined;
     getIdToken(): Promise<IdTokenPayload>;
+    reset(): Promise<any>;
 }

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

@@ -1,10 +1,12 @@
 import { OAuthIdTokenProvider } from "./OAuthIdTokenProvider";
 import { IdTokenPayload } from "../OAuthRestClient";
 import { RestClientWithOAuth } from "../RestClientWithOAuth";
-export declare class IdTokenProviderUrl implements OAuthIdTokenProvider {
+import { RedirectionProvider } from "./RedirectionProvider";
+export declare class IdTokenProviderUrl extends RedirectionProvider implements OAuthIdTokenProvider {
     client: RestClientWithOAuth;
     tokenQueryName: string;
     constructor(client: RestClientWithOAuth, tokenQueryName?: string);
     getIdTokenFromUrl(): string | null;
     getIdToken(): Promise<IdTokenPayload>;
+    reset(): Promise<any>;
 }

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

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

package/dist/type/Entity.d.ts

@@ -1,5 +1,5 @@
 export type EntityBase = {
-    id: number | null;
+    id?: number | null;
     createdOn?: Date;
     lastUpdatedOn?: Date;
 };

package/package.json

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

package/src/oauth/OAuthTokenManager.ts

@@ -32,9 +32,10 @@ export class OAuthTokenManager implements OAuthIdTokenProvider {
 		return OAuthUtil.isValidToken(this.accessTokens.get(privilege));
 	}
 
-	reset() {
+	reset(): Promise<any> {
 		this.idToken = undefined;
 		this.accessTokens.clear();
+		return this.freshIdTokenProvider.reset();
 	}
 
 	/**

package/src/oauth/RestClientWithOAuth.ts

@@ -49,9 +49,11 @@ export class RestClientWithOAuth extends RestClient implements OAuthIdTokenProvi
 	}
 
 	logout(): Promise<any> {
-		return this.getTokenManager()
-			.then((m) => m.reset())
-			.then(() => this.initialize());
+		return this.reset().then(() => this.initialize());
+	}
+
+	reset(): Promise<any> {
+		return this.getTokenManager().then((m) => m.reset());
 	}
 
 	/**

package/src/oauth/tokenprovider/IdTokenProviderDefault.ts

@@ -37,10 +37,15 @@ export class IdTokenProviderDefault implements OAuthIdTokenProvider {
 			)
 			.then(
 				(t) => {
+					console.log("Token in URL, saving to storage and redirecting");
 					this.storage.saveIdTokenToLocalStorage(t);
-					return t;
+					return this.url.reset();
 				}
 			);
     }
 
+	reset(): Promise<any> {
+		return this.storage.reset().then(() => this.url.reset());
+	}
+
 }

package/src/oauth/tokenprovider/IdTokenProviderLogin.ts

@@ -16,9 +16,6 @@ export class IdTokenProviderLogin extends RedirectionProvider implements OAuthId
 		this.tokenQueryName = tokenQueryName || 'token';
 	}
 
-	/**
-	 * Attempt to get ID token from URL or storage, redirect to login page when not successful
-	 */
 	redirectToLogin(): Promise<any> {
 		return this.client.getServerInfo().then(
 			(si) => {
@@ -36,4 +33,7 @@ export class IdTokenProviderLogin extends RedirectionProvider implements OAuthId
         return this.redirectToLogin();
     }
 
+	reset(): Promise<any> {
+		return Promise.resolve();
+	}
 }

package/src/oauth/tokenprovider/IdTokenProviderStorage.ts

@@ -8,7 +8,7 @@ export class IdTokenProviderStorage implements OAuthIdTokenProvider {
 	key: string;
 
 	constructor(storageKey?: string) {
-		this.key = storageKey || '';
+		this.key = storageKey || 'id-token';
 	}
 
 	saveIdTokenToLocalStorage(token: IdTokenPayload | null) {
@@ -30,4 +30,8 @@ export class IdTokenProviderStorage implements OAuthIdTokenProvider {
 		return Promise.reject("No valid token found in storage!");
     }
 
+	reset(): Promise<any> {
+		this.saveIdTokenToLocalStorage(null);
+		return Promise.resolve();
+	}
 }

package/src/oauth/tokenprovider/IdTokenProviderUrl.ts

@@ -3,14 +3,16 @@ import {IdTokenPayload} from "../OAuthRestClient";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
 import {StringUtil} from "../../util";
 import UrlUtil from "../../util/UrlUtil";
+import {RedirectionProvider} from "./RedirectionProvider";
 
-export class IdTokenProviderUrl implements OAuthIdTokenProvider {
+export class IdTokenProviderUrl extends RedirectionProvider implements OAuthIdTokenProvider {
 
 	client: RestClientWithOAuth;
 
 	tokenQueryName: string;
 
 	constructor(client: RestClientWithOAuth, tokenQueryName?: string) {
+		super();
 		this.client = client;
 		this.tokenQueryName = tokenQueryName || 'token';
 	}
@@ -27,4 +29,10 @@ export class IdTokenProviderUrl implements OAuthIdTokenProvider {
 			.then(m => m.verifyIdToken(raw));
     }
 
+	reset(): Promise<any> {
+		const raw = this.getIdTokenFromUrl();
+		if (raw === null || StringUtil.isBlank(raw)) return Promise.resolve();
+		const thisUrl = UrlUtil.deleteParamFromUrl(document.location.toString(), this.tokenQueryName);
+		return this.redirectTo(thisUrl);
+	}
 }

package/src/oauth/tokenprovider/OAuthIdTokenProvider.ts

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

package/src/type/Entity.ts

@@ -1,5 +1,5 @@
 export type EntityBase = {
-	id: number | null;
+	id?: number | null;
 	createdOn?: Date;
 	lastUpdatedOn?: Date;
 }