diff --git a/src/hooks.ts b/src/hooks.ts index e58f167..3ab5b6e 100644 --- a/src/hooks.ts +++ b/src/hooks.ts @@ -1,12 +1,12 @@ import { MutableRefObject, useCallback, useEffect, useMemo } from "react"; -import { useDispatch, useSelector } from "react-redux"; +import { useSelector } from "react-redux"; import { AnyAction } from "redux"; import { ThunkAction } from "redux-thunk"; import { useBentoAuthContext } from "./contexts"; import { Resource, makeResourceKey } from "./resources"; import { fetchResourcePermissions, refreshTokens, tokenHandoff } from "./redux/authSlice"; -import { RootState } from "./redux/store"; +import { RootState, useAppDispatch } from "./redux/store"; import { LS_SIGN_IN_POPUP, createAuthURL } from "./performAuth"; import { fetchOpenIdConfigurationIfNecessary } from "./redux/openIdConfigSlice"; import { getIsAuthenticated, logMissingAuthContext, makeAuthorizationHeader } from "./utils"; @@ -28,7 +28,7 @@ export const useAuthorizationHeader = () => { }; export const useResourcePermissions = (resource: Resource, authzUrl: string) => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const haveAuthorizationService = !!authzUrl; @@ -64,7 +64,7 @@ export const useHasResourcePermission = (resource: Resource, authzUrl: string, p }; export const useOpenIdConfig = () => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { openIdConfigUrl } = useBentoAuthContext(); useEffect(() => { @@ -81,7 +81,7 @@ export const useOpenIdConfig = () => { export const useSignInPopupTokenHandoff = ( windowMessageHandler: MutableRefObject ) => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { applicationUrl, authCallbackUrl, clientId } = useBentoAuthContext(); useEffect(() => { if (!applicationUrl || !authCallbackUrl || !clientId) { @@ -112,7 +112,7 @@ export const useSessionWorkerTokenRefresh = ( createWorker: () => Worker, fetchUserDependentData: ThunkAction, ) => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { clientId } = useBentoAuthContext(); useEffect(() => { diff --git a/src/performAuth.ts b/src/performAuth.ts index 2243305..e619f79 100644 --- a/src/performAuth.ts +++ b/src/performAuth.ts @@ -1,5 +1,5 @@ import { useCallback, useEffect } from "react"; -import { useDispatch, useSelector } from "react-redux"; +import { useSelector } from "react-redux"; import { useHistory, useLocation } from "react-router-dom"; import { AnyAction } from "redux"; import { ThunkAction } from "redux-thunk"; @@ -85,7 +85,7 @@ export const useHandleCallback = ( authCodeCallback = undefined, uiErrorCallback: (message: string) => void, ) => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const history = useHistory(); const location = useLocation(); const { authCallbackUrl, clientId } = useBentoAuthContext(); diff --git a/src/performSignOut.ts b/src/performSignOut.ts index 69ba2a4..2dec050 100644 --- a/src/performSignOut.ts +++ b/src/performSignOut.ts @@ -1,15 +1,15 @@ import { useCallback } from "react"; -import { useDispatch, useSelector } from "react-redux"; +import { useSelector } from "react-redux"; import { useBentoAuthContext } from "./contexts"; import { useOpenIdConfig } from "./hooks"; -import { RootState } from "./redux/store"; +import { RootState, useAppDispatch } from "./redux/store"; import { setLSNotSignedIn } from "./performAuth"; import { signOut } from "./redux/authSlice"; import { logMissingAuthContext } from "./utils"; export const usePerformSignOut = () => { - const dispatch = useDispatch(); + const dispatch = useAppDispatch(); const { clientId, postSignOutUrl } = useBentoAuthContext(); const { idToken } = useSelector((state: RootState) => state.auth); const openIdConfig = useOpenIdConfig();