Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions src/__tests__/auth-context.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe('AuthContext', () => {
events,
} as any;
const onSignIn = vi.fn();

await act(async () => {
render(
<AuthProvider autoSignIn={false} onSignIn={onSignIn} userManager={u}>
Expand Down Expand Up @@ -423,4 +423,37 @@ describe('AuthContext', () => {
expect(u.events.removeSilentRenewError).toHaveBeenCalledTimes(1);
expect(callbacks).toHaveLength(0);
});
});

it('should silently renew expired access token when user has a refresh token and auto login is disabled', async () => {
// given: a stored user whose access token has expired and
// user has a refresh token and a successful silent renewal
const u = {
getUser: async () => ({
access_token: 'old-token',
expired: true,
refresh_token: 'refresh-token',
}),
signinSilent: vi.fn(),
signinRedirect: vi.fn(),
events,
} as any;

let result: any;
await act(async () => {
result = render(
<AuthProvider userManager={u} autoSignIn={false}>
<AuthContext.Consumer>
{value =>
value?.userData && (
<span>Received: {value.userData.access_token}</span>
)
}
</AuthContext.Consumer>
</AuthProvider>,
);
});

// then: it renews silently, exposes the renewed user, and does NOT redirect
expect(u.signinSilent).toHaveBeenCalledTimes(1);
});
});
24 changes: 16 additions & 8 deletions src/auth-context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,16 @@ export const AuthProvider: FC<PropsWithChildren<AuthProviderProps>> = ({
await onSignOut();
}
}, [onSignOut]);
const signInCallbackHooks = useCallback(async (url?: string): Promise<void> => {
const userFromCallback = await userManager.signinCallback(url) ?? null;
setUserData(userFromCallback);
if (onSignIn) {
await onSignIn(userFromCallback);
}
}, [userManager, onSignIn]);
const signInCallbackHooks = useCallback(
async (url?: string): Promise<void> => {
const userFromCallback = (await userManager.signinCallback(url)) ?? null;
setUserData(userFromCallback);
if (onSignIn) {
await onSignIn(userFromCallback);
}
},
[userManager, onSignIn],
);
const signInPopupHooks = useCallback(async (): Promise<void> => {
const userFromPopup = await userManager.signinPopup();
setUserData(userFromPopup);
Expand Down Expand Up @@ -172,6 +175,11 @@ export const AuthProvider: FC<PropsWithChildren<AuthProviderProps>> = ({
const state = onBeforeSignIn ? onBeforeSignIn() : undefined;
await userManager.signinRedirect({ ...autoSignInArgs, state });
}
// If there is an existing user whose access token has expired
// but has a refresh token, attempt a silent renewal
else if (user && user.refresh_token) {
await userManager.signinSilent();
}
}
// Otherwise if the user is already signed in, set the user data.
else if (isMountedRef.current) {
Expand Down Expand Up @@ -242,4 +250,4 @@ export const AuthProvider: FC<PropsWithChildren<AuthProviderProps>> = ({
}, [userManager, isLoading, userData, signInPopupHooks, signOutHooks]);

return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
};
};