fix(cross-domain): drop client plugin check

Author: erquhart

src/react-start/index.ts

@@ -14,12 +14,15 @@ export const getCookieName = async (
 };
 
 const requireConvexSiteUrl = (
-  opts: { convexSiteUrl: string },
+  opts: { convexSiteUrl: string; verbose?: boolean },
   calledFrom: string
 ) => {
   if (!opts.convexSiteUrl) {
     throw new Error(`${calledFrom}: opts.convexSiteUrl is required`);
   }
+  if (opts.verbose) {
+    console.log(`${calledFrom}: opts.convexSiteUrl: ${opts.convexSiteUrl}`);
+  }
   return opts.convexSiteUrl;
 };
 

src/react/client.tsx

@@ -27,7 +27,7 @@ export function useAuth() {
 }
 
 export type ConvexAuthClient = {
-  verbose: boolean | undefined;
+  verbose?: boolean;
   logger?: ConvexReactClient["logger"];
 };
 
@@ -64,7 +64,7 @@ export function AuthProvider({
   const { data: session, isPending: isSessionPending } =
     authClient.useSession();
 
-  const verbose: boolean = (client as any).options?.verbose ?? false;
+  const verbose: boolean = client.verbose ?? false;
   const logVerbose = useCallback(
     (message: string) => {
       if (verbose) {
@@ -128,17 +128,11 @@ export function AuthProvider({
     () => {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       (async () => {
-        // Return early if cross domain plugin is not configured.
-        // Apparently there's no sane way to do this type check. Only the in
-        // keyword narrows the type effectively but it doesn't work on functions.
-        if (!(authClient as any)["crossDomain"]) {
-          return;
-        }
-        const authClientWithCrossDomain =
-          authClient as AuthClientWithPlugins<PluginsWithCrossDomain>;
-        const url = new URL(window.location.href);
+        const url = new URL(window.location?.href);
         const token = url.searchParams.get("ott");
         if (token) {
+          const authClientWithCrossDomain =
+            authClient as AuthClientWithPlugins<PluginsWithCrossDomain>;
           url.searchParams.delete("ott");
           const result =
             await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({