@stackframe/stack 2.5.37 → 2.6.0

package/dist/lib/auth.d.mts

@@ -13,11 +13,21 @@ declare function addNewOAuthProviderOrScope(iface: StackClientInterface, options
     errorRedirectUrl: string;
     providerScope?: string;
 }, session: InternalSession): Promise<void>;
-declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: string): Promise<{
-    newUser: boolean;
-    afterCallbackRedirectUrl?: string | undefined;
-    accessToken: string;
-    refreshToken: string;
-} | null>;
+declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: string): Promise<({
+    status: "ok";
+    data: undefined;
+} & {
+    status: "ok";
+}) | ({
+    status: "ok";
+    data: {
+        newUser: boolean;
+        afterCallbackRedirectUrl?: string | undefined;
+        accessToken: string;
+        refreshToken: string;
+    };
+} & {
+    status: "ok";
+})>;
 
 export { addNewOAuthProviderOrScope, callOAuthCallback, signInWithOAuth };

package/dist/lib/auth.d.ts

@@ -13,11 +13,21 @@ declare function addNewOAuthProviderOrScope(iface: StackClientInterface, options
     errorRedirectUrl: string;
     providerScope?: string;
 }, session: InternalSession): Promise<void>;
-declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: string): Promise<{
-    newUser: boolean;
-    afterCallbackRedirectUrl?: string | undefined;
-    accessToken: string;
-    refreshToken: string;
-} | null>;
+declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: string): Promise<({
+    status: "ok";
+    data: undefined;
+} & {
+    status: "ok";
+}) | ({
+    status: "ok";
+    data: {
+        newUser: boolean;
+        afterCallbackRedirectUrl?: string | undefined;
+        accessToken: string;
+        refreshToken: string;
+    };
+} & {
+    status: "ok";
+})>;
 
 export { addNewOAuthProviderOrScope, callOAuthCallback, signInWithOAuth };

package/dist/lib/auth.js

@@ -28,6 +28,7 @@ module.exports = __toCommonJS(auth_exports);
 var import_stack_shared = require("@stackframe/stack-shared");
 var import_errors = require("@stackframe/stack-shared/dist/utils/errors");
 var import_promises = require("@stackframe/stack-shared/dist/utils/promises");
+var import_results = require("@stackframe/stack-shared/dist/utils/results");
 var import_strings = require("@stackframe/stack-shared/dist/utils/strings");
 var import_url = require("../utils/url");
 var import_cookie = require("./cookie");
