Skip to content

fix: wait for context readiness #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −7
Open

fix: wait for context readiness #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 27 additions & 7 deletions packages/@react-oauth/google/src/hooks/useGoogleLogin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ import {
NonOAuthError,
} from '../types';

type WaitFor = (getValue: () => boolean) => Promise<void>;

const waitFor: WaitFor = function waitFor(getValue) {
function _waitFor(getter: () => boolean, cb: () => void): void {
if (!getter()) {
setTimeout(() => {
_waitFor(getter, cb);
}, 0);
} else {
cb();
}
}

return new Promise<void>(resolve => {
_waitFor(getValue, resolve);
});
};

interface ImplicitFlowOptions
extends Omit<TokenClientConfig, 'client_id' | 'scope' | 'callback'> {
onSuccess?: (
Expand Down Expand Up @@ -116,15 +134,17 @@ export default function useGoogleLogin({
}, [clientId, scriptLoadedSuccessfully, flow, scope, state]);

const loginImplicitFlow = useCallback(
(overrideConfig?: OverridableTokenClientConfig) =>
clientRef.current?.requestAccessToken(overrideConfig),
[],
async (overrideConfig?: OverridableTokenClientConfig) => {
await waitFor(() => clientRef.current);
clientRef.current?.requestAccessToken(overrideConfig);
},
[scriptLoadedSuccessfully],
);

const loginAuthCodeFlow = useCallback(
() => clientRef.current?.requestCode(),
[],
);
const loginAuthCodeFlow = useCallback(async () => {
await waitFor(() => clientRef.current);
clientRef.current?.requestCode();
}, []);

return flow === 'implicit' ? loginImplicitFlow : loginAuthCodeFlow;
}