convex-js-convex-react-query PR 14: Add auth example (#37185)

Adds Convex Auth to example app w/ unverified email/password for simplicity.

Co-authored-by: Shawn Erquhart <[email protected]>

Co-authored-by: Shawn Erquhart <[email protected]>
GitOrigin-RevId: 689d0d3ad15eabf6e6bbed12362ab1640b89983e

Author: 2 people

npm-packages/@convex-dev/react-query/README.md

@@ -96,7 +96,10 @@ const { mutate } = useMutation({
 });
 ```
 
-# Authentication (example TODO)
+# Authentication
+
+**Note:** The example app includes a basic Convex Auth implementation for
+reference.
 
 TanStack Query isn't opionated about auth; an auth code might be a an element of
 a query key like any other. With Convex it's not necessary to add an additional

npm-packages/@convex-dev/react-query/convex/_generated/api.d.ts

@@ -13,7 +13,10 @@ import type {
   FilterApi,
   FunctionReference,
 } from "convex/server";
+import type * as auth from "../auth.js";
+import type * as http from "../http.js";
 import type * as messages from "../messages.js";
+import type * as user from "../user.js";
 import type * as weather from "../weather.js";
 
 /**
@@ -25,7 +28,10 @@ import type * as weather from "../weather.js";
  * ```
  */
 declare const fullApi: ApiFromModules<{
+  auth: typeof auth;
+  http: typeof http;
   messages: typeof messages;
+  user: typeof user;
   weather: typeof weather;
 }>;
 export declare const api: FilterApi<

npm-packages/@convex-dev/react-query/convex/auth.config.ts

@@ -0,0 +1,8 @@
+export default {
+  providers: [
+    {
+      domain: process.env.CONVEX_SITE_URL,
+      applicationID: "convex",
+    },
+  ],
+};

npm-packages/@convex-dev/react-query/convex/auth.ts

@@ -0,0 +1,6 @@
+import { Password } from "@convex-dev/auth/providers/Password";
+import { convexAuth } from "@convex-dev/auth/server";
+
+export const { auth, signIn, signOut, store, isAuthenticated } = convexAuth({
+  providers: [Password],
+});

npm-packages/@convex-dev/react-query/convex/http.ts

@@ -0,0 +1,8 @@
+import { httpRouter } from "convex/server";
+import { auth } from "./auth";
+
+const http = httpRouter();
+
+auth.addHttpRoutes(http);
+
+export default http;

npm-packages/@convex-dev/react-query/convex/messages.ts

@@ -1,23 +1,46 @@
 import { mutation } from "./_generated/server.js";
 import { query } from "./_generated/server.js";
-import { Doc } from "./_generated/dataModel.js";
+import { Doc, Id } from "./_generated/dataModel.js";
+import { v } from "convex/values";
+import schema, { vv } from "./schema.js";
 
 export const list = query({
-  handler: async (ctx): Promise<Doc<"messages">[]> => {
-    return await ctx.db.query("messages").collect();
+  returns: v.array(
+    v.object({
+      ...vv.doc("messages").fields,
+      authorId: v.id("users"),
+      authorEmail: v.optional(v.string()),
+    }),
+  ),
+  handler: async (ctx) => {
+    const messages = await ctx.db.query("messages").collect();
+    return Promise.all(
+      messages.map(async (message) => {
+        const author = await ctx.db.get(message.author);
+        if (!author) {
+          throw new Error("Author not found");
+        }
+        return { ...message, authorId: author._id, authorEmail: author.email };
+      }),
+    );
   },
 });
 
 export const count = query({
-  handler: async (ctx): Promise<string> => {
+  returns: v.string(),
+  handler: async (ctx) => {
     const messages = await ctx.db.query("messages").take(1001);
     return messages.length === 1001 ? "1000+" : `${messages.length}`;
   },
 });
 
 export const send = mutation({
-  handler: async (ctx, { body, author }: { body: string; author: string }) => {
-    const message = { body, author };
+  args: {
+    body: v.string(),
+    author: v.id("users"),
+  },
+  handler: async (ctx, args) => {
+    const message = { body: args.body, author: args.author };
     await ctx.db.insert("messages", message);
   },
 });

npm-packages/@convex-dev/react-query/convex/schema.ts

@@ -1,9 +1,15 @@
 import { defineSchema, defineTable } from "convex/server";
+import { authTables } from "@convex-dev/auth/server";
 import { v } from "convex/values";
+import { typedV } from "convex-helpers/validators";
 
-export default defineSchema({
+const schema = defineSchema({
+  ...authTables,
   messages: defineTable({
-    author: v.string(),
+    author: v.id("users"),
     body: v.string(),
   }),
 });
+export default schema;
+
+export const vv = typedV(schema);

npm-packages/@convex-dev/react-query/convex/user.ts

@@ -0,0 +1,13 @@
+import { getAuthUserId } from "@convex-dev/auth/server";
+import { Doc } from "./_generated/dataModel";
+import { query } from "./_generated/server";
+
+export const getCurrent = query({
+  handler: async (ctx): Promise<Doc<"users"> | null> => {
+    const userId = await getAuthUserId(ctx);
+    if (!userId) {
+      throw new Error("Unauthorized");
+    }
+    return await ctx.db.get(userId);
+  },
+});

npm-packages/@convex-dev/react-query/package.json

@@ -38,9 +38,8 @@
     "convex": "^1.24.1"
   },
   "devDependencies": {
+    "@tanstack/eslint-plugin-query": "^5.74.7",
     "@tanstack/react-query": "^5.62.0",
-    "convex": "workspace:*",
-    "@tanstack/eslint-plugin-query": "^5.59.7",
     "@tanstack/react-query-devtools": "^5.62.0",
     "@types/node": "^18.17.0",
     "@types/react": "^18.0.0",
@@ -72,5 +71,13 @@
   },
   "module": "./dist/esm/index.js",
   "main": "./dist/commonjs/index.js",
-  "types": "./dist/commonjs/index.d.ts"
+  "types": "./dist/commonjs/index.d.ts",
+  "dependencies": {
+    "@auth/core": "^0.37.0",
+    "@convex-dev/auth": "^0.0.83",
+    "convex-helpers": "^0.1.85"
+  },
+  "overrides": {
+    "typescript": "~5.0.3"
+  }
 }

npm-packages/@convex-dev/react-query/src/example.tsx

@@ -7,7 +7,13 @@ import {
   useSuspenseQuery,
 } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { ConvexProvider, ConvexReactClient } from "convex/react";
+import {
+  Authenticated,
+  AuthLoading,
+  ConvexProvider,
+  ConvexReactClient,
+  Unauthenticated,
+} from "convex/react";
 import ReactDOM from "react-dom/client";
 import {
   ConvexQueryClient,
@@ -18,6 +24,7 @@ import {
 import "./index.css";
 import { FormEvent, useState } from "react";
 import { api } from "../convex/_generated/api.js";
+import { ConvexAuthProvider, useAuthActions } from "@convex-dev/auth/react";
 
 // Build a global convexClient wherever you would normally create a TanStack Query client.
 const convexClient = new ConvexReactClient(import.meta.env.VITE_CONVEX_URL);
@@ -38,12 +45,63 @@ convexQueryClient.connect(queryClient);
 
 function Main() {
   return (
-    <ConvexProvider client={convexClient}>
+    <ConvexAuthProvider client={convexClient}>
       <QueryClientProvider client={queryClient}>
-        <App />
+        <AuthLoading>
+          <div>Loading...</div>
+        </AuthLoading>
+        <Unauthenticated>
+          <SignIn />
+        </Unauthenticated>
+        <Authenticated>
+          <App />
+        </Authenticated>
         <ReactQueryDevtools initialIsOpen />
       </QueryClientProvider>
-    </ConvexProvider>
+    </ConvexAuthProvider>
+  );
+}
+
+function SignIn() {
+  const { signIn } = useAuthActions();
+  const [step, setStep] = useState<"signUp" | "signIn">("signIn");
+  return (
+    <div className="signin-container">
+      <form
+        className="signin-form"
+        onSubmit={(event) => {
+          event.preventDefault();
+          const formData = new FormData(event.currentTarget);
+          void signIn("password", formData);
+        }}
+      >
+        <input
+          name="email"
+          placeholder="Email"
+          type="text"
+          className="signin-input"
+        />
+        <input
+          name="password"
+          placeholder="Password"
+          type="password"
+          className="signin-input"
+        />
+        <input name="flow" type="hidden" value={step} />
+        <button type="submit">
+          {step === "signIn" ? "Sign in" : "Sign up"}
+        </button>
+        <button
+          type="button"
+          className="signin-secondary"
+          onClick={() => {
+            setStep(step === "signIn" ? "signUp" : "signIn");
+          }}
+        >
+          {step === "signIn" ? "Sign up instead" : "Sign in instead"}
+        </button>
+      </form>
+    </div>
   );
 }
 
@@ -90,22 +148,30 @@ function MessageCount() {
 }
 
 function App() {
+  const { signOut } = useAuthActions();
   const { data, error, isPending } = useQuery({
     // This query updates reactively.
     ...convexQuery(api.messages.list, {}),
     initialData: [],
   });
+  const {
+    data: user,
+    error: userError,
+    isPending: userIsPending,
+  } = useQuery({
+    ...convexQuery(api.user.getCurrent, {}),
+    initialData: null,
+  });
 
   const [newMessageText, setNewMessageText] = useState("");
   const { mutate, isPending: sending } = useMutation({
     mutationFn: useConvexMutation(api.messages.send),
   });
-  const [name] = useState(() => "User " + Math.floor(Math.random() * 10000));
   async function handleSendMessage(event: FormEvent) {
     event.preventDefault();
     if (!sending && newMessageText) {
       mutate(
-        { body: newMessageText, author: name },
+        { body: newMessageText, author: user?._id },
         {
           onSuccess: () => setNewMessageText(""),
         },
@@ -120,16 +186,19 @@ function App() {
   }
   return (
     <main>
+      <button type="button" onClick={() => void signOut()}>
+        Sign out
+      </button>
       <h1>Convex Chat</h1>
       <Weather />
       <MessageCount />
       <p className="badge">
-        <span>{name}</span>
+        <span>{user?.email}</span>
       </p>
       <ul>
         {data.map((message) => (
           <li key={message._id}>
-            <span>{message.author}:</span>
+            <span>{message.authorEmail}:</span>
             <span>{message.body}</span>
             <span>{new Date(message._creationTime).toLocaleTimeString()}</span>
           </li>