@instantdb/core 0.22.167 → 0.22.168

package/__tests__/src/auth-extra-fields.e2e.test.ts

@@ -0,0 +1,134 @@
+import { expect } from 'vitest';
+import { i } from '../../src';
+import { makeE2ETest, apiUrl } from './utils/e2e';
+
+const schema = i.schema({
+  entities: {
+    $users: i.entity({
+      email: i.string().unique().indexed().optional(),
+      username: i.string().unique().indexed().optional(),
+      displayName: i.string().optional(),
+    }),
+  },
+});
+
+async function generateMagicCode(
+  appId: string,
+  adminToken: string,
+  email: string,
+): Promise<string> {
+  const res = await fetch(`${apiUrl}/admin/magic_code`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'app-id': appId,
+      authorization: `Bearer ${adminToken}`,
+    },
+    body: JSON.stringify({ email }),
+  });
+  const data = await res.json();
+  return data.code;
+}
+
+const authTest = makeE2ETest({ schema });
+
+authTest(
+  'new user with extraFields gets fields written and created=true',
+  async ({ db, appId, adminToken }) => {
+    const email = `new-${Date.now()}@test.com`;
+
+    const code = await generateMagicCode(appId, adminToken, email);
+    const res = await db.auth.signInWithMagicCode({
+      email,
+      code,
+      extraFields: { username: 'cool_user', displayName: 'Cool User' },
+    });
+
+    expect(res.created).toBe(true);
+
+    const { data } = await db.queryOnce({ $users: {} });
+    const user = data.$users.find((u: any) => u.email === email);
+    expect(user).toBeDefined();
+    expect(user!.username).toBe('cool_user');
+    expect(user!.displayName).toBe('Cool User');
+  },
+);
+
+authTest(
+  'returning user gets created=false',
+  async ({ db, appId, adminToken }) => {
+    const email = `returning-${Date.now()}@test.com`;
+
+    // First sign in -- creates user
+    const code1 = await generateMagicCode(appId, adminToken, email);
+    const res1 = await db.auth.signInWithMagicCode({ email, code: code1 });
+    expect(res1.created).toBe(true);
+
+    // Second sign in -- existing user
+    const code2 = await generateMagicCode(appId, adminToken, email);
+    const res2 = await db.auth.signInWithMagicCode({ email, code: code2 });
+    expect(res2.created).toBe(false);
+  },
+);
+
+authTest(
+  'sign in without extraFields works (backwards compat)',
+  async ({ db, appId, adminToken }) => {
+    const email = `compat-${Date.now()}@test.com`;
+
+    const code = await generateMagicCode(appId, adminToken, email);
+    const res = await db.auth.signInWithMagicCode({ email, code });
+
+    expect(res.user).toBeDefined();
+    expect(res.user.email).toBe(email);
+  },
+);
+
+authTest(
+  'admin verify_magic_code returns { user, created } for checkMagicCode',
+  async ({ db: _db, appId, adminToken }) => {
+    const email = `admin-consume-${Date.now()}@test.com`;
+    const code = await generateMagicCode(appId, adminToken, email);
+
+    // Hit the admin endpoint directly (same as admin SDK checkMagicCode)
+    const res = await fetch(
+      `${apiUrl}/admin/verify_magic_code?app_id=${appId}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          authorization: `Bearer ${adminToken}`,
+        },
+        body: JSON.stringify({
+          email,
+          code,
+          'extra-fields': { username: 'admin_user' },
+        }),
+      },
+    );
+    const data = await res.json();
+
+    // Response should have user nested (not splatted) and created flag
+    expect(data.user).toBeDefined();
+    expect(data.user.email).toBe(email);
+    expect(data.created).toBe(true);
+
+    // Second call -- existing user
+    const code2 = await generateMagicCode(appId, adminToken, email);
+    const res2 = await fetch(
+      `${apiUrl}/admin/verify_magic_code?app_id=${appId}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          authorization: `Bearer ${adminToken}`,
+        },
+        body: JSON.stringify({ email, code: code2 }),
+      },
+    );
+    const data2 = await res2.json();
+
+    expect(data2.user).toBeDefined();
+    expect(data2.created).toBe(false);
+  },
+);