@@ -97,14 +98,14 @@ function consumeOAuthCallbackQueryParams() {
 }
 async function callOAuthCallback(iface, redirectUrl) {
   const consumed = consumeOAuthCallbackQueryParams();
-  if (!consumed) return null;
+  if (!consumed) return import_results.Result.ok(void 0);
   try {
-    return await iface.callOAuthCallback({
+    return import_results.Result.ok(await iface.callOAuthCallback({
       oauthParams: consumed.originalUrl.searchParams,
       redirectUri: (0, import_url.constructRedirectUrl)(redirectUrl),
       codeVerifier: consumed.codeVerifier,
       state: consumed.state
-    });
+    }));
   } catch (e) {
     if (e instanceof import_stack_shared.KnownError) {
       throw e;

package/dist/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/auth.ts"],"sourcesContent":["import { KnownError, StackClientInterface } from \"@stackframe/stack-shared\";\nimport { InternalSession } from \"@stackframe/stack-shared/dist/sessions\";\nimport { StackAssertionError, captureError, throwErr } from \"@stackframe/stack-shared/dist/utils/errors\";\nimport { neverResolve } from \"@stackframe/stack-shared/dist/utils/promises\";\nimport { deindent } from \"@stackframe/stack-shared/dist/utils/strings\";\nimport { constructRedirectUrl } from \"../utils/url\";\nimport { consumeVerifierAndStateCookie, saveVerifierAndState } from \"./cookie\";\n\nexport async function signInWithOAuth(\n  iface: StackClientInterface,\n  options: {\n    provider: string,\n    redirectUrl: string,\n    errorRedirectUrl: string,\n    providerScope?: string,\n  }\n) {\n  const { codeChallenge, state } = await saveVerifierAndState();\n  const location = await iface.getOAuthUrl({\n    provider: options.provider,\n    redirectUrl: constructRedirectUrl(options.redirectUrl),\n    errorRedirectUrl: constructRedirectUrl(options.errorRedirectUrl),\n    codeChallenge,\n    state,\n    type: \"authenticate\",\n    providerScope: options.providerScope,\n  });\n  window.location.assign(location);\n  await neverResolve();\n}\n\nexport async function addNewOAuthProviderOrScope(\n  iface: StackClientInterface,\n  options: {\n    provider: string,\n    redirectUrl: string,\n    errorRedirectUrl: string,\n    providerScope?: string,\n  },\n  session: InternalSession,\n) {\n  const { codeChallenge, state } = await saveVerifierAndState();\n  const location = await iface.getOAuthUrl({\n    provider: options.provider,\n    redirectUrl: constructRedirectUrl(options.redirectUrl),\n    errorRedirectUrl: constructRedirectUrl(options.errorRedirectUrl),\n    afterCallbackRedirectUrl: constructRedirectUrl(window.location.href),\n    codeChallenge,\n    state,\n    type: \"link\",\n    session,\n    providerScope: options.providerScope,\n  });\n  window.location.assign(location);\n  await neverResolve();\n}\n\n/**\n * Checks if the current URL has the query parameters for an OAuth callback, and if so, removes them.\n *\n * Must be synchronous for the logic in callOAuthCallback to work without race conditions.\n */\nfunction consumeOAuthCallbackQueryParams() {\n  const requiredParams = [\"code\", \"state\"];\n  const originalUrl = new URL(window.location.href);\n  for (const param of requiredParams) {\n    if (!originalUrl.searchParams.has(param)) {\n      captureError(\"consumeOAuthCallbackQueryParams\", new Error(`Missing required query parameter on OAuth callback: ${param}`));\n      return null;\n    }\n  }\n\n  const expectedState = originalUrl.searchParams.get(\"state\") ?? throwErr(\"This should never happen; isn't state required above?\");\n  const cookieResult = consumeVerifierAndStateCookie(expectedState);\n\n  if (!cookieResult) {\n    // If the state can't be found in the cookies, then the callback wasn't meant for us.\n    // Maybe the website uses another OAuth library?\n    captureError(\"consumeOAuthCallbackQueryParams\", new Error(deindent`\n      Stack found an outer OAuth callback state in the query parameters, but not in cookies.\n      \n      This could have multiple reasons:\n        - The cookie expired, because the OAuth flow took too long.\n        - The user's browser deleted the cookie, either manually or because of a very strict cookie policy.\n        - The cookie was already consumed by this page, and the user already logged in.\n        - You are using another OAuth client library with the same callback URL as Stack.\n    `));\n    return null;\n  }\n\n\n  const newUrl = new URL(originalUrl);\n  for (const param of requiredParams) {\n    newUrl.searchParams.delete(param);\n  }\n\n  // let's get rid of the authorization code in the history as we\n  // don't redirect to `redirectUrl` if there's a validation error\n  // (as the redirectUrl might be malicious!).\n  //\n  // We use history.replaceState instead of location.assign(...) to\n  // prevent an unnecessary reload\n  window.history.replaceState({}, \"\", newUrl.toString());\n\n  return {\n    originalUrl,\n    codeVerifier: cookieResult.codeVerifier,\n    state: expectedState,\n  };\n}\n\nexport async function callOAuthCallback(\n  iface: StackClientInterface,\n  redirectUrl: string,\n) {\n  // note: this part of the function (until the return) needs\n  // to be synchronous, to prevent race conditions when\n  // callOAuthCallback is called multiple times in parallel\n  const consumed = consumeOAuthCallbackQueryParams();\n  if (!consumed) return null;\n\n  // the rest can be asynchronous (we now know that we are the\n  // intended recipient of the callback, and the only instance\n  // of callOAuthCallback that's running)\n  try {\n    return await iface.callOAuthCallback({\n      oauthParams: consumed.originalUrl.searchParams,\n      redirectUri: constructRedirectUrl(redirectUrl),\n      codeVerifier: consumed.codeVerifier,\n      state: consumed.state,\n    });\n  } catch (e) {\n    if (e instanceof KnownError) {\n      throw e;\n    }\n    throw new StackAssertionError(\"Error signing in during OAuth callback. Please try again.\", { cause: e });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAiD;AAEjD,oBAA4D;AAC5D,sBAA6B;AAC7B,qBAAyB;AACzB,iBAAqC;AACrC,oBAAoE;AAEpE,eAAsB,gBACpB,OACA,SAMA;AACA,QAAM,EAAE,eAAe,MAAM,IAAI,UAAM,oCAAqB;AAC5D,QAAM,WAAW,MAAM,MAAM,YAAY;AAAA,IACvC,UAAU,QAAQ;AAAA,IAClB,iBAAa,iCAAqB,QAAQ,WAAW;AAAA,IACrD,sBAAkB,iCAAqB,QAAQ,gBAAgB;AAAA,IAC/D;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,eAAe,QAAQ;AAAA,EACzB,CAAC;AACD,SAAO,SAAS,OAAO,QAAQ;AAC/B,YAAM,8BAAa;AACrB;AAEA,eAAsB,2BACpB,OACA,SAMA,SACA;AACA,QAAM,EAAE,eAAe,MAAM,IAAI,UAAM,oCAAqB;AAC5D,QAAM,WAAW,MAAM,MAAM,YAAY;AAAA,IACvC,UAAU,QAAQ;AAAA,IAClB,iBAAa,iCAAqB,QAAQ,WAAW;AAAA,IACrD,sBAAkB,iCAAqB,QAAQ,gBAAgB;AAAA,IAC/D,8BAA0B,iCAAqB,OAAO,SAAS,IAAI;AAAA,IACnE;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA,eAAe,QAAQ;AAAA,EACzB,CAAC;AACD,SAAO,SAAS,OAAO,QAAQ;AAC/B,YAAM,8BAAa;AACrB;AAOA,SAAS,kCAAkC;AACzC,QAAM,iBAAiB,CAAC,QAAQ,OAAO;AACvC,QAAM,cAAc,IAAI,IAAI,OAAO,SAAS,IAAI;AAChD,aAAW,SAAS,gBAAgB;AAClC,QAAI,CAAC,YAAY,aAAa,IAAI,KAAK,GAAG;AACxC,sCAAa,mCAAmC,IAAI,MAAM,uDAAuD,KAAK,EAAE,CAAC;AACzH,aAAO;AAAA,IACT;AAAA,EACF;AAEA,QAAM,gBAAgB,YAAY,aAAa,IAAI,OAAO,SAAK,wBAAS,uDAAuD;AAC/H,QAAM,mBAAe,6CAA8B,aAAa;AAEhE,MAAI,CAAC,cAAc;AAGjB,oCAAa,mCAAmC,IAAI,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAQzD,CAAC;AACF,WAAO;AAAA,EACT;AAGA,QAAM,SAAS,IAAI,IAAI,WAAW;AAClC,aAAW,SAAS,gBAAgB;AAClC,WAAO,aAAa,OAAO,KAAK;AAAA,EAClC;AAQA,SAAO,QAAQ,aAAa,CAAC,GAAG,IAAI,OAAO,SAAS,CAAC;AAErD,SAAO;AAAA,IACL;AAAA,IACA,cAAc,aAAa;AAAA,IAC3B,OAAO;AAAA,EACT;AACF;AAEA,eAAsB,kBACpB,OACA,aACA;AAIA,QAAM,WAAW,gCAAgC;AACjD,MAAI,CAAC,SAAU,QAAO;AAKtB,MAAI;AACF,WAAO,MAAM,MAAM,kBAAkB;AAAA,MACnC,aAAa,SAAS,YAAY;AAAA,MAClC,iBAAa,iCAAqB,WAAW;AAAA,MAC7C,cAAc,SAAS;AAAA,MACvB,OAAO,SAAS;AAAA,IAClB,CAAC;AAAA,EACH,SAAS,GAAG;AACV,QAAI,aAAa,gCAAY;AAC3B,YAAM;AAAA,IACR;AACA,UAAM,IAAI,kCAAoB,6DAA6D,EAAE,OAAO,EAAE,CAAC;AAAA,EACzG;AACF;","names":[]}
+{"version":3,"sources":["../../src/lib/auth.ts"],"sourcesContent":["import { KnownError, StackClientInterface } from \"@stackframe/stack-shared\";\nimport { InternalSession } from \"@stackframe/stack-shared/dist/sessions\";\nimport { StackAssertionError, captureError, throwErr } from \"@stackframe/stack-shared/dist/utils/errors\";\nimport { neverResolve } from \"@stackframe/stack-shared/dist/utils/promises\";\nimport { Result } from \"@stackframe/stack-shared/dist/utils/results\";\nimport { deindent } from \"@stackframe/stack-shared/dist/utils/strings\";\nimport { constructRedirectUrl } from \"../utils/url\";\nimport { consumeVerifierAndStateCookie, saveVerifierAndState } from \"./cookie\";\n\nexport async function signInWithOAuth(\n  iface: StackClientInterface,\n  options: {\n    provider: string,\n    redirectUrl: string,\n    errorRedirectUrl: string,\n    providerScope?: string,\n  }\n) {\n  const { codeChallenge, state } = await saveVerifierAndState();\n  const location = await iface.getOAuthUrl({\n    provider: options.provider,\n    redirectUrl: constructRedirectUrl(options.redirectUrl),\n    errorRedirectUrl: constructRedirectUrl(options.errorRedirectUrl),\n    codeChallenge,\n    state,\n    type: \"authenticate\",\n    providerScope: options.providerScope,\n  });\n  window.location.assign(location);\n  await neverResolve();\n}\n\nexport async function addNewOAuthProviderOrScope(\n  iface: StackClientInterface,\n  options: {\n    provider: string,\n    redirectUrl: string,\n    errorRedirectUrl: string,\n    providerScope?: string,\n  },\n  session: InternalSession,\n) {\n  const { codeChallenge, state } = await saveVerifierAndState();\n  const location = await iface.getOAuthUrl({\n    provider: options.provider,\n    redirectUrl: constructRedirectUrl(options.redirectUrl),\n    errorRedirectUrl: constructRedirectUrl(options.errorRedirectUrl),\n    afterCallbackRedirectUrl: constructRedirectUrl(window.location.href),\n    codeChallenge,\n    state,\n    type: \"link\",\n    session,\n    providerScope: options.providerScope,\n  });\n  window.location.assign(location);\n  await neverResolve();\n}\n\n/**\n * Checks if the current URL has the query parameters for an OAuth callback, and if so, removes them.\n *\n * Must be synchronous for the logic in callOAuthCallback to work without race conditions.\n */\nfunction consumeOAuthCallbackQueryParams() {\n  const requiredParams = [\"code\", \"state\"];\n  const originalUrl = new URL(window.location.href);\n  for (const param of requiredParams) {\n    if (!originalUrl.searchParams.has(param)) {\n      captureError(\"consumeOAuthCallbackQueryParams\", new Error(`Missing required query parameter on OAuth callback: ${param}`));\n      return null;\n    }\n  }\n\n  const expectedState = originalUrl.searchParams.get(\"state\") ?? throwErr(\"This should never happen; isn't state required above?\");\n  const cookieResult = consumeVerifierAndStateCookie(expectedState);\n\n  if (!cookieResult) {\n    // If the state can't be found in the cookies, then the callback wasn't meant for us.\n    // Maybe the website uses another OAuth library?\n    captureError(\"consumeOAuthCallbackQueryParams\", new Error(deindent`\n      Stack found an outer OAuth callback state in the query parameters, but not in cookies.\n      \n      This could have multiple reasons:\n        - The cookie expired, because the OAuth flow took too long.\n        - The user's browser deleted the cookie, either manually or because of a very strict cookie policy.\n        - The cookie was already consumed by this page, and the user already logged in.\n        - You are using another OAuth client library with the same callback URL as Stack.\n    `));\n    return null;\n  }\n\n\n  const newUrl = new URL(originalUrl);\n  for (const param of requiredParams) {\n    newUrl.searchParams.delete(param);\n  }\n\n  // let's get rid of the authorization code in the history as we\n  // don't redirect to `redirectUrl` if there's a validation error\n  // (as the redirectUrl might be malicious!).\n  //\n  // We use history.replaceState instead of location.assign(...) to\n  // prevent an unnecessary reload\n  window.history.replaceState({}, \"\", newUrl.toString());\n\n  return {\n    originalUrl,\n    codeVerifier: cookieResult.codeVerifier,\n    state: expectedState,\n  };\n}\n\nexport async function callOAuthCallback(\n  iface: StackClientInterface,\n  redirectUrl: string,\n) {\n  // note: this part of the function (until the return) needs\n  // to be synchronous, to prevent race conditions when\n  // callOAuthCallback is called multiple times in parallel\n  const consumed = consumeOAuthCallbackQueryParams();\n  if (!consumed) return Result.ok(undefined);\n\n  // the rest can be asynchronous (we now know that we are the\n  // intended recipient of the callback, and the only instance\n  // of callOAuthCallback that's running)\n  try {\n    return Result.ok(await iface.callOAuthCallback({\n      oauthParams: consumed.originalUrl.searchParams,\n      redirectUri: constructRedirectUrl(redirectUrl),\n      codeVerifier: consumed.codeVerifier,\n      state: consumed.state,\n    }));\n  } catch (e) {\n    if (e instanceof KnownError) {\n      throw e;\n    }\n    throw new StackAssertionError(\"Error signing in during OAuth callback. Please try again.\", { cause: e });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAiD;AAEjD,oBAA4D;AAC5D,sBAA6B;AAC7B,qBAAuB;AACvB,qBAAyB;AACzB,iBAAqC;AACrC,oBAAoE;AAEpE,eAAsB,gBACpB,OACA,SAMA;AACA,QAAM,EAAE,eAAe,MAAM,IAAI,UAAM,oCAAqB;AAC5D,QAAM,WAAW,MAAM,MAAM,YAAY;AAAA,IACvC,UAAU,QAAQ;AAAA,IAClB,iBAAa,iCAAqB,QAAQ,WAAW;AAAA,IACrD,sBAAkB,iCAAqB,QAAQ,gBAAgB;AAAA,IAC/D;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN,eAAe,QAAQ;AAAA,EACzB,CAAC;AACD,SAAO,SAAS,OAAO,QAAQ;AAC/B,YAAM,8BAAa;AACrB;AAEA,eAAsB,2BACpB,OACA,SAMA,SACA;AACA,QAAM,EAAE,eAAe,MAAM,IAAI,UAAM,oCAAqB;AAC5D,QAAM,WAAW,MAAM,MAAM,YAAY;AAAA,IACvC,UAAU,QAAQ;AAAA,IAClB,iBAAa,iCAAqB,QAAQ,WAAW;AAAA,IACrD,sBAAkB,iCAAqB,QAAQ,gBAAgB;AAAA,IAC/D,8BAA0B,iCAAqB,OAAO,SAAS,IAAI;AAAA,IACnE;AAAA,IACA;AAAA,IACA,MAAM;AAAA,IACN;AAAA,IACA,eAAe,QAAQ;AAAA,EACzB,CAAC;AACD,SAAO,SAAS,OAAO,QAAQ;AAC/B,YAAM,8BAAa;AACrB;AAOA,SAAS,kCAAkC;AACzC,QAAM,iBAAiB,CAAC,QAAQ,OAAO;AACvC,QAAM,cAAc,IAAI,IAAI,OAAO,SAAS,IAAI;AAChD,aAAW,SAAS,gBAAgB;AAClC,QAAI,CAAC,YAAY,aAAa,IAAI,KAAK,GAAG;AACxC,sCAAa,mCAAmC,IAAI,MAAM,uDAAuD,KAAK,EAAE,CAAC;AACzH,aAAO;AAAA,IACT;AAAA,EACF;AAEA,QAAM,gBAAgB,YAAY,aAAa,IAAI,OAAO,SAAK,wBAAS,uDAAuD;AAC/H,QAAM,mBAAe,6CAA8B,aAAa;AAEhE,MAAI,CAAC,cAAc;AAGjB,oCAAa,mCAAmC,IAAI,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAQzD,CAAC;AACF,WAAO;AAAA,EACT;AAGA,QAAM,SAAS,IAAI,IAAI,WAAW;AAClC,aAAW,SAAS,gBAAgB;AAClC,WAAO,aAAa,OAAO,KAAK;AAAA,EAClC;AAQA,SAAO,QAAQ,aAAa,CAAC,GAAG,IAAI,OAAO,SAAS,CAAC;AAErD,SAAO;AAAA,IACL;AAAA,IACA,cAAc,aAAa;AAAA,IAC3B,OAAO;AAAA,EACT;AACF;AAEA,eAAsB,kBACpB,OACA,aACA;AAIA,QAAM,WAAW,gCAAgC;AACjD,MAAI,CAAC,SAAU,QAAO,sBAAO,GAAG,MAAS;AAKzC,MAAI;AACF,WAAO,sBAAO,GAAG,MAAM,MAAM,kBAAkB;AAAA,MAC7C,aAAa,SAAS,YAAY;AAAA,MAClC,iBAAa,iCAAqB,WAAW;AAAA,MAC7C,cAAc,SAAS;AAAA,MACvB,OAAO,SAAS;AAAA,IAClB,CAAC,CAAC;AAAA,EACJ,SAAS,GAAG;AACV,QAAI,aAAa,gCAAY;AAC3B,YAAM;AAAA,IACR;AACA,UAAM,IAAI,kCAAoB,6DAA6D,EAAE,OAAO,EAAE,CAAC;AAAA,EACzG;AACF;","names":[]}

package/dist/lib/stack-app.d.mts

@@ -469,6 +469,8 @@ type Team = {
     id: string;
     displayName: string;
     profileImageUrl: string | null;
+    clientMetadata: any;
+    clientReadOnlyMetadata: any;
     inviteUser(options: {
         email: string;
     }): Promise<Result<undefined, KnownErrors["TeamPermissionRequired"]>>;
@@ -479,6 +481,7 @@ type Team = {
 type TeamUpdateOptions = {
     displayName?: string;
     profileImageUrl?: string | null;
+    clientMetadata?: ReadonlyJson;
 };
 type TeamCreateOptions = {
     displayName: string;
@@ -490,6 +493,7 @@ type ServerTeamUser = ServerUser & {
 };
 type ServerTeam = {
     createdAt: Date;
+    serverMetadata: any;
     listUsers(): Promise<ServerTeamUser[]>;
     useUsers(): ServerUser[];
     update(update: ServerTeamUpdateOptions): Promise<void>;
@@ -501,9 +505,9 @@ type ServerTeam = {
     removeUser(userId: string): Promise<void>;
 } & Team;
 type ServerTeamCreateOptions = TeamCreateOptions;
-type ServerTeamUpdateOptions = {
-    displayName?: string;
-    profileImageUrl?: string | null;
+type ServerTeamUpdateOptions = TeamUpdateOptions & {
+    clientReadOnlyMetadata?: ReadonlyJson;
+    serverMetadata?: ReadonlyJson;
 };
 type TeamPermission = {
     id: string;
@@ -554,27 +558,29 @@ type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         email: string;
         password: string;
         noRedirect?: boolean;
-    }): Promise<KnownErrors["EmailPasswordMismatch"] | KnownErrors["InvalidTotpCode"] | void>;
+    }): Promise<Result<undefined, KnownErrors["EmailPasswordMismatch"] | KnownErrors["InvalidTotpCode"]>>;
     signUpWithCredential(options: {
         email: string;
         password: string;
         noRedirect?: boolean;
-    }): Promise<KnownErrors["UserEmailAlreadyExists"] | KnownErrors["PasswordRequirementsNotMet"] | void>;
+    }): Promise<Result<undefined, KnownErrors["UserEmailAlreadyExists"] | KnownErrors["PasswordRequirementsNotMet"]>>;
     callOAuthCallback(): Promise<boolean>;
-    sendForgotPasswordEmail(email: string): Promise<KnownErrors["UserNotFound"] | void>;
-    sendMagicLinkEmail(email: string): Promise<KnownErrors["RedirectUrlNotWhitelisted"] | void>;
+    sendForgotPasswordEmail(email: string): Promise<Result<undefined, KnownErrors["UserNotFound"]>>;
+    sendMagicLinkEmail(email: string): Promise<Result<{
+        nonce: string;
+    }, KnownErrors["RedirectUrlNotWhitelisted"]>>;
     resetPassword(options: {
         code: string;
         password: string;
-    }): Promise<KnownErrors["VerificationCodeError"] | void>;
-    verifyPasswordResetCode(code: string): Promise<KnownErrors["VerificationCodeError"] | void>;
+    }): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
+    verifyPasswordResetCode(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     verifyTeamInvitationCode(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     acceptTeamInvitation(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     getTeamInvitationDetails(code: string): Promise<Result<{
         teamDisplayName: string;
     }, KnownErrors["VerificationCodeError"]>>;
-    verifyEmail(code: string): Promise<KnownErrors["VerificationCodeError"] | void>;
-    signInWithMagicLink(code: string): Promise<KnownErrors["VerificationCodeError"] | KnownErrors["InvalidTotpCode"] | void>;
+    verifyEmail(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
+    signInWithMagicLink(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"] | KnownErrors["InvalidTotpCode"]>>;
     redirectToOAuthCallback(): Promise<void>;
     useUser(options: GetUserOptions<HasTokenStore> & {
         or: 'redirect';

package/dist/lib/stack-app.d.ts

@@ -469,6 +469,8 @@ type Team = {
     id: string;
     displayName: string;
     profileImageUrl: string | null;
+    clientMetadata: any;
+    clientReadOnlyMetadata: any;
     inviteUser(options: {
         email: string;
     }): Promise<Result<undefined, KnownErrors["TeamPermissionRequired"]>>;
@@ -479,6 +481,7 @@ type Team = {
 type TeamUpdateOptions = {
     displayName?: string;
     profileImageUrl?: string | null;
+    clientMetadata?: ReadonlyJson;
 };
 type TeamCreateOptions = {
     displayName: string;
@@ -490,6 +493,7 @@ type ServerTeamUser = ServerUser & {
 };
 type ServerTeam = {
     createdAt: Date;
+    serverMetadata: any;
     listUsers(): Promise<ServerTeamUser[]>;
     useUsers(): ServerUser[];
     update(update: ServerTeamUpdateOptions): Promise<void>;
@@ -501,9 +505,9 @@ type ServerTeam = {
     removeUser(userId: string): Promise<void>;
 } & Team;
 type ServerTeamCreateOptions = TeamCreateOptions;
-type ServerTeamUpdateOptions = {
-    displayName?: string;
-    profileImageUrl?: string | null;
+type ServerTeamUpdateOptions = TeamUpdateOptions & {
+    clientReadOnlyMetadata?: ReadonlyJson;
+    serverMetadata?: ReadonlyJson;
 };
 type TeamPermission = {
     id: string;
@@ -554,27 +558,29 @@ type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         email: string;
         password: string;
         noRedirect?: boolean;
-    }): Promise<KnownErrors["EmailPasswordMismatch"] | KnownErrors["InvalidTotpCode"] | void>;
+    }): Promise<Result<undefined, KnownErrors["EmailPasswordMismatch"] | KnownErrors["InvalidTotpCode"]>>;
     signUpWithCredential(options: {
         email: string;
         password: string;
         noRedirect?: boolean;
-    }): Promise<KnownErrors["UserEmailAlreadyExists"] | KnownErrors["PasswordRequirementsNotMet"] | void>;
+    }): Promise<Result<undefined, KnownErrors["UserEmailAlreadyExists"] | KnownErrors["PasswordRequirementsNotMet"]>>;
     callOAuthCallback(): Promise<boolean>;
-    sendForgotPasswordEmail(email: string): Promise<KnownErrors["UserNotFound"] | void>;
-    sendMagicLinkEmail(email: string): Promise<KnownErrors["RedirectUrlNotWhitelisted"] | void>;
+    sendForgotPasswordEmail(email: string): Promise<Result<undefined, KnownErrors["UserNotFound"]>>;
+    sendMagicLinkEmail(email: string): Promise<Result<{
+        nonce: string;
+    }, KnownErrors["RedirectUrlNotWhitelisted"]>>;
     resetPassword(options: {
         code: string;
         password: string;
-    }): Promise<KnownErrors["VerificationCodeError"] | void>;
-    verifyPasswordResetCode(code: string): Promise<KnownErrors["VerificationCodeError"] | void>;
+    }): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
+    verifyPasswordResetCode(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     verifyTeamInvitationCode(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     acceptTeamInvitation(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
     getTeamInvitationDetails(code: string): Promise<Result<{
         teamDisplayName: string;
     }, KnownErrors["VerificationCodeError"]>>;
-    verifyEmail(code: string): Promise<KnownErrors["VerificationCodeError"] | void>;
-    signInWithMagicLink(code: string): Promise<KnownErrors["VerificationCodeError"] | KnownErrors["InvalidTotpCode"] | void>;
+    verifyEmail(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"]>>;
+    signInWithMagicLink(code: string): Promise<Result<undefined, KnownErrors["VerificationCodeError"] | KnownErrors["InvalidTotpCode"]>>;
     redirectToOAuthCallback(): Promise<void>;
     useUser(options: GetUserOptions<HasTokenStore> & {
         or: 'redirect';

package/dist/lib/stack-app.js

@@ -63,7 +63,7 @@ var import_url = require("../utils/url");
 var import_auth = require("./auth");
 var import_cookie = require("./cookie");
 var NextNavigation = (0, import_compile_time.scrambleDuringCompileTime)(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.5.37";
+var clientVersion = "js @stackframe/stack@2.6.0";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -565,6 +565,8 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       id: crud.id,
       displayName: crud.display_name,
       profileImageUrl: crud.profile_image_url,
+      clientMetadata: crud.client_metadata,
+      clientReadOnlyMetadata: crud.client_read_only_metadata,
       async inviteUser(options) {
         return await app._interface.sendTeamInvitation({
           teamId: crud.id,
@@ -885,32 +887,24 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   }
   async sendForgotPasswordEmail(email) {
     const redirectUrl = (0, import_url.constructRedirectUrl)(this.urls.passwordReset);
-    const error = await this._interface.sendForgotPasswordEmail(email, redirectUrl);
-    return error;
+    return await this._interface.sendForgotPasswordEmail(email, redirectUrl);
   }
   async sendMagicLinkEmail(email) {
     const magicLinkRedirectUrl = (0, import_url.constructRedirectUrl)(this.urls.magicLinkCallback);
-    const error = await this._interface.sendMagicLinkEmail(email, magicLinkRedirectUrl);
-    return error;
+    return await this._interface.sendMagicLinkEmail(email, magicLinkRedirectUrl);
   }
   async resetPassword(options) {
-    const error = await this._interface.resetPassword(options);
-    return error;
+    return await this._interface.resetPassword(options);
   }
   async verifyPasswordResetCode(code) {
     return await this._interface.verifyPasswordResetCode(code);
   }
   async verifyTeamInvitationCode(code) {
-    const result = await this._interface.acceptTeamInvitation({
+    return await this._interface.acceptTeamInvitation({
       type: "check",
       code,
       session: this._getSession()
     });
-    if (result.status === "ok") {
-      return import_results.Result.ok(void 0);
-    } else {
-      return import_results.Result.error(result.error);
-    }
   }
   async acceptTeamInvitation(code) {
     const result = await this._interface.acceptTeamInvitation({
@@ -1024,7 +1018,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       return await callback();
     } catch (e) {
       if (e instanceof import_stack_shared.KnownErrors.MultiFactorAuthenticationRequired) {
-        return await this._experimentalMfa(e, this._getSession());
+        return import_results.Result.ok(await this._experimentalMfa(e, this._getSession()));
       }
       throw e;
     }
@@ -1039,19 +1033,19 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       });
     } catch (e) {
       if (e instanceof import_stack_shared.KnownErrors.InvalidTotpCode) {
-        return e;
+        return import_results.Result.error(e);
       }
       throw e;
     }
-    if (!(result instanceof import_stack_shared.KnownError)) {
-      await this._signInToAccountWithTokens(result);
+    if (result.status === "ok") {
+      await this._signInToAccountWithTokens(result.data);
       if (!options.noRedirect) {
-        return await this.redirectToAfterSignIn({ replace: true });
-      } else {
-        return;
+        await this.redirectToAfterSignIn({ replace: true });
       }
+      return import_results.Result.ok(void 0);
+    } else {
+      return import_results.Result.error(result.error);
     }
-    return result;
   }
   async signUpWithCredential(options) {
     this._ensurePersistentTokenStore();
@@ -1063,15 +1057,15 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       emailVerificationRedirectUrl,
       session
     );
-    if (!(result instanceof import_stack_shared.KnownError)) {
-      await this._signInToAccountWithTokens(result);
+    if (result.status === "ok") {
+      await this._signInToAccountWithTokens(result.data);
       if (!options.noRedirect) {
-        return await this.redirectToAfterSignUp({ replace: true });
-      } else {
-        return;
+        await this.redirectToAfterSignUp({ replace: true });
       }
+      return import_results.Result.ok(void 0);
+    } else {
+      return import_results.Result.error(result.error);
     }
-    return result;
   }
   async signInWithMagicLink(code) {
     this._ensurePersistentTokenStore();
@@ -1082,18 +1076,20 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       });
     } catch (e) {
       if (e instanceof import_stack_shared.KnownErrors.InvalidTotpCode) {
-        return e;
+        return import_results.Result.error(e);
       }
       throw e;
     }
-    if (result instanceof import_stack_shared.KnownError) {
-      return result;
-    }
-    await this._signInToAccountWithTokens(result);
-    if (result.newUser) {
-      await this.redirectToAfterSignUp({ replace: true });
+    if (result.status === "ok") {
+      await this._signInToAccountWithTokens(result.data);
+      if (result.data.newUser) {
+        await this.redirectToAfterSignUp({ replace: true });
+      } else {
+        await this.redirectToAfterSignIn({ replace: true });
+      }
+      return import_results.Result.ok(void 0);
     } else {
-      await this.redirectToAfterSignIn({ replace: true });
+      return import_results.Result.error(result.error);
     }
   }
   async callOAuthCallback() {
@@ -1109,13 +1105,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
       throw e;
     }
-    if (result) {
-      console.log("OAuth callback result", result);
-      await this._signInToAccountWithTokens(result);
-      if ("afterCallbackRedirectUrl" in result && result.afterCallbackRedirectUrl) {
-        await _redirectTo(result.afterCallbackRedirectUrl, { replace: true });
+    if (result.status === "ok" && result.data) {
+      await this._signInToAccountWithTokens(result.data);
+      if ("afterCallbackRedirectUrl" in result.data && result.data.afterCallbackRedirectUrl) {
+        await _redirectTo(result.data.afterCallbackRedirectUrl, { replace: true });
         return true;
-      } else if (result.newUser) {
+      } else if (result.data.newUser) {
         await this.redirectToAfterSignUp({ replace: true });
         return true;
       } else {
@@ -1435,7 +1430,7 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
         return await app._checkFeatureSupport("sendVerificationEmail() on ServerUser", {});
       },
       async updatePassword(options) {
-        return await app._checkFeatureSupport("updatePassword() on ServerUser", {});
+        return await this.update({ password: options.newPassword });
       },
       async getTeamProfile(team) {
         const result = await app._serverUserTeamProfileCache.getOrWait([team.id, crud.id], "write-only");
@@ -1473,6 +1468,9 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       displayName: crud.display_name,
       profileImageUrl: crud.profile_image_url,
       createdAt: new Date(crud.created_at_millis),
+      clientMetadata: crud.client_metadata,
+      clientReadOnlyMetadata: crud.client_read_only_metadata,
+      serverMetadata: crud.server_metadata,
       async update(update) {
         await app._interface.updateServerTeam(crud.id, serverTeamUpdateOptionsToCrud(update));
         await app._serverTeamsCache.refresh([void 0]);
@@ -1983,7 +1981,8 @@ function apiKeyCreateOptionsToCrud(options) {
 function teamUpdateOptionsToCrud(options) {
   return {
     display_name: options.displayName,
-    profile_image_url: options.profileImageUrl
+    profile_image_url: options.profileImageUrl,
+    client_metadata: options.clientMetadata
   };
 }
 function teamCreateOptionsToCrud(options) {
@@ -1998,7 +1997,10 @@ function serverTeamCreateOptionsToCrud(options) {
 function serverTeamUpdateOptionsToCrud(options) {
   return {
     display_name: options.displayName,
-    profile_image_url: options.profileImageUrl
+    profile_image_url: options.profileImageUrl,
+    client_metadata: options.clientMetadata,
+    client_read_only_metadata: options.clientReadOnlyMetadata,
+    server_metadata: options.serverMetadata
   };
 }
 function serverTeamPermissionDefinitionCreateOptionsToCrud(options) {