zavadil-ts-common 2.2.0 → 2.2.1

package/dist/oauth/Types.d.ts

@@ -0,0 +1,35 @@
+export declare const PERMISSION_LEVELS: readonly ["read", "write", "admin"];
+export type PermissionLevel = (typeof PERMISSION_LEVELS)[number];
+export type TokenRequestPayloadBase = {
+    targetAudience: string;
+};
+export type RequestAccessTokenPayload = TokenRequestPayloadBase & {
+    refreshToken: string;
+    scope: string;
+};
+export type RenewRefreshTokenPayload = {
+    refreshToken: string;
+};
+export type RequestRefreshTokenFromLoginPayload = TokenRequestPayloadBase & {
+    login: string;
+    password: string;
+};
+export type TokenResponsePayloadBase = {
+    token: string;
+    issuedAt: Date;
+    expires?: Date | null;
+};
+export type IdTokenPayload = TokenResponsePayloadBase & {};
+export type AccessTokenPayload = TokenResponsePayloadBase & {
+    scopes?: Array<string>;
+};
+export type RefreshTokenPayload = TokenResponsePayloadBase & {};
+export type JwKeyPayload = {
+    kty: string;
+    kid: string;
+    n: string;
+    e: string;
+};
+export type JwksPayload = {
+    keys: Array<JwKeyPayload>;
+};

package/dist/oauth/index.d.ts

@@ -1,3 +1,5 @@
+export * from './Types';
+export * from './OAuthUtil';
 export * from "./tokenprovider";
 export * from "./OAuthRestClient";
 export * from "./OAuthTokenManager";

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

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

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

@@ -1,5 +1,5 @@
 import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
-import { IdTokenPayload } from "../OAuthRestClient";
+import { IdTokenPayload } from "../Types";
 import { RefreshTokenProviderLogin } from "./RefreshTokenProviderLogin";
 import { RestClientWithOAuth } from "../RestClientWithOAuth";
 import { RefreshTokenProviderUrl } from "./RefreshTokenProviderUrl";

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

@@ -1,5 +1,5 @@
 import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
