Skip to content

Commit 5e94d9b

Browse files
fix: corrects useAuth generics (#8627)
Corrects AuthContext and useAuth generics due to regression in #8600
1 parent f8bae0e commit 5e94d9b

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Diff for: packages/ui/src/providers/Auth/index.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@ import { requests } from '../../utilities/api.js'
1414
import { formatAdminURL } from '../../utilities/formatAdminURL.js'
1515
import { useConfig } from '../Config/index.js'
1616

17-
export type UserResponse = MeOperationResult | null
18-
19-
export type AuthContext = {
17+
export type AuthContext<T = ClientUser> = {
2018
fetchFullUser: () => Promise<null | User>
2119
logOut: () => Promise<boolean>
2220
permissions?: Permissions
2321
refreshCookie: (forceRefresh?: boolean) => void
2422
refreshCookieAsync: () => Promise<ClientUser>
2523
refreshPermissions: () => Promise<void>
2624
setPermissions: (permissions: Permissions) => void
27-
setUser: (user: UserResponse) => void
25+
setUser: (user: MeOperationResult | null) => void
2826
strategy?: string
2927
token?: string
3028
tokenExpiration?: number
31-
user?: null | UserResponse['user']
29+
user?: null | T
3230
}
3331

3432
const Context = createContext({} as AuthContext)
@@ -99,7 +97,7 @@ export function AuthProvider({
9997
}, [])
10098

10199
const setNewUser = useCallback(
102-
(userResponse: UserResponse) => {
100+
(userResponse: MeOperationResult | null) => {
103101
if (userResponse?.user) {
104102
setUserInMemory(userResponse.user)
105103
setTokenInMemory(userResponse.token)
@@ -325,4 +323,4 @@ export function AuthProvider({
325323
)
326324
}
327325

328-
export const useAuth = (): AuthContext => useContext(Context)
326+
export const useAuth = <T = ClientUser,>(): AuthContext<T> => useContext(Context) as AuthContext<T>

0 commit comments

Comments
 (0)