@convex-dev/better-auth 0.7.0-alpha.1 → 0.7.0-alpha.11

package/src/component/schema.ts

@@ -1,3 +1,7 @@
+// This file is auto-generated from auth.ts by generate-schema.ts. Do not edit this file manually.
+// To regenerate the schema, run:
+// npx tsx generate-schema.ts
+
 import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
 
@@ -7,13 +11,19 @@ const schema = defineSchema({
     email: v.string(),
     emailVerified: v.boolean(),
     image: v.optional(v.string()),
-    twoFactorEnabled: v.optional(v.boolean()),
-    userId: v.string(),
     createdAt: v.number(),
     updatedAt: v.number(),
+    twoFactorEnabled: v.optional(v.boolean()),
+    isAnonymous: v.optional(v.boolean()),
+    username: v.optional(v.string()),
+    displayUsername: v.optional(v.string()),
+    userId: v.optional(v.string()),
   })
+    .index("email_name", ["email","name"])
+    .index("name", ["name"])
+    .index("userId", ["userId"])
     .index("email", ["email"])
-    .index("userId", ["userId"]),
+    .index("username", ["username"]),
 
   session: defineTable({
     expiresAt: v.number(),
@@ -24,10 +34,10 @@ const schema = defineSchema({
     userAgent: v.optional(v.string()),
     userId: v.string(),
   })
-    .index("token", ["token"])
-    .index("userId", ["userId"])
     .index("expiresAt", ["expiresAt"])
-    .index("userId_expiresAt", ["userId", "expiresAt"]),
+    .index("expiresAt_userId", ["expiresAt","userId"])
+    .index("token", ["token"])
+    .index("userId", ["userId"]),
 
   account: defineTable({
     accountId: v.string(),
@@ -43,16 +53,10 @@ const schema = defineSchema({
     createdAt: v.number(),
     updatedAt: v.number(),
   })
-    .index("userId", ["userId"])
     .index("accountId", ["accountId"])
-    .index("providerId_accountId", ["providerId", "accountId"])
-    .index("userId_providerId", ["userId", "providerId"]),
-
-  twoFactor: defineTable({
-    secret: v.string(),
-    backupCodes: v.string(),
-    userId: v.string(),
-  }).index("userId", ["userId"]),
+    .index("accountId_providerId", ["accountId","providerId"])
+    .index("providerId_userId", ["providerId","userId"])
+    .index("userId", ["userId"]),
 
   verification: defineTable({
     identifier: v.string(),
@@ -61,16 +65,74 @@ const schema = defineSchema({
     createdAt: v.optional(v.number()),
     updatedAt: v.optional(v.number()),
   })
-    .index("identifier", ["identifier"])
-    .index("expiresAt", ["expiresAt"]),
+    .index("expiresAt", ["expiresAt"])
+    .index("identifier", ["identifier"]),
+
+  twoFactor: defineTable({
+    secret: v.string(),
+    backupCodes: v.string(),
+    userId: v.string(),
+  })
+    .index("userId", ["userId"]),
 
   jwks: defineTable({
     publicKey: v.string(),
     privateKey: v.string(),
     createdAt: v.number(),
-    // no longer used
-    id: v.optional(v.string()),
   }),
+
+  rateLimit: defineTable({
+    key: v.optional(v.string()),
+    count: v.optional(v.number()),
+    lastRequest: v.optional(v.number()),
+  })
+    .index("key", ["key"]),
+
 });
 
 export default schema;
+
+export const specialFields = {
+  user: {
+    name: {
+      sortable: true
+    },
+    email: {
+      sortable: true,
+      unique: true
+    },
+    username: {
+      sortable: true,
+      unique: true
+    }
+  },
+  session: {
+    token: {
+      unique: true
+    },
+    userId: {
+      references: {
+        model: "user",
+        field: "id",
+        onDelete: "cascade"
+      }
+    }
+  },
+  account: {
+    userId: {
+      references: {
+        model: "user",
+        field: "id",
+        onDelete: "cascade"
+      }
+    }
+  },
+  twoFactor: {
+    userId: {
+      references: {
+        model: "user",
+        field: "id"
+      }
+    }
+  }
+};

package/src/nextjs/index.ts

@@ -3,9 +3,23 @@ import { createCookieGetter } from "better-auth/cookies";
 import { GenericActionCtx } from "convex/server";
 import { JWT_COOKIE_NAME } from "../plugins/convex";
 
+const requireBaseURL = (
+  createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
+) => {
+  if (!createAuth({} as any).options.baseURL) {
+    throw new Error(
+      "No baseURL found in Better Auth config. baseUrl should be set to your Convex Site URL."
+    );
+  }
+  return createAuth({} as any).options.baseURL;
+};
+
 export const getToken = async (
   createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>
 ) => {
+  // Require baseURL here because it's protocol determines cookie secure mode,
+  // and must be set to ensure cookies work between Next.js and Convex.
+  requireBaseURL(createAuth);
   const { cookies } = await import("next/headers");
   const cookieStore = await cookies();
   const auth = createAuth({} as any);
@@ -19,6 +33,9 @@ const handler = (request: Request, opts?: { convexSiteUrl?: string }) => {
   const requestUrl = new URL(request.url);
   const convexSiteUrl =
     opts?.convexSiteUrl ?? process.env.NEXT_PUBLIC_CONVEX_SITE_URL;
+  if (!convexSiteUrl) {
+    throw new Error("NEXT_PUBLIC_CONVEX_SITE_URL is not set");
+  }
   const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
   const newRequest = new Request(nextUrl, request);
   newRequest.headers.set("accept-encoding", "application/json");

package/src/plugins/convex/index.ts

@@ -51,7 +51,7 @@ export const convex = (
         return session.user.userId;
       },
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      definePayload: ({ user: { id, userId, ...user }, session }) => ({
+      definePayload: ({ user: { id, userId, image, ...user }, session }) => ({
         ...user,
         sessionId: session.id,
       }),
@@ -108,8 +108,13 @@ export const convex = (
         {
           matcher: (ctx) => {
             return (
-              ctx.path?.startsWith("/sign-in") ||
-              ctx.path?.startsWith("/callback")
+              ctx.path.startsWith("/sign-in") ||
+              ctx.path.startsWith("/sign-up") ||
+              ctx.path.startsWith("/callback") ||
+              ctx.path.startsWith("/oauth2/callback") ||
+              ctx.path.startsWith("/magic-link/verify") ||
+              ctx.path.startsWith("/email-otp/verify-email") ||
+              ctx.path.startsWith("/phone-number/verify")
             );
           },
           handler: createAuthMiddleware(async (ctx) => {
@@ -139,7 +144,10 @@ export const convex = (
         },
         {
           matcher: (ctx) => {
-            return ctx.path?.startsWith("/sign-out");
+            return (
+              ctx.path?.startsWith("/sign-out") ||
+              ctx.path?.startsWith("/delete-user")
+            );
           },
           handler: createAuthMiddleware(async (ctx) => {
             const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, {

package/src/plugins/cross-domain/index.ts

@@ -21,6 +21,13 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
 
   return {
     id: "cross-domain",
+    init(ctx) {
+      return {
+        options: {
+          trustedOrigins: [siteUrl],
+        },
+      };
+    },
     hooks: {
       before: [
         {
@@ -52,12 +59,22 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
             };
           }),
         },
+        {
+          matcher: (ctx) => {
+            return ctx.method === "GET" && ctx.path.startsWith("/verify-email");
+          },
+          handler: createAuthMiddleware(async (ctx) => {
+            if (ctx.query?.callbackURL) {
+              ctx.query.callbackURL = rewriteCallbackURL(ctx.query.callbackURL);
+            }
+            return { context: ctx };
+          }),
+        },
         {
           matcher: (ctx) => {
             return (
-              ctx.path.startsWith("/link-social") ||
+              (ctx.method === "POST" && ctx.path.startsWith("/link-social")) ||
               ctx.path.startsWith("/send-verification-email") ||
-              ctx.path.startsWith("/verify-email") ||
               ctx.path.startsWith("/sign-in/email") ||
               ctx.path.startsWith("/sign-in/social") ||
               ctx.path.startsWith("/sign-in/magic-link") ||
@@ -149,8 +166,5 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         }
       ),
     },
-    options: {
-      trustedOrigins: [siteUrl],
-    },
   } satisfies BetterAuthPlugin;
 };

package/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({

package/src/react-start/index.ts

@@ -13,22 +13,38 @@ export const getCookieName = async (
   return cookie.name;
 };
 
+const requireConvexSiteUrl = (
+  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;
+};
+
 export const fetchSession = async <
   T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>,
 >(
-  createAuth: T,
-  request?: Request
+  request: Request,
+  opts: {
+    convexSiteUrl: string;
+    verbose?: boolean;
+  }
 ) => {
   type Session = ReturnType<T>["$Infer"]["Session"];
 
   if (!request) {
     throw new Error("No request found");
   }
-  const baseURL = new URL(request.url).origin;
+  const convexSiteUrl = requireConvexSiteUrl(opts, "fetchSession");
   const { data: session } = await betterFetch<Session>(
     "/api/auth/get-session",
     {
-      baseURL,
+      baseURL: convexSiteUrl,
       headers: {
         cookie: request.headers.get("cookie") ?? "",
       },
@@ -41,11 +57,22 @@ export const fetchSession = async <
 
 export const reactStartHandler = (
   request: Request,
-  opts?: { convexSiteUrl?: string }
+  opts: { convexSiteUrl: string; verbose?: boolean }
 ) => {
-  const convexSiteUrl = opts?.convexSiteUrl ?? process.env.VITE_CONVEX_SITE_URL;
   const requestUrl = new URL(request.url);
+  const convexSiteUrl = requireConvexSiteUrl(opts, "reactStartHandler");
   const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
   request.headers.set("accept-encoding", "application/json");
   return fetch(nextUrl, new Request(request, { redirect: "manual" }));
 };
+
+export const reactStartHelpers = (
+  createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>,
+  opts: { convexSiteUrl: string; verbose?: boolean }
+) => {
+  return {
+    fetchSession: (request: Request) => fetchSession(request, opts),
+    reactStartHandler: (request: Request) => reactStartHandler(request, opts),
+    getCookieName: () => getCookieName(createAuth),
+  };
+};

package/src/react-start/vite-env.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="vite/client" />
+/// <reference types="vite/types/importMeta.d.ts" />

package/dist/commonjs/react-router/index.d.ts

@@ -1,10 +0,0 @@
-import { betterAuth } from "better-auth";
-import { GenericActionCtx } from "convex/server";
-export declare const getToken: (createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>) => Promise<string | undefined>;
-export declare const nextJsHandler: (opts?: {
-    convexSiteUrl?: string;
-}) => {
-    GET: (request: Request) => Promise<Response>;
-    POST: (request: Request) => Promise<Response>;
-};
-//# sourceMappingURL=index.d.ts.map

package/dist/commonjs/react-router/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,QAAQ,GACnB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,gCAS1E,CAAC;AAYF,eAAO,MAAM,aAAa,GAAI,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE;mBAC9C,OAAO;oBACN,OAAO;CACvB,CAAC"}

package/dist/commonjs/react-router/index.js

@@ -1,24 +0,0 @@
-import { createCookieGetter } from "better-auth/cookies";
-import { JWT_COOKIE_NAME } from "../plugins/convex";
-export const getToken = async (createAuth) => {
-    const { cookies } = await import("next/headers");
-    const cookieStore = await cookies();
-    const auth = createAuth({});
-    const createCookie = createCookieGetter(auth.options);
-    const cookie = createCookie(JWT_COOKIE_NAME);
-    const token = cookieStore.get(cookie.name);
-    return token?.value;
-};
-const handler = (request, opts) => {
-    const requestUrl = new URL(request.url);
-    const convexSiteUrl = opts?.convexSiteUrl ?? process.env.NEXT_PUBLIC_CONVEX_SITE_URL;
-    const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
-    const newRequest = new Request(nextUrl, request);
-    newRequest.headers.set("accept-encoding", "application/json");
-    return fetch(newRequest, { method: request.method, redirect: "manual" });
-};
-export const nextJsHandler = (opts) => ({
-    GET: (request) => handler(request, opts),
-    POST: (request) => handler(request, opts),
-});
-//# sourceMappingURL=index.js.map

package/dist/commonjs/react-router/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,UAAyE,EACzE,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,MAAM,OAAO,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,KAAK,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAE,IAAiC,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GACjB,IAAI,EAAE,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;IACjE,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAiC,EAAE,EAAE,CAAC,CAAC;IACnE,GAAG,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;CACnD,CAAC,CAAC"}

package/dist/esm/react-router/index.d.ts

@@ -1,10 +0,0 @@
-import { betterAuth } from "better-auth";
-import { GenericActionCtx } from "convex/server";
-export declare const getToken: (createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>) => Promise<string | undefined>;
-export declare const nextJsHandler: (opts?: {
-    convexSiteUrl?: string;
-}) => {
-    GET: (request: Request) => Promise<Response>;
-    POST: (request: Request) => Promise<Response>;
-};
-//# sourceMappingURL=index.d.ts.map

package/dist/esm/react-router/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,QAAQ,GACnB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,gCAS1E,CAAC;AAYF,eAAO,MAAM,aAAa,GAAI,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE;mBAC9C,OAAO;oBACN,OAAO;CACvB,CAAC"}

package/dist/esm/react-router/index.js

@@ -1,24 +0,0 @@
-import { createCookieGetter } from "better-auth/cookies";
-import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
-export const getToken = async (createAuth) => {
-    const { cookies } = await import("next/headers");
-    const cookieStore = await cookies();
-    const auth = createAuth({});
-    const createCookie = createCookieGetter(auth.options);
-    const cookie = createCookie(JWT_COOKIE_NAME);
-    const token = cookieStore.get(cookie.name);
-    return token?.value;
-};
-const handler = (request, opts) => {
-    const requestUrl = new URL(request.url);
-    const convexSiteUrl = opts?.convexSiteUrl ?? process.env.NEXT_PUBLIC_CONVEX_SITE_URL;
-    const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
-    const newRequest = new Request(nextUrl, request);
-    newRequest.headers.set("accept-encoding", "application/json");
-    return fetch(newRequest, { method: request.method, redirect: "manual" });
-};
-export const nextJsHandler = (opts) => ({
-    GET: (request) => handler(request, opts),
-    POST: (request) => handler(request, opts),
-});
-//# sourceMappingURL=index.js.map

package/dist/esm/react-router/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-router/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,UAAyE,EACzE,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,MAAM,OAAO,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,KAAK,EAAE,KAAK,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,OAAgB,EAAE,IAAiC,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GACjB,IAAI,EAAE,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;IACjE,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAiC,EAAE,EAAE,CAAC,CAAC;IACnE,GAAG,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;IACjD,IAAI,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC;CACnD,CAAC,CAAC"}