-import { IdTokenPayload } from "../OAuthRestClient";
+import { IdTokenPayload } from "../Types";
 import { RedirectionProvider } from "./RedirectionProvider";
 import { RestClientWithOAuth } from "../RestClientWithOAuth";
 export declare class RefreshTokenProviderLogin extends RedirectionProvider implements OAuthRefreshTokenProvider {

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

@@ -1,5 +1,5 @@
 import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
-import { RefreshTokenPayload } from "../OAuthRestClient";
+import { RefreshTokenPayload } from "../Types";
 export declare class RefreshTokenProviderStorage implements OAuthRefreshTokenProvider {
     key: string;
     constructor(storageKey?: string);

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

@@ -1,5 +1,5 @@
 import { OAuthRefreshTokenProvider } from "./OAuthRefreshTokenProvider";
-import { RefreshTokenPayload } from "../OAuthRestClient";
+import { RefreshTokenPayload } from "../Types";
 import { RestClientWithOAuth } from "../RestClientWithOAuth";
 import { RedirectionProvider } from "./RedirectionProvider";
 export declare class RefreshTokenProviderUrl extends RedirectionProvider implements OAuthRefreshTokenProvider {

package/dist/util/index.d.ts

@@ -9,4 +9,3 @@ export { NumberUtil } from './NumberUtil';
 export { JsonUtil } from './JsonUtil';
 export { HashUtil } from './HashUtil';
 export { UrlUtil } from './UrlUtil';
-export { OAuthUtil } from './OAuthUtil';

package/package.json

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

package/src/oauth/OAuthRestClient.ts

@@ -1,52 +1,13 @@
 import { RestClient } from "../client";
 import { StringUtil } from "../util";
-
-export const PERMISSION_LEVELS = ["read", "write", "admin"] as const;
-
-export type PermissionLevel = (typeof PERMISSION_LEVELS)[number];
-
-export type TokenRequestPayloadBase = {
-  targetAudience: string;
-};
-
-export type RequestAccessTokenPayload = TokenRequestPayloadBase & {
-  refreshToken: string;
-  scope: string;
-};
-
-export type RenewRefreshTokenPayload = {
-  refreshToken: string;
-};
-
-export type RequestRefreshTokenFromLoginPayload = TokenRequestPayloadBase & {
-  login: string;
-  password: string;
-};
-
-export type TokenResponsePayloadBase = {
-  token: string;
-  issuedAt: Date;
-  expires?: Date | null;
-};
-
-export type IdTokenPayload = TokenResponsePayloadBase & {};
-
-export type AccessTokenPayload = TokenResponsePayloadBase & {
-  scopes?: Array<string>;
-};
-
-export type RefreshTokenPayload = TokenResponsePayloadBase & {};
-
-export type JwKeyPayload = {
-  kty: string;
-  kid: string;
-  n: string;
-  e: string;
-};
-
-export type JwksPayload = {
-  keys: Array<JwKeyPayload>;
-};
+import {
+	AccessTokenPayload,
+	IdTokenPayload,
+	JwksPayload,
+	RefreshTokenPayload,
+	RenewRefreshTokenPayload, RequestAccessTokenPayload,
+	RequestRefreshTokenFromLoginPayload
+} from "./Types";
 
 /**
  * This implements rest client for OAuth server - https://github.com/lotcz/oauth-server

package/src/oauth/OAuthTokenManager.ts

@@ -1,11 +1,11 @@
 import {
 	AccessTokenPayload,
 	IdTokenPayload,
-	OAuthRestClient,
 	RefreshTokenPayload,
-} from "./OAuthRestClient";
+} from "./Types";
 import {OAuthRefreshTokenProvider} from "./tokenprovider/OAuthRefreshTokenProvider";
-import {OAuthUtil} from "../util/OAuthUtil";
+import {OAuthUtil} from "./OAuthUtil";
+import {OAuthRestClient} from "./OAuthRestClient";
 
 /**
  * Manages refresh of id and access tokens.

package/src/{util → oauth}/OAuthUtil.ts

@@ -1,10 +1,5 @@
-import {
-  PermissionLevel,
-  PERMISSION_LEVELS,
-  TokenResponsePayloadBase,
-} from "../oauth";
-import { StringUtil } from "./StringUtil";
-import { ObjectUtil } from "./ObjectUtil";
+import { StringUtil, ObjectUtil } from "../util";
+import {PERMISSION_LEVELS, PermissionLevel, TokenResponsePayloadBase} from "./Types";
 
 export class OAuthUtil {
   static isValidToken(token?: TokenResponsePayloadBase | null): boolean {

package/src/oauth/RestClientWithOAuth.ts

@@ -1,9 +1,9 @@
 import { OAuthTokenManager } from "./OAuthTokenManager";
 import { RestClient } from "../client";
-import { IdTokenPayload, RefreshTokenPayload } from "./OAuthRestClient";
 import { LazyAsync } from "../cache";
 import { OAuthRefreshTokenProvider } from "./tokenprovider/OAuthRefreshTokenProvider";
 import { RefreshTokenProviderDefault } from "./tokenprovider/RefreshTokenProviderDefault";
+import {IdTokenPayload, RefreshTokenPayload} from "./Types";
 
 export type ServerOAuthInfoPayload = {
   debugMode?: boolean;

package/src/oauth/Types.ts

@@ -0,0 +1,47 @@
+
+export const PERMISSION_LEVELS = ["read", "write", "admin"] as const;
+
+export type PermissionLevel = (typeof PERMISSION_LEVELS)[number];
+
+export type TokenRequestPayloadBase = {
+	targetAudience: string;
+};
+
+export type RequestAccessTokenPayload = TokenRequestPayloadBase & {
+	refreshToken: string;
+	scope: string;
+};
+
+export type RenewRefreshTokenPayload = {
+	refreshToken: string;
+};
+
+export type RequestRefreshTokenFromLoginPayload = TokenRequestPayloadBase & {
+	login: string;
+	password: string;
+};
+
+export type TokenResponsePayloadBase = {
+	token: string;
+	issuedAt: Date;
+	expires?: Date | null;
+};
+
+export type IdTokenPayload = TokenResponsePayloadBase & {};
+
+export type AccessTokenPayload = TokenResponsePayloadBase & {
+	scopes?: Array<string>;
+};
+
+export type RefreshTokenPayload = TokenResponsePayloadBase & {};
+
+export type JwKeyPayload = {
+	kty: string;
+	kid: string;
+	n: string;
+	e: string;
+};
+
+export type JwksPayload = {
+	keys: Array<JwKeyPayload>;
+};

package/src/oauth/index.ts

@@ -1,3 +1,5 @@
+export * from './Types';
+export * from './OAuthUtil';
 export * from "./tokenprovider";
 export * from "./OAuthRestClient";
 export * from "./OAuthTokenManager";

package/src/oauth/tokenprovider/OAuthRefreshTokenProvider.ts

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

package/src/oauth/tokenprovider/RefreshTokenProviderDefault.ts

@@ -1,5 +1,5 @@
 import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
-import {IdTokenPayload} from "../OAuthRestClient";
+import {IdTokenPayload} from "../Types";
 import {RefreshTokenProviderLogin} from "./RefreshTokenProviderLogin";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
 import {RefreshTokenProviderUrl} from "./RefreshTokenProviderUrl";

package/src/oauth/tokenprovider/RefreshTokenProviderLogin.ts

@@ -1,5 +1,5 @@
 import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
-import {IdTokenPayload} from "../OAuthRestClient";
+import {IdTokenPayload} from "../Types";
 import {RedirectionProvider} from "./RedirectionProvider";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
 import {UrlUtil} from "../../util";

package/src/oauth/tokenprovider/RefreshTokenProviderStorage.ts

@@ -1,7 +1,7 @@
 import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
-import {RefreshTokenPayload} from "../OAuthRestClient";
+import {RefreshTokenPayload} from "../Types";
 import {JsonUtil} from "../../util";
-import {OAuthUtil} from "../../util/OAuthUtil";
+import {OAuthUtil} from "../OAuthUtil";
 
 export class RefreshTokenProviderStorage implements OAuthRefreshTokenProvider {
 

package/src/oauth/tokenprovider/RefreshTokenProviderUrl.ts

@@ -1,8 +1,7 @@
 import {OAuthRefreshTokenProvider} from "./OAuthRefreshTokenProvider";
-import {RefreshTokenPayload} from "../OAuthRestClient";
+import {RefreshTokenPayload} from "../Types";
 import {RestClientWithOAuth} from "../RestClientWithOAuth";
-import {StringUtil} from "../../util";
-import {UrlUtil} from "../../util";
+import {StringUtil, UrlUtil} from "../../util";
 import {RedirectionProvider} from "./RedirectionProvider";
 
 export class RefreshTokenProviderUrl extends RedirectionProvider implements OAuthRefreshTokenProvider {

package/src/util/index.ts

@@ -9,4 +9,3 @@ export { NumberUtil } from './NumberUtil';
 export { JsonUtil } from './JsonUtil';
 export { HashUtil } from './HashUtil';
 export { UrlUtil } from './UrlUtil';
-export { OAuthUtil } from './OAuthUtil';