Disable "Login with Netlify Identity" button until Netlify identity is initialized

packages/core/src/backends/git-gateway/AuthenticationPage.tsx

@@ -32,6 +32,42 @@ const GitGatewayAuthenticationPage = ({ onLogin, t }: GitGatewayAuthenticationPa
     password?: string;
   }>({});
 
+  const [initialized, setInitialized] = useState(false);
+
+  useEffect(() => {
+    if (window.netlifyIdentity) {
+      let initialized = false;
+      Promise.race([
+        new Promise<void>(resolve => {
+          window.netlifyIdentity?.on('init', () => {
+            if (!initialized) {
+              initialized = true;
+              resolve();
+            }
+          });
+        }),
+        new Promise<void>(resolve => {
+          const interval = setInterval(() => {
+            if (initialized) {
+              clearInterval(interval);
+              return;
+            }
+
+            if (window.netlifyIdentity) {
+              console.info('Manually initializing identity widget');
+              initialized = true;
+              window.netlifyIdentity.init();
+              clearInterval(interval);
+              resolve();
+            }
+          }, 250);
+        }),
+      ]).then(() => {
+        setInitialized(true);
+      });
+    }
+  }, []);
+
   useEffect(() => {
     if (!loggedIn && window.netlifyIdentity && window.netlifyIdentity.currentUser()) {
       setLoggingIn(true);
@@ -119,6 +155,7 @@ const GitGatewayAuthenticationPage = ({ onLogin, t }: GitGatewayAuthenticationPa
       label={t('auth.loginWithNetlifyIdentity')}
       inProgress={loggingIn}
       error={errorContent}
+      disabled={!initialized}
     />
   );
 };

packages/core/src/backends/git-gateway/implementation.tsx

@@ -106,27 +106,6 @@ function getEndpoint(endpoint: string, netlifySiteURL: string | null) {
   return endpoint;
 }
 
-// wait for identity widget to initialize
-// force init on timeout
-let initPromise = Promise.resolve() as Promise<unknown>;
-if (window.netlifyIdentity) {
-  let initialized = false;
-  initPromise = Promise.race([
-    new Promise<void>(resolve => {
-      window.netlifyIdentity?.on('init', () => {
-        initialized = true;
-        resolve();
-      });
-    }),
-    new Promise(resolve => setTimeout(resolve, 2500)).then(() => {
-      if (!initialized) {
-        console.info('Manually initializing identity widget');
-        window.netlifyIdentity?.init();
-      }
-    }),
-  ]);
-}
-
 interface NetlifyUser extends Credentials {
   jwt: () => Promise<string>;
   email: string;
@@ -222,7 +201,6 @@ export default class GitGateway implements BackendClass {
     if (this.authClient) {
       return this.authClient;
     }
-    await initPromise;
     this.authClient = {
       logout: () => window.netlifyIdentity?.logout(),
       currentUser: () => window.netlifyIdentity?.currentUser(),