diff --git a/packages/auth/src/AuthContext.ts b/packages/auth/src/AuthContext.ts index 6d3a567349df..75c99b28c849 100644 --- a/packages/auth/src/AuthContext.ts +++ b/packages/auth/src/AuthContext.ts @@ -12,6 +12,7 @@ export interface AuthContextInterface< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -51,7 +52,7 @@ export interface AuthContextInterface< * Clients should always return null or string * It is expected that they catch any errors internally */ - getToken(): Promise + getToken(options?: TGetTokenOptions): Promise /** * Fetches the "currentUser" from the api side, * but does not update the current user state. @@ -89,6 +90,7 @@ export function createAuthContext< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -104,6 +106,7 @@ export function createAuthContext< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, diff --git a/packages/auth/src/AuthImplementation.ts b/packages/auth/src/AuthImplementation.ts index cdec76de1b68..31bddf8b7e1c 100644 --- a/packages/auth/src/AuthImplementation.ts +++ b/packages/auth/src/AuthImplementation.ts @@ -7,6 +7,7 @@ export interface AuthImplementation< TLogOut = unknown, TSignUpOptions = unknown, TSignUp = unknown, + TGetTokenOptions = unknown, TForgotPassword = unknown, TResetPasswordOptions = unknown, TResetPassword = unknown, @@ -20,7 +21,7 @@ export interface AuthImplementation< login(options?: TLogInOptions): Promise logout(options?: TLogOutOptions): Promise signup(options?: TSignUpOptions): Promise - getToken(): Promise + getToken(options?: TGetTokenOptions): Promise forgotPassword?(username: string): Promise resetPassword?(options?: TResetPasswordOptions): Promise validateResetToken?(token: string | null): Promise diff --git a/packages/auth/src/AuthProvider/AuthProvider.tsx b/packages/auth/src/AuthProvider/AuthProvider.tsx index 744cba893c4f..55792de546f5 100644 --- a/packages/auth/src/AuthProvider/AuthProvider.tsx +++ b/packages/auth/src/AuthProvider/AuthProvider.tsx @@ -31,6 +31,7 @@ export function createAuthProvider< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -46,6 +47,7 @@ export function createAuthProvider< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -63,6 +65,7 @@ export function createAuthProvider< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, diff --git a/packages/auth/src/AuthProvider/useForgotPassword.ts b/packages/auth/src/AuthProvider/useForgotPassword.ts index 945e7a9c303c..981fd7e7a360 100644 --- a/packages/auth/src/AuthProvider/useForgotPassword.ts +++ b/packages/auth/src/AuthProvider/useForgotPassword.ts @@ -11,11 +11,8 @@ export const useForgotPassword = < TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient, >( authImplementation: AuthImplementation< TUser, @@ -26,11 +23,8 @@ export const useForgotPassword = < TLogOut, TSignUpOptions, TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient + TGetTokenOptions, + TForgotPassword >, ) => { return useCallback( diff --git a/packages/auth/src/AuthProvider/useLogIn.ts b/packages/auth/src/AuthProvider/useLogIn.ts index dd405fe5f848..4135f11e427e 100644 --- a/packages/auth/src/AuthProvider/useLogIn.ts +++ b/packages/auth/src/AuthProvider/useLogIn.ts @@ -7,35 +7,12 @@ import { spaDefaultAuthProviderState } from './AuthProviderState.js' import type { useCurrentUser } from './useCurrentUser.js' import { useReauthenticate } from './useReauthenticate.js' -export const useLogIn = < - TUser, - TRestoreAuth, - TLogInOptions, - TLogIn, - TLogOutOptions, - TLogOut, - TSignUpOptions, - TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient, ->( +export const useLogIn = ( authImplementation: AuthImplementation< TUser, TRestoreAuth, TLogInOptions, - TLogIn, - TLogOutOptions, - TLogOut, - TSignUpOptions, - TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient + TLogIn >, setAuthProviderState: React.Dispatch< React.SetStateAction> diff --git a/packages/auth/src/AuthProvider/useLogOut.ts b/packages/auth/src/AuthProvider/useLogOut.ts index e7306eb06676..c65d89eeb33f 100644 --- a/packages/auth/src/AuthProvider/useLogOut.ts +++ b/packages/auth/src/AuthProvider/useLogOut.ts @@ -11,13 +11,6 @@ export const useLogOut = < TLogIn, TLogOutOptions, TLogOut, - TSignUpOptions, - TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient, >( authImplementation: AuthImplementation< TUser, @@ -25,14 +18,7 @@ export const useLogOut = < TLogInOptions, TLogIn, TLogOutOptions, - TLogOut, - TSignUpOptions, - TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient + TLogOut >, setAuthProviderState: React.Dispatch< React.SetStateAction> diff --git a/packages/auth/src/AuthProvider/useResetPassword.ts b/packages/auth/src/AuthProvider/useResetPassword.ts index 162994e3294c..00c2a8f5917c 100644 --- a/packages/auth/src/AuthProvider/useResetPassword.ts +++ b/packages/auth/src/AuthProvider/useResetPassword.ts @@ -11,11 +11,10 @@ export const useResetPassword = < TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, - TValidateResetToken, - TClient, >( authImplementation: AuthImplementation< TUser, @@ -26,11 +25,10 @@ export const useResetPassword = < TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient + TResetPassword >, ) => { return useCallback( diff --git a/packages/auth/src/AuthProvider/useSignUp.ts b/packages/auth/src/AuthProvider/useSignUp.ts index c136ac935cb5..a093597af23c 100644 --- a/packages/auth/src/AuthProvider/useSignUp.ts +++ b/packages/auth/src/AuthProvider/useSignUp.ts @@ -15,11 +15,6 @@ export const useSignUp = < TLogOut, TSignUpOptions, TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient, >( authImplementation: AuthImplementation< TUser, @@ -29,12 +24,7 @@ export const useSignUp = < TLogOutOptions, TLogOut, TSignUpOptions, - TSignUp, - TForgotPassword, - TResetPasswordOptions, - TResetPassword, - TValidateResetToken, - TClient + TSignUp >, setAuthProviderState: React.Dispatch< React.SetStateAction> diff --git a/packages/auth/src/AuthProvider/useValidateResetToken.ts b/packages/auth/src/AuthProvider/useValidateResetToken.ts index eeafd5a3c9f6..6d89b7f8a691 100644 --- a/packages/auth/src/AuthProvider/useValidateResetToken.ts +++ b/packages/auth/src/AuthProvider/useValidateResetToken.ts @@ -11,11 +11,11 @@ export const useValidateResetToken = < TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, TValidateResetToken, - TClient, >( authImplementation: AuthImplementation< TUser, @@ -26,11 +26,11 @@ export const useValidateResetToken = < TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, - TValidateResetToken, - TClient + TValidateResetToken >, ) => { return useCallback( diff --git a/packages/auth/src/authFactory.ts b/packages/auth/src/authFactory.ts index 63b94d30fa08..13d9079064f6 100644 --- a/packages/auth/src/authFactory.ts +++ b/packages/auth/src/authFactory.ts @@ -20,6 +20,7 @@ export function createAuthentication< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -35,6 +36,7 @@ export function createAuthentication< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -56,6 +58,7 @@ export function createAuthentication< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, diff --git a/packages/auth/src/useAuth.ts b/packages/auth/src/useAuth.ts index 80b74f92bdc7..4b95cb36e82d 100644 --- a/packages/auth/src/useAuth.ts +++ b/packages/auth/src/useAuth.ts @@ -10,6 +10,7 @@ export function createUseAuth< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -25,6 +26,7 @@ export function createUseAuth< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -42,6 +44,7 @@ export function createUseAuth< TLogOut, TSignUpOptions, TSignUp, + TGetTokenOptions, TForgotPassword, TResetPasswordOptions, TResetPassword, @@ -72,6 +75,7 @@ export function useNoAuth(): AuthContextInterface< void, void, void, + void, undefined > { return { @@ -107,5 +111,6 @@ export type UseAuth = () => AuthContextInterface< unknown, unknown, unknown, + unknown, unknown > diff --git a/packages/router/src/__tests__/pageLoadingContext.test.tsx b/packages/router/src/__tests__/pageLoadingContext.test.tsx index 811b96cb3ba3..de74304ba5e9 100644 --- a/packages/router/src/__tests__/pageLoadingContext.test.tsx +++ b/packages/router/src/__tests__/pageLoadingContext.test.tsx @@ -65,6 +65,7 @@ type UnknownAuthContextInterface = AuthContextInterface< unknown, unknown, unknown, + unknown, unknown > diff --git a/packages/router/src/__tests__/router.test.tsx b/packages/router/src/__tests__/router.test.tsx index afd044c43d71..a90783fb2bd0 100644 --- a/packages/router/src/__tests__/router.test.tsx +++ b/packages/router/src/__tests__/router.test.tsx @@ -40,6 +40,7 @@ type UnknownAuthContextInterface = AuthContextInterface< unknown, unknown, unknown, + unknown, unknown > diff --git a/packages/router/src/router-context.tsx b/packages/router/src/router-context.tsx index cf96744f3086..00664efaa042 100644 --- a/packages/router/src/router-context.tsx +++ b/packages/router/src/router-context.tsx @@ -18,6 +18,7 @@ type UseAuth = () => AuthContextInterface< unknown, unknown, unknown, + unknown, unknown > diff --git a/packages/web/src/components/__tests__/FetchConfigProvider.test.tsx b/packages/web/src/components/__tests__/FetchConfigProvider.test.tsx index bd1d8868a978..1313ec30f166 100644 --- a/packages/web/src/components/__tests__/FetchConfigProvider.test.tsx +++ b/packages/web/src/components/__tests__/FetchConfigProvider.test.tsx @@ -26,6 +26,7 @@ type UnknownAuthContext = AuthContextInterface< unknown, unknown, unknown, + unknown, unknown >