fix(ozone): adapt to latest oauth-client changes

bluesky-social · Jun 21, 2024 · ad13d2e · ad13d2e
1 parent 1c79b49
commit ad13d2e
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/components/shell/auth/oauth/useOAuth.ts b/components/shell/auth/oauth/useOAuth.ts
@@ -7,6 +7,7 @@ import {
   BrowserOAuthClientOptions,
   LoginContinuedInParentWindowError,
   OAuthAgent,
+  OAuthClientIdLoopback,
   OAuthClientMetadataInput,
 } from '@atproto/oauth-client-browser'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -38,7 +39,8 @@ function useCallbackRef<T extends (this: any, ...args: any[]) => any>(fn?: T) {
   ): void | ReturnType<T> {
     const { current } = fnRef
     if (current) return current.call(this, ...args)
-  }, [])
+  },
+  [])
 }
 
 type ClientOptions =
@@ -76,19 +78,23 @@ function useOAuthClient(
     plcDirectoryUrl,
   } = options
 
-  const optionsClientMetadata: null | 'auto' | OAuthClientMetadataInput =
+  const optionsClientMetadata:
+    | null
+    | 'forced'
+    | OAuthClientMetadataInput
+    | OAuthClientIdLoopback =
     !optionClient && (!clientId || clientMetadata != null)
-      ? clientMetadata || 'auto'
+      ? clientMetadata || 'forced'
       : null
 
   const fetch = useCallbackRef(options.fetch || globalThis.fetch)
 
   const oauthClientOptions = useMemo<null | BrowserOAuthClientOptions>(
     () =>
-      optionsClientMetadata
+      optionsClientMetadata && handleResolver
         ? {
             clientMetadata:
-              optionsClientMetadata === 'auto'
+              optionsClientMetadata === 'forced'
                 ? undefined
                 : optionsClientMetadata,
             handleResolver,
@@ -111,7 +117,7 @@ function useOAuthClient(
 
   const optionsLoad = useMemo<null | BrowserOAuthClientLoadOptions>(
     () =>
-      optionsClientId
+      optionsClientId && handleResolver
         ? {
             clientId: optionsClientId,
             handleResolver,