From 1298f2ceb095f1042287bae6027e923603f46aac Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Tue, 9 Aug 2022 23:13:46 -0700
Subject: [PATCH] Return both user and privateUser from `createuser`

---
 functions/src/create-user.ts    | 2 +-
 web/components/auth-context.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions/src/create-user.ts b/functions/src/create-user.ts
index c30e78c3..bd65b14a 100644
--- a/functions/src/create-user.ts
+++ b/functions/src/create-user.ts
@@ -98,7 +98,7 @@ export const createuser = newEndpoint(opts, async (req, auth) => {
   await sendWelcomeEmail(user, privateUser)
   await track(auth.uid, 'create user', { username }, { ip: req.ip })
 
-  return user
+  return { user, privateUser }
 })
 
 const firestore = admin.firestore()
diff --git a/web/components/auth-context.tsx b/web/components/auth-context.tsx
index 332c96be..5610a9c3 100644
--- a/web/components/auth-context.tsx
+++ b/web/components/auth-context.tsx
@@ -53,7 +53,7 @@ export function AuthProvider(props: {
         let user = await getUser(fbUser.uid)
         if (!user) {
           const deviceToken = ensureDeviceToken()
-          user = (await createUser({ deviceToken })) as User
+          user = (await createUser({ deviceToken })).user as User
         }
         setAuthUser(user)
         // Persist to local storage, to reduce login blink next time.