move types

alchemy-fr · Jan 5, 2024 · e63fb45 · e63fb45
1 parent a09d06d
commit e63fb45
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 60 deletions.
diff --git a/lib/js/auth/index.ts b/lib/js/auth/index.ts
@@ -1,15 +1,9 @@
 import OAuthClient, {
-    AuthEvent,
-    AuthEventHandler,
     configureClientAuthentication,
     configureClientCredentialsGrantType,
     isValidSession,
-    LoginEvent,
     loginEventType,
-    LogoutEvent,
     logoutEventType,
-    LogoutOptions,
-    RefreshTokenEvent,
     refreshTokenEventType,
     sessionExpiredEventType,
 } from "./src/client/OAuthClient";
@@ -29,13 +23,5 @@ export {
     isValidSession,
     keycloakNormalizer,
 };
-export type {
-    AuthEvent,
-    AuthEventHandler,
-    LogoutEvent,
-    LogoutOptions,
-    LoginEvent,
-    RefreshTokenEvent,
-}
 
 export * from './src/types';
diff --git a/lib/js/auth/src/client/KeycloakClient.ts b/lib/js/auth/src/client/KeycloakClient.ts
@@ -1,11 +1,9 @@
 import OAuthClient, {
-    LogoutEvent,
     logoutEventType,
-    LogoutOptions,
     normalizeRedirectUri,
     OAuthClientOptions
 } from "./OAuthClient";
-import {KeycloakUserInfoResponse} from "../types";
+import {KeycloakUserInfoResponse, LogoutEvent, LogoutOptions} from "../types";
 
 type Options = {
     realm: string;

diff --git a/lib/js/auth/src/client/OAuthClient.ts b/lib/js/auth/src/client/OAuthClient.ts
@@ -2,54 +2,21 @@ import axios, {AxiosError, AxiosHeaders, AxiosInstance, InternalAxiosRequestConf
 import {jwtDecode} from "jwt-decode";
 import {CookieStorage, IStorage} from "@alchemy/storage";
 import {createHttpClient, HttpClient} from "@alchemy/api";
-import {AuthTokens, TokenResponseWithTokens, UserInfoResponse} from "../types";
-
-export type TokenResponse = {
-    access_token: string;
-    refresh_token: string;
-    token_type: string;
-    expires_in: number;
-    refresh_expires_in: number;
-    device_token?: string;
-};
-
-interface ValidationError {
-    error: string;
-    error_description: string;
-}
-
-export type AuthEvent = {
-    type: string;
-    preventDefault?: boolean,
-    stopPropagation?: boolean,
-};
-
-export type LoginEvent = {
-    tokens: AuthTokens;
-} & AuthEvent;
-
-export type LogoutOptions = {
-    quiet?: boolean;
-    redirectPath?: string | undefined;
-    noEvent?: boolean;
-};
-
-export type LogoutEvent = LogoutOptions & AuthEvent;
-
-export type SessionExpiredEvent = AuthEvent;
-
-export type RefreshTokenEvent = {
-    tokens: AuthTokens;
-} & AuthEvent;
-
-export type AuthEventHandler<E extends AuthEvent = AuthEvent> = (event: E) => Promise<void>;
+import {
+    AuthEvent,
+    AuthEventHandler,
+    AuthTokens, LoginEvent,
+    LogoutEvent,
+    LogoutOptions, RefreshTokenEvent, SessionExpiredEvent, TokenResponse,
+    TokenResponseWithTokens,
+    UserInfoResponse, ValidationError
+} from "../types";
 
 export const loginEventType = 'login';
 export const refreshTokenEventType = 'refreshToken';
 export const logoutEventType = 'logout';
 export const sessionExpiredEventType = 'sessionExpired';
 
-
 type Options = {
     storage?: IStorage;
     clientId: string;

diff --git a/lib/js/auth/src/types.ts b/lib/js/auth/src/types.ts
@@ -1,4 +1,42 @@
-import {TokenResponse} from "./client/OAuthClient";
+export interface ValidationError {
+    error: string;
+    error_description: string;
+}
+
+export type AuthEvent = {
+    type: string;
+    preventDefault?: boolean,
+    stopPropagation?: boolean,
+};
+
+export type LoginEvent = {
+    tokens: AuthTokens;
+} & AuthEvent;
+
+export type LogoutOptions = {
+    quiet?: boolean;
+    redirectPath?: string | undefined;
+    noEvent?: boolean;
+};
+
+export type LogoutEvent = LogoutOptions & AuthEvent;
+
+export type SessionExpiredEvent = AuthEvent;
+
+export type RefreshTokenEvent = {
+    tokens: AuthTokens;
+} & AuthEvent;
+
+export type AuthEventHandler<E extends AuthEvent = AuthEvent> = (event: E) => Promise<void>;
+
+export type TokenResponse = {
+    access_token: string;
+    refresh_token: string;
+    token_type: string;
+    expires_in: number;
+    refresh_expires_in: number;
+    device_token?: string;
+};
 
 export type AuthTokens = {
     accessToken: string;