From b02370d24d826452fc5614accd6eb001ee08a958 Mon Sep 17 00:00:00 2001
From: Sergey Zhigunov <i.sergey.zhigunov@gmail.com>
Date: Mon, 26 Feb 2024 13:59:03 +0200
Subject: [PATCH] fix: wait for context readiness

---
 .../google/src/hooks/useGoogleLogin.ts        | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/packages/@react-oauth/google/src/hooks/useGoogleLogin.ts b/packages/@react-oauth/google/src/hooks/useGoogleLogin.ts
index 0a6cdf1..6ad0d22 100644
--- a/packages/@react-oauth/google/src/hooks/useGoogleLogin.ts
+++ b/packages/@react-oauth/google/src/hooks/useGoogleLogin.ts
@@ -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?: (
@@ -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;
 }