multiplayer

patches/convex/world.ts

@@ -98,30 +98,37 @@ export const restartDeadWorlds = internalMutation({
 export const userStatus = query({
   args: {
     worldId: v.id('worlds'),
+    oauthToken: v.optional(v.string()),
+
   },
   handler: async (ctx, args) => {
-    // const identity = await ctx.auth.getUserIdentity();
-    // if (!identity) {
-    //   return null;
-    // }
-    // return identity.tokenIdentifier;
-    return DEFAULT_NAME;
+    const { worldId, oauthToken } = args;
+    
+    if (!oauthToken) {
+     return null;
+    }
+  
+    return oauthToken;
   },
 });
 
 export const joinWorld = mutation({
   args: {
-    worldId: v.id('worlds'),
+    oauthToken: v.optional(v.string()),
+
   },
   handler: async (ctx, args) => {
-    // const identity = await ctx.auth.getUserIdentity();
+    const { worldId, oauthToken } = args;
+    
+    if (!oauthToken) {
+      throw new ConvexError(`Not logged in`);
+    }
     // if (!identity) {
     //   throw new ConvexError(`Not logged in`);
     // }
     // const name =
     //   identity.givenName || identity.nickname || (identity.email && identity.email.split('@')[0]);
-    // const name = DEFAULT_NAME;
-    
+    const name = oauthToken;
     // if (!name) {
     //   throw new ConvexError(`Missing name on ${JSON.stringify(identity)}`);
     // }
@@ -154,7 +161,7 @@ export const joinWorld = mutation({
       character: randomCharacter.character,
       description: randomCharacter.identity,
       // description: `${identity.givenName} is a human player`,
-      tokenIdentifier: DEFAULT_NAME, // TODO: change for multiplayer to oauth
+      tokenIdentifier: oauthToken, // TODO: change for multiplayer to oauth
       // By default everybody is a villager
       type: 'villager',
     });
@@ -164,19 +171,21 @@ export const joinWorld = mutation({
 export const leaveWorld = mutation({
   args: {
     worldId: v.id('worlds'),
+    oauthToken: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
-    // const identity = await ctx.auth.getUserIdentity();
-    // if (!identity) {
-    //   throw new Error(`Not logged in`);
-    // }
-    // const { tokenIdentifier } = identity;
+    const { worldId, oauthToken } = args;
+    
+    if (!oauthToken) {
+      throw new ConvexError(`Not logged in`);
+    }
+
     const world = await ctx.db.get(args.worldId);
     if (!world) {
       throw new Error(`Invalid world ID: ${args.worldId}`);
     }
     // const existingPlayer = world.players.find((p) => p.human === tokenIdentifier);
-    const existingPlayer = world.players.find((p) => p.human === DEFAULT_NAME);
+    const existingPlayer = world.players.find((p) => p.human === oauthToken);
     if (!existingPlayer) {
       return;
     }

patches/src/App.tsx

@@ -13,6 +13,7 @@ import ReactModal from 'react-modal';
 import MusicButton from './components/buttons/MusicButton.tsx';
 import Button from './components/buttons/Button.tsx';
 import InteractButton from './components/buttons/InteractButton.tsx';
+import OAuthLogin from './components//buttons/OAuthLogin.tsx';
 import FreezeButton from './components/FreezeButton.tsx';
 import { MAX_HUMAN_PLAYERS } from '../convex/constants.ts';
 import PoweredByConvex from './components/PoweredByConvex.tsx';
@@ -82,6 +83,7 @@ export default function Home() {
             <Button imgUrl={helpImg} onClick={() => setHelpModalOpen(true)}>
               Help
             </Button>
+            <OAuthLogin />
             <div id="footer-buttons"/>
           </div>
         </footer>

patches/src/components/PixiGame.tsx

@@ -27,8 +27,9 @@ export const PixiGame = (props: {
   // PIXI setup.
   const pixiApp = useApp();
   const viewportRef = useRef<Viewport | undefined>();
-
-  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId: props.worldId }) ?? null;
+  const oauth = JSON.parse(localStorage.getItem('oauth'));
+  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
+  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId: props.worldId, oauthToken }) ?? null;
   const humanPlayerId = [...props.game.world.players.values()].find(
     (p) => p.human === humanTokenIdentifier,
   )?.id;

patches/src/components/PlayerDetails.tsx

@@ -25,7 +25,9 @@ export default function PlayerDetails({
   setSelectedElement: SelectElement;
   scrollViewRef: React.RefObject<HTMLDivElement>;
 }) {
-  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId });
+  const oauth = JSON.parse(localStorage.getItem('oauth'));
+  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
+  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId, oauthToken });  
 
   const players = [...game.world.players.values()];
   const humanPlayer = players.find((p) => p.human === humanTokenIdentifier);

patches/src/components/buttons/InteractButton.tsx

@@ -15,7 +15,9 @@ export default function InteractButton() {
   const worldStatus = useQuery(api.world.defaultWorldStatus);
   const worldId = worldStatus?.worldId;
   const game = useServerGame(worldId);
-  const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId } : 'skip');
+  const oauth = JSON.parse(localStorage.getItem('oauth'));
+  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
+  const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId, oauthToken } : 'skip');
   const userPlayerId =
     game && [...game.world.players.values()].find((p) => p.human === humanTokenIdentifier)?.id;
   const join = useMutation(api.world.joinWorld);
@@ -27,7 +29,7 @@ export default function InteractButton() {
     async (worldId: Id<'worlds'>) => {
       let inputId;
       try {
-        inputId = await join({ worldId });
+        inputId = await join({ worldId, oauthToken });
       } catch (e: any) {
         if (e instanceof ConvexError) {
           toast.error(e.data);
@@ -41,7 +43,7 @@ export default function InteractButton() {
         toast.error(e.message);
       }
     },
-    [convex],
+    [convex, join, oauthToken],
   );
 
   const joinOrLeaveGame = () => {
@@ -54,7 +56,7 @@ export default function InteractButton() {
     }
     if (isPlaying) {
       console.log(`Leaving game for player ${userPlayerId}`);
-      void leave({ worldId });
+      void leave({ worldId , oauthToken});
     } else {
       console.log(`Joining game`);
       void joinInput(worldId);