package/__tests__/src/utils/e2e.ts

@@ -6,18 +6,19 @@ import {
   InstantSchemaDef,
 } from '../../../src';
 
-// @ts-ignore
-const apiUrl = import.meta.env.VITE_INSTANT_DEV
-  ? 'http://localhost:8888'
-  : // @ts-ignore
-    import.meta.env.VITE_INSTANT_API_URL || 'https://api.instantdb.com';
+// __DEV_LOCAL_PORT__ is set by vitest.config.ts.
+// This allows us to run tests against mulutple checkouts
+// If CI=1 then __DEV_LOCAL_PORT__ will be falsey and tests will hit prod.
+// Otherwise they will hit localhost at the specified port.
+declare const __DEV_LOCAL_PORT__: number;
 
-// @ts-ignore
-const websocketURI = import.meta.env.VITE_INSTANT_DEV
-  ? 'ws://localhost:8888/runtime/session'
-  : // @ts-ignore
-    import.meta.env.VITE_INSTANT_WEBSOCKET_URI ||
-    'wss://api.instantdb.com/runtime/session';
+const apiUrl = __DEV_LOCAL_PORT__
+  ? `http://localhost:${__DEV_LOCAL_PORT__}`
+  : 'https://api.instantdb.com';
+
+const websocketURI = __DEV_LOCAL_PORT__
+  ? `ws://localhost:${__DEV_LOCAL_PORT__}/runtime/session`
+  : 'wss://api.instantdb.com/runtime/session';
 
 // Make a factory function that returns a typed test instance
 export function makeE2ETest<Schema extends InstantSchemaDef<any, any, any>>({
@@ -31,6 +32,8 @@ export function makeE2ETest<Schema extends InstantSchemaDef<any, any, any>>({
 }) {
   return baseTest.extend<{
     db: InstantCoreDatabase<Schema, false>;
+    appId: string;
+    adminToken: string;
   }>({
     db: async ({ task, signal }, use) => {
       const response = await fetch(`${apiUrl}/dash/apps/ephemeral`, {
@@ -49,9 +52,18 @@ export function makeE2ETest<Schema extends InstantSchemaDef<any, any, any>>({
         websocketURI,
         schema,
       });
+      (db as any)._testApp = app;
       await use(db);
     },
+    appId: async ({ db }, use) => {
+      await use((db as any)._testApp.id);
+    },
+    adminToken: async ({ db }, use) => {
+      await use((db as any)._testApp['admin-token']);
+    },
   });
 }
 
+export { apiUrl };
+
 export const e2eTest = makeE2ETest({});

package/dist/commonjs/Reactor.d.ts

@@ -291,10 +291,7 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
     sendMagicCode({ email }: {
         email: any;
     }): Promise<authAPI.SendMagicCodeResponse>;
-    signInWithMagicCode({ email, code }: {
-        email: any;
-        code: any;
-    }): Promise<authAPI.VerifyResponse>;
+    signInWithMagicCode(params: any): Promise<authAPI.CheckMagicCodeResponse>;
     signInWithCustomToken(authToken: any): Promise<authAPI.VerifyResponse>;
     signInAsGuest(): Promise<authAPI.VerifyResponse>;
     potentiallyInvalidateToken(currentUser: any, opts: any): void;
@@ -305,33 +302,39 @@ export default class Reactor<RoomSchema extends import("./presence.ts").RoomSche
      * @param {Object} params - The parameters to create the authorization URL.
      * @param {string} params.clientName - The name of the client requesting authorization.
      * @param {string} params.redirectURL - The URL to redirect users to after authorization.
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      * @returns {string} The created authorization URL.
      */
-    createAuthorizationURL({ clientName, redirectURL }: {
+    createAuthorizationURL({ clientName, redirectURL, extraFields }: {
         clientName: string;
         redirectURL: string;
+        extraFields?: Record<string, any> | undefined;
     }): string;
     /**
      * @param {Object} params
      * @param {string} params.code - The code received from the OAuth service.
      * @param {string} [params.codeVerifier] - The code verifier used to generate the code challenge.
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      */
-    exchangeCodeForToken({ code, codeVerifier }: {
+    exchangeCodeForToken({ code, codeVerifier, extraFields }: {
         code: string;
         codeVerifier?: string | undefined;
-    }): Promise<authAPI.VerifyResponse>;
+        extraFields?: Record<string, any> | undefined;
+    }): Promise<authAPI.CheckMagicCodeResponse>;
     issuerURI(): string;
     /**
      * @param {Object} params
      * @param {string} params.clientName - The name of the client requesting authorization.
      * @param {string} params.idToken - The id_token from the external service
      * @param {string | null | undefined} [params.nonce] - The nonce used when requesting the id_token from the external service
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      */
-    signInWithIdToken({ idToken, clientName, nonce }: {
+    signInWithIdToken(params: {
         clientName: string;
         idToken: string;
         nonce?: string | null | undefined;
-    }): Promise<authAPI.VerifyResponse>;
+        extraFields?: Record<string, any> | undefined;
+    }): Promise<authAPI.CheckMagicCodeResponse>;
     /**
      * @param {string} roomType
      * @param {string} roomId

package/dist/commonjs/Reactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Reactor.d.ts","sourceRoot":"","sources":["../../src/Reactor.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Reactor.d.ts","sourceRoot":"","sources":["../../src/Reactor.js"],"names":[],"mappings":"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"}

package/dist/commonjs/Reactor.js

@@ -91,6 +91,8 @@ const defaultConfig = {
 };
 // Param that the backend adds if this is an oauth redirect
 const OAUTH_REDIRECT_PARAM = '_instant_oauth_redirect';
+const OAUTH_EXTRA_FIELDS_ID_PARAM = '_instant_extra_fields_id';
+const oauthExtraFieldsKey = 'oauthExtraFields';
 const currentUserKey = `currentUser`;
 /**
  * @param {Object} config
@@ -1552,6 +1554,7 @@ class Reactor {
         if (url.searchParams.get(OAUTH_REDIRECT_PARAM)) {
             const startUrl = url.toString();
             url.searchParams.delete(OAUTH_REDIRECT_PARAM);
+            url.searchParams.delete(OAUTH_EXTRA_FIELDS_ID_PARAM);
             url.searchParams.delete('code');
             url.searchParams.delete('error');
             const newPath = url.pathname +
@@ -1614,8 +1617,20 @@ class Reactor {
         if (!code) {
             return null;
         }
+        const extraFieldsId = params.get(OAUTH_EXTRA_FIELDS_ID_PARAM);
         this._replaceUrlAfterOAuth();
         try {
+            let extraFields;
+            const stored = await this.kv.waitForKeyToLoad(oauthExtraFieldsKey);
+            if (extraFieldsId && stored) {
+                extraFields = stored[extraFieldsId];
+            }
+            // Clean up all stored extraFields after login
+            if (stored) {
+                this.kv.updateInPlace((prev) => {
+                    delete prev[oauthExtraFieldsKey];
+                });
+            }
             const currentUser = await this._getCurrentUser();
             const isGuest = currentUser?.type === 'guest';
             const { user } = await authAPI.exchangeCodeForToken({
@@ -1623,6 +1638,7 @@ class Reactor {
                 appId: this.config.appId,
                 code,
                 refreshToken: isGuest ? currentUser.refresh_token : undefined,
+                extraFields,
             });
             this.setCurrentUser(user);
             return null;
@@ -1840,15 +1856,16 @@ class Reactor {
             email: email,
         });
     }
-    async signInWithMagicCode({ email, code }) {
+    async signInWithMagicCode(params) {
         const currentUser = await this.getCurrentUser();
         const isGuest = currentUser?.user?.type === 'guest';
-        const res = await authAPI.verifyMagicCode({
+        const res = await authAPI.checkMagicCode({
             apiURI: this.config.apiURI,
             appId: this.config.appId,
-            email,
-            code,
+            email: params.email,
+            code: params.code,
             refreshToken: isGuest ? currentUser?.user?.refresh_token : undefined,
+            extraFields: params.extraFields,
         });
         await this.changeCurrentUser(res.user);
         return res;
@@ -1902,18 +1919,35 @@ class Reactor {
      * @param {Object} params - The parameters to create the authorization URL.
      * @param {string} params.clientName - The name of the client requesting authorization.
      * @param {string} params.redirectURL - The URL to redirect users to after authorization.
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      * @returns {string} The created authorization URL.
      */
-    createAuthorizationURL({ clientName, redirectURL }) {
+    createAuthorizationURL({ clientName, redirectURL, extraFields }) {
         const { apiURI, appId } = this.config;
-        return `${apiURI}/runtime/oauth/start?app_id=${appId}&client_name=${clientName}&redirect_uri=${redirectURL}`;
+        let finalRedirectURL = redirectURL;
+        if (extraFields) {
+            // Store extraFields under a unique ID so multiple
+            // createAuthorizationURL calls don't overwrite each other.
+            // The ID is passed through the redirect URL and used
+            // by _oauthLoginInit to retrieve the right extraFields.
+            // All entries are cleaned up after login.
+            const extraFieldsId = `${Math.random().toString(36).slice(2)}`;
+            this.kv.updateInPlace((prev) => {
+                const stored = prev[oauthExtraFieldsKey] || {};
+                stored[extraFieldsId] = extraFields;
+                prev[oauthExtraFieldsKey] = stored;
+            });
+            finalRedirectURL = `${redirectURL}${redirectURL.includes('?') ? '&' : '?'}${OAUTH_EXTRA_FIELDS_ID_PARAM}=${extraFieldsId}`;
+        }
+        return `${apiURI}/runtime/oauth/start?app_id=${appId}&client_name=${clientName}&redirect_uri=${encodeURIComponent(finalRedirectURL)}`;
     }
     /**
      * @param {Object} params
      * @param {string} params.code - The code received from the OAuth service.
      * @param {string} [params.codeVerifier] - The code verifier used to generate the code challenge.
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      */
-    async exchangeCodeForToken({ code, codeVerifier }) {
+    async exchangeCodeForToken({ code, codeVerifier, extraFields }) {
         const currentUser = await this.getCurrentUser();
         const isGuest = currentUser?.user?.type === 'guest';
         const res = await authAPI.exchangeCodeForToken({
@@ -1922,6 +1956,7 @@ class Reactor {
             code: code,
             codeVerifier,
             refreshToken: isGuest ? currentUser?.user?.refresh_token : undefined,
+            extraFields,
         });
         await this.changeCurrentUser(res.user);
         return res;
@@ -1935,17 +1970,19 @@ class Reactor {
      * @param {string} params.clientName - The name of the client requesting authorization.
      * @param {string} params.idToken - The id_token from the external service
      * @param {string | null | undefined} [params.nonce] - The nonce used when requesting the id_token from the external service
+     * @param {Record<string, any>} [params.extraFields] - Extra fields to write to $users on creation
      */
-    async signInWithIdToken({ idToken, clientName, nonce }) {
+    async signInWithIdToken(params) {
         const currentUser = await this.getCurrentUser();
         const refreshToken = currentUser?.user?.refresh_token;
         const res = await authAPI.signInWithIdToken({
             apiURI: this.config.apiURI,
             appId: this.config.appId,
-            idToken,
-            clientName,
-            nonce,
+            idToken: params.idToken,
+            clientName: params.clientName,
+            nonce: params.nonce,
             refreshToken,
+            extraFields: params.extraFields,
         });
         await this.changeCurrentUser(res.user);
         return res;