@stackframe/stack 2.4.23 → 2.4.25

package/dist/esm/providers/stack-provider.js

@@ -13,7 +13,7 @@ function StackProvider({
   ] });
 }
 function UserFetcher(props) {
-  const userPromise = props.app.getUser().then((user) => user?.toJson() ?? null);
+  const userPromise = props.app.getUser().then((user) => user?.toClientJson() ?? null);
   return /* @__PURE__ */ jsx(UserSetter, { userJsonPromise: userPromise });
 }
 export {

package/dist/esm/providers/stack-provider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/providers/stack-provider.tsx"],"sourcesContent":["import React, { Suspense } from 'react';\nimport { StackClientApp, stackAppInternalsSymbol } from '../lib/stack-app';\nimport { StackProviderClient, UserSetter } from './stack-provider-client';\n\n\nexport default function StackProvider({\n  children,\n  app,\n}: {\n  children: React.ReactNode,\n  app: StackClientApp<true>,\n}) {\n  return (\n    <StackProviderClient appJson={app[stackAppInternalsSymbol].toClientJson()}>\n      <Suspense fallback={null}>\n        <UserFetcher app={app} />\n      </Suspense>\n      {children}\n    </StackProviderClient>\n  );\n}\n\nfunction UserFetcher(props: { app: StackClientApp<true> }) {\n  const userPromise = props.app.getUser().then((user) => user?.toJson() ?? null);\n  return <UserSetter userJsonPromise={userPromise} />;\n}\n"],"mappings":";AAAA,SAAgB,gBAAgB;AAChC,SAAyB,+BAA+B;AACxD,SAAS,qBAAqB,kBAAkB;AAW5C,SAEI,KAFJ;AARW,SAAR,cAA+B;AAAA,EACpC;AAAA,EACA;AACF,GAGG;AACD,SACE,qBAAC,uBAAoB,SAAS,IAAI,uBAAuB,EAAE,aAAa,GACtE;AAAA,wBAAC,YAAS,UAAU,MAClB,8BAAC,eAAY,KAAU,GACzB;AAAA,IACC;AAAA,KACH;AAEJ;AAEA,SAAS,YAAY,OAAsC;AACzD,QAAM,cAAc,MAAM,IAAI,QAAQ,EAAE,KAAK,CAAC,SAAS,MAAM,OAAO,KAAK,IAAI;AAC7E,SAAO,oBAAC,cAAW,iBAAiB,aAAa;AACnD;","names":[]}
+{"version":3,"sources":["../../../src/providers/stack-provider.tsx"],"sourcesContent":["import React, { Suspense } from 'react';\nimport { StackClientApp, stackAppInternalsSymbol } from '../lib/stack-app';\nimport { StackProviderClient, UserSetter } from './stack-provider-client';\n\n\nexport default function StackProvider({\n  children,\n  app,\n}: {\n  children: React.ReactNode,\n  app: StackClientApp<true>,\n}) {\n  return (\n    <StackProviderClient appJson={app[stackAppInternalsSymbol].toClientJson()}>\n      <Suspense fallback={null}>\n        <UserFetcher app={app} />\n      </Suspense>\n      {children}\n    </StackProviderClient>\n  );\n}\n\nfunction UserFetcher(props: { app: StackClientApp<true> }) {\n  const userPromise = props.app.getUser().then((user) => user?.toClientJson() ?? null);\n  return <UserSetter userJsonPromise={userPromise} />;\n}\n"],"mappings":";AAAA,SAAgB,gBAAgB;AAChC,SAAyB,+BAA+B;AACxD,SAAS,qBAAqB,kBAAkB;AAW5C,SAEI,KAFJ;AARW,SAAR,cAA+B;AAAA,EACpC;AAAA,EACA;AACF,GAGG;AACD,SACE,qBAAC,uBAAoB,SAAS,IAAI,uBAAuB,EAAE,aAAa,GACtE;AAAA,wBAAC,YAAS,UAAU,MAClB,8BAAC,eAAY,KAAU,GACzB;AAAA,IACC;AAAA,KACH;AAEJ;AAEA,SAAS,YAAY,OAAsC;AACzD,QAAM,cAAc,MAAM,IAAI,QAAQ,EAAE,KAAK,CAAC,SAAS,MAAM,aAAa,KAAK,IAAI;AACnF,SAAO,oBAAC,cAAW,iBAAiB,aAAa;AACnD;","names":[]}

package/dist/index.d.mts

@@ -8,6 +8,7 @@ export { default as EmailVerification } from './components-page/email-verificati
 export { default as PasswordReset } from './components-page/password-reset.mjs';
 export { default as ForgotPassword } from './components-page/forgot-password.mjs';
 export { default as MessageCard } from './components/message-cards/message-card.mjs';
+export { default as SelectedTeamSwitcher, default as TeamSwitcher } from './components/selected-team-switcher.mjs';
 export { default as CredentialSignIn } from './components/credential-sign-in.mjs';
 export { default as CredentialSignUp } from './components/credential-sign-up.mjs';
 export { default as OAuthButton } from './components/oauth-button.mjs';

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { default as EmailVerification } from './components-page/email-verificati
 export { default as PasswordReset } from './components-page/password-reset.js';
 export { default as ForgotPassword } from './components-page/forgot-password.js';
 export { default as MessageCard } from './components/message-cards/message-card.js';
+export { default as SelectedTeamSwitcher, default as TeamSwitcher } from './components/selected-team-switcher.js';
 export { default as CredentialSignIn } from './components/credential-sign-in.js';
 export { default as CredentialSignUp } from './components/credential-sign-up.js';
 export { default as OAuthButton } from './components/oauth-button.js';

package/dist/index.js

@@ -42,6 +42,7 @@ __export(src_exports, {
   OAuthGroup: () => import_oauth_group.default,
   PasswordField: () => import_password_field.default,
   PasswordReset: () => import_password_reset.default,
+  SelectedTeamSwitcher: () => import_selected_team_switcher.default,
   SignIn: () => import_sign_in.default,
   SignUp: () => import_sign_up.default,
   StackAdminApp: () => import_stack_app.StackAdminApp,
@@ -50,6 +51,7 @@ __export(src_exports, {
   StackProvider: () => import_stack_provider.default,
   StackServerApp: () => import_stack_app.StackServerApp,
   StackTheme: () => import_theme_provider.StackTheme,
+  TeamSwitcher: () => import_selected_team_switcher.default,
   UserButton: () => import_user_button.default,
   useComponents: () => import_component_provider.useComponents,
   useDesign: () => import_design_provider.useDesign,
@@ -67,6 +69,7 @@ var import_email_verification = __toESM(require("./components-page/email-verific
 var import_password_reset = __toESM(require("./components-page/password-reset"));
 var import_forgot_password = __toESM(require("./components-page/forgot-password"));
 var import_message_card = __toESM(require("./components/message-cards/message-card"));
+var import_selected_team_switcher = __toESM(require("./components/selected-team-switcher"));
 var import_credential_sign_in = __toESM(require("./components/credential-sign-in"));
 var import_credential_sign_up = __toESM(require("./components/credential-sign-up"));
 var import_oauth_button = __toESM(require("./components/oauth-button"));
@@ -92,6 +95,7 @@ __reExport(src_exports, require("./components-core"), module.exports);
   OAuthGroup,
   PasswordField,
   PasswordReset,
+  SelectedTeamSwitcher,
   SignIn,
   SignUp,
   StackAdminApp,
@@ -100,6 +104,7 @@ __reExport(src_exports, require("./components-core"), module.exports);
   StackProvider,
   StackServerApp,
   StackTheme,
+  TeamSwitcher,
   UserButton,
   useComponents,
   useDesign,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.tsx"],"sourcesContent":["export { default as StackProvider } from \"./providers/stack-provider\";\n\nexport { useUser, useStackApp } from \"./lib/hooks\";\nexport { StackClientApp, StackServerApp, StackAdminApp } from \"./lib/stack-app\";\n\nexport { default as StackHandler } from \"./components-page/stack-handler\";\nexport { default as SignIn } from \"./components-page/sign-in\";\nexport { default as SignUp } from \"./components-page/sign-up\";\nexport { default as EmailVerification } from \"./components-page/email-verification\";\nexport { default as PasswordReset } from \"./components-page/password-reset\";\nexport { default as ForgotPassword } from \"./components-page/forgot-password\";\nexport { default as MessageCard } from \"./components/message-cards/message-card\";\n\nexport { default as CredentialSignIn } from \"./components/credential-sign-in\";\nexport { default as CredentialSignUp } from \"./components/credential-sign-up\";\nexport { default as OAuthButton } from \"./components/oauth-button\";\nexport { default as OAuthGroup } from \"./components/oauth-group\";\nexport { default as PasswordField } from \"./components/password-field\";\nexport { default as UserButton } from \"./components/user-button\";\nexport { default as AccountSettings } from \"./components-page/account-settings\";\nexport { default as AuthPage } from \"./components-page/auth-page\";\n\nexport { useDesign } from './providers/design-provider';\nexport type { ColorPalette } from './providers/design-provider';\nexport { useComponents } from './providers/component-provider';\nexport { StackTheme } from './providers/theme-provider';\nexport type { ThemeConfig } from './providers/theme-provider';\n\nexport type { \n  CurrentUser, \n  Project, \n  ServerUser as ServerUser, \n  ApiKeySetFirstView, \n  ApiKeySet, \n  ServerTeam, \n  Team, \n  TeamMember,\n  ServerTeamMember,\n  ServerPermission as Permission,\n  ServerPermission,\n} from './lib/stack-app';\n\nexport * from './components-core';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyC;AAEzC,mBAAqC;AACrC,uBAA8D;AAE9D,2BAAwC;AACxC,qBAAkC;AAClC,qBAAkC;AAClC,gCAA6C;AAC7C,4BAAyC;AACzC,6BAA0C;AAC1C,0BAAuC;AAEvC,gCAA4C;AAC5C,gCAA4C;AAC5C,0BAAuC;AACvC,yBAAsC;AACtC,4BAAyC;AACzC,yBAAsC;AACtC,8BAA2C;AAC3C,uBAAoC;AAEpC,6BAA0B;AAE1B,gCAA8B;AAC9B,4BAA2B;AAiB3B,wBAAc,8BA1Cd;","names":[]}
+{"version":3,"sources":["../src/index.tsx"],"sourcesContent":["export { default as StackProvider } from \"./providers/stack-provider\";\n\nexport { useUser, useStackApp } from \"./lib/hooks\";\nexport { StackClientApp, StackServerApp, StackAdminApp } from \"./lib/stack-app\";\n\nexport { default as StackHandler } from \"./components-page/stack-handler\";\nexport { default as SignIn } from \"./components-page/sign-in\";\nexport { default as SignUp } from \"./components-page/sign-up\";\nexport { default as EmailVerification } from \"./components-page/email-verification\";\nexport { default as PasswordReset } from \"./components-page/password-reset\";\nexport { default as ForgotPassword } from \"./components-page/forgot-password\";\nexport { default as MessageCard } from \"./components/message-cards/message-card\";\nexport {\n  default as SelectedTeamSwitcher,\n  /**\n   * @deprecated This was renamed to `SelectedTeamSwitcher`.\n   */\n  default as TeamSwitcher\n} from \"./components/selected-team-switcher\";\n\n\nexport { default as CredentialSignIn } from \"./components/credential-sign-in\";\nexport { default as CredentialSignUp } from \"./components/credential-sign-up\";\nexport { default as OAuthButton } from \"./components/oauth-button\";\nexport { default as OAuthGroup } from \"./components/oauth-group\";\nexport { default as PasswordField } from \"./components/password-field\";\nexport { default as UserButton } from \"./components/user-button\";\nexport { default as AccountSettings } from \"./components-page/account-settings\";\nexport { default as AuthPage } from \"./components-page/auth-page\";\n\nexport { useDesign } from './providers/design-provider';\nexport type { ColorPalette } from './providers/design-provider';\nexport { useComponents } from './providers/component-provider';\nexport { StackTheme } from './providers/theme-provider';\nexport type { ThemeConfig } from './providers/theme-provider';\n\nexport type { \n  CurrentUser, \n  Project, \n  ServerUser as ServerUser, \n  ApiKeySetFirstView, \n  ApiKeySet, \n  ServerTeam, \n  Team, \n  TeamMember,\n  ServerTeamMember,\n  ServerPermission as Permission,\n  ServerPermission,\n} from './lib/stack-app';\n\nexport * from './components-core';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAyC;AAEzC,mBAAqC;AACrC,uBAA8D;AAE9D,2BAAwC;AACxC,qBAAkC;AAClC,qBAAkC;AAClC,gCAA6C;AAC7C,4BAAyC;AACzC,6BAA0C;AAC1C,0BAAuC;AACvC,oCAMO;AAGP,gCAA4C;AAC5C,gCAA4C;AAC5C,0BAAuC;AACvC,yBAAsC;AACtC,4BAAyC;AACzC,yBAAsC;AACtC,8BAA2C;AAC3C,uBAAoC;AAEpC,6BAA0B;AAE1B,gCAA8B;AAC9B,4BAA2B;AAiB3B,wBAAc,8BAlDd;","names":[]}

package/dist/lib/hooks.d.mts

@@ -7,14 +7,14 @@ import '@stackframe/stack-shared/dist/interface/serverInterface';
 import '@stackframe/stack-shared/dist/interface/crud/email-templates';
 import '@stackframe/stack-shared/dist/sessions';
 
+type GetUserOptions = GetUserOptions$1<true> & {
+    projectIdMustMatch?: string;
+};
 /**
  * Returns the current user object. Equivalent to `useStackApp().useUser()`.
  *
  * @returns the current user
  */
-type GetUserOptions = GetUserOptions$1 & {
-    projectIdMustMatch?: string;
-};
 declare function useUser(options: GetUserOptions & {
     or: 'redirect' | 'throw';
     projectIdMustMatch: "internal";

package/dist/lib/hooks.d.ts

@@ -7,14 +7,14 @@ import '@stackframe/stack-shared/dist/interface/serverInterface';
 import '@stackframe/stack-shared/dist/interface/crud/email-templates';
 import '@stackframe/stack-shared/dist/sessions';
 
+type GetUserOptions = GetUserOptions$1<true> & {
+    projectIdMustMatch?: string;
+};
 /**
  * Returns the current user object. Equivalent to `useStackApp().useUser()`.
  *
  * @returns the current user
  */
-type GetUserOptions = GetUserOptions$1 & {
-    projectIdMustMatch?: string;
-};
 declare function useUser(options: GetUserOptions & {
     or: 'redirect' | 'throw';
     projectIdMustMatch: "internal";

package/dist/lib/hooks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/hooks.ts"],"sourcesContent":["import { CurrentUser, GetUserOptions as AppGetUserOptions, StackClientApp, CurrentInternalUser } from \"./stack-app\";\nimport { StackContext } from \"../providers/stack-provider-client\";\nimport { useContext } from \"react\";\n\n/**\n * Returns the current user object. Equivalent to `useStackApp().useUser()`.\n * \n * @returns the current user\n */\n\ntype GetUserOptions = AppGetUserOptions & {\n  projectIdMustMatch?: string,\n}\n\nexport function useUser(options: GetUserOptions & { or: 'redirect' | 'throw', projectIdMustMatch: \"internal\" }): CurrentInternalUser;\nexport function useUser(options: GetUserOptions & { or: 'redirect' | 'throw' }): CurrentUser;\nexport function useUser(options: GetUserOptions & { projectIdMustMatch: \"internal\" }): CurrentInternalUser | null;\nexport function useUser(options?: GetUserOptions): CurrentUser | CurrentInternalUser | null;\nexport function useUser(options: GetUserOptions = {}): CurrentUser | CurrentInternalUser | null {\n  const stackApp = useStackApp(options);\n  if (options.projectIdMustMatch && stackApp.projectId !== options.projectIdMustMatch) {\n    throw new Error(\"Unexpected project ID in useStackApp: \" + stackApp.projectId);\n  }\n  if (options.projectIdMustMatch === \"internal\") {\n    return stackApp.useUser(options) as CurrentInternalUser;\n  } else {\n    return stackApp.useUser(options) as CurrentUser;\n  }\n}\n\n/**\n * Returns the current Stack app associated with the StackProvider.\n * \n * @returns the current Stack app\n */\nexport function useStackApp<ProjectId extends string>(options: { projectIdMustMatch?: ProjectId } = {}): StackClientApp<true, ProjectId> {\n  const context = useContext(StackContext);\n  if (context === null) {\n    throw new Error(\"useStackApp must be used within a StackProvider\");\n  }\n  const stackApp = context.app;\n  if (options.projectIdMustMatch && stackApp.projectId !== options.projectIdMustMatch) {\n    throw new Error(\"Unexpected project ID in useStackApp: \" + stackApp.projectId);\n  }\n  return stackApp as StackClientApp<true, ProjectId>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mCAA6B;AAC7B,mBAA2B;AAgBpB,SAAS,QAAQ,UAA0B,CAAC,GAA6C;AAC9F,QAAM,WAAW,YAAY,OAAO;AACpC,MAAI,QAAQ,sBAAsB,SAAS,cAAc,QAAQ,oBAAoB;AACnF,UAAM,IAAI,MAAM,2CAA2C,SAAS,SAAS;AAAA,EAC/E;AACA,MAAI,QAAQ,uBAAuB,YAAY;AAC7C,WAAO,SAAS,QAAQ,OAAO;AAAA,EACjC,OAAO;AACL,WAAO,SAAS,QAAQ,OAAO;AAAA,EACjC;AACF;AAOO,SAAS,YAAsC,UAA8C,CAAC,GAAoC;AACvI,QAAM,cAAU,yBAAW,yCAAY;AACvC,MAAI,YAAY,MAAM;AACpB,UAAM,IAAI,MAAM,iDAAiD;AAAA,EACnE;AACA,QAAM,WAAW,QAAQ;AACzB,MAAI,QAAQ,sBAAsB,SAAS,cAAc,QAAQ,oBAAoB;AACnF,UAAM,IAAI,MAAM,2CAA2C,SAAS,SAAS;AAAA,EAC/E;AACA,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../src/lib/hooks.ts"],"sourcesContent":["import { CurrentUser, GetUserOptions as AppGetUserOptions, StackClientApp, CurrentInternalUser } from \"./stack-app\";\nimport { StackContext } from \"../providers/stack-provider-client\";\nimport { useContext } from \"react\";\n\ntype GetUserOptions = AppGetUserOptions<true> & {\n  projectIdMustMatch?: string,\n};\n\n/**\n * Returns the current user object. Equivalent to `useStackApp().useUser()`.\n * \n * @returns the current user\n */\nexport function useUser(options: GetUserOptions & { or: 'redirect' | 'throw', projectIdMustMatch: \"internal\" }): CurrentInternalUser;\nexport function useUser(options: GetUserOptions & { or: 'redirect' | 'throw' }): CurrentUser;\nexport function useUser(options: GetUserOptions & { projectIdMustMatch: \"internal\" }): CurrentInternalUser | null;\nexport function useUser(options?: GetUserOptions): CurrentUser | CurrentInternalUser | null;\nexport function useUser(options: GetUserOptions = {}): CurrentUser | CurrentInternalUser | null {\n  const stackApp = useStackApp(options);\n  if (options.projectIdMustMatch && stackApp.projectId !== options.projectIdMustMatch) {\n    throw new Error(\"Unexpected project ID in useStackApp: \" + stackApp.projectId);\n  }\n  if (options.projectIdMustMatch === \"internal\") {\n    return stackApp.useUser(options) as CurrentInternalUser;\n  } else {\n    return stackApp.useUser(options) as CurrentUser;\n  }\n}\n\n/**\n * Returns the current Stack app associated with the StackProvider.\n * \n * @returns the current Stack app\n */\nexport function useStackApp<ProjectId extends string>(options: { projectIdMustMatch?: ProjectId } = {}): StackClientApp<true, ProjectId> {\n  const context = useContext(StackContext);\n  if (context === null) {\n    throw new Error(\"useStackApp must be used within a StackProvider\");\n  }\n  const stackApp = context.app;\n  if (options.projectIdMustMatch && stackApp.projectId !== options.projectIdMustMatch) {\n    throw new Error(\"Unexpected project ID in useStackApp: \" + stackApp.projectId);\n  }\n  return stackApp as StackClientApp<true, ProjectId>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mCAA6B;AAC7B,mBAA2B;AAepB,SAAS,QAAQ,UAA0B,CAAC,GAA6C;AAC9F,QAAM,WAAW,YAAY,OAAO;AACpC,MAAI,QAAQ,sBAAsB,SAAS,cAAc,QAAQ,oBAAoB;AACnF,UAAM,IAAI,MAAM,2CAA2C,SAAS,SAAS;AAAA,EAC/E;AACA,MAAI,QAAQ,uBAAuB,YAAY;AAC7C,WAAO,SAAS,QAAQ,OAAO;AAAA,EACjC,OAAO;AACL,WAAO,SAAS,QAAQ,OAAO;AAAA,EACjC;AACF;AAOO,SAAS,YAAsC,UAA8C,CAAC,GAAoC;AACvI,QAAM,cAAU,yBAAW,yCAAY;AACvC,MAAI,YAAY,MAAM;AACpB,UAAM,IAAI,MAAM,iDAAiD;AAAA,EACnE;AACA,QAAM,WAAW,QAAQ;AACzB,MAAI,QAAQ,sBAAsB,SAAS,cAAc,QAAQ,oBAAoB;AACnF,UAAM,IAAI,MAAM,2CAA2C,SAAS,SAAS;AAAA,EAC/E;AACA,SAAO;AACT;","names":[]}

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

@@ -1,5 +1,5 @@
-import { ServerUserJson, OAuthProviderConfigJson, KnownErrors } from '@stackframe/stack-shared';
-import { StandardProvider, UserJson, UserUpdateJson, ProjectJson, ProductionModeError, TeamJson, EmailConfigJson, DomainConfigJson, ClientProjectJson } from '@stackframe/stack-shared/dist/interface/clientInterface';
+import { KnownErrors, ServerUserJson, OAuthProviderConfigJson } from '@stackframe/stack-shared';
+import { StandardProvider, UserUpdateJson, UserJson, ProjectJson, ProductionModeError, TeamJson, EmailConfigJson, DomainConfigJson, ClientProjectJson } from '@stackframe/stack-shared/dist/interface/clientInterface';
 import { ReadonlyJson } from '@stackframe/stack-shared/dist/utils/json';
 import { ProjectUpdateOptions, ApiKeySetCreateOptions } from '@stackframe/stack-shared/dist/interface/adminInterface';
 import { ServerUserUpdateJson, ServerTeamCustomizableJson, ServerPermissionDefinitionCustomizableJson, ServerPermissionDefinitionJson, EmailTemplateType } from '@stackframe/stack-shared/dist/interface/serverInterface';
@@ -36,6 +36,7 @@ type OAuthScopesOnSignIn = {
     [key in StandardProvider]: string[];
 };
 type ProjectCurrentUser<ProjectId> = ProjectId extends "internal" ? CurrentInternalUser : CurrentUser;
+type ProjectCurrentServerUser<ProjectId> = ProjectId extends "internal" ? CurrentInternalServerUser : CurrentServerUser;
 type StackClientAppConstructorOptions<HasTokenStore extends boolean, ProjectId extends string> = {
     baseUrl?: string;
     projectId?: ProjectId;
@@ -68,10 +69,10 @@ type Session = {
 /**
  * Contains everything related to the current user session.
  */
-type Auth<T, C> = {
+type Auth = {
     readonly _internalSession: InternalSession;
     readonly currentSession: Session;
-    signOut(this: T): Promise<void>;
+    signOut(): Promise<void>;
     /**
      * Returns headers for sending authenticated HTTP requests to external servers. Most commonly used in cross-origin
      * requests. Similar to `getAuthJson`, but specifically for HTTP requests.
@@ -143,26 +144,12 @@ type Auth<T, C> = {
         accessToken: string | null;
         refreshToken: string | null;
     }>;
-    update(this: T, user: C): Promise<void>;
-    updateSelectedTeam(this: T, team: Team | null): Promise<void>;
-    sendVerificationEmail(this: T): Promise<KnownErrors["EmailAlreadyVerified"] | void>;
-    updatePassword(this: T, options: {
-        oldPassword: string;
-        newPassword: string;
-    }): Promise<KnownErrors["PasswordMismatch"] | KnownErrors["PasswordRequirementsNotMet"] | void>;
 };
-type InternalAuth<T> = {
-    createProject(this: T, newProject: ProjectUpdateOptions & {
-        displayName: string;
-    }): Promise<Project>;
-    listOwnedProjects(this: T): Promise<Project[]>;
-    useOwnedProjects(this: T): Project[];
-    onOwnedProjectsChange(this: T, callback: (projects: Project[]) => void): void;
-};
-type User = ({
+type User = {
     readonly projectId: string;
     readonly id: string;
     readonly displayName: string | null;
+    setDisplayName(displayName: string): Promise<void>;
     /**
      * The user's email address.
      *
@@ -170,71 +157,87 @@ type User = ({
      */
     readonly primaryEmail: string | null;
     readonly primaryEmailVerified: boolean;
+    sendVerificationEmail(): Promise<KnownErrors["EmailAlreadyVerified"] | void>;
     readonly profileImageUrl: string | null;
     readonly signedUpAt: Date;
     readonly clientMetadata: ReadonlyJson;
-    readonly authMethod: 'credential' | 'oauth';
-    readonly hasPassword: boolean;
+    setClientMetadata(metadata: ReadonlyJson): Promise<void>;
+    /**
+     * Whether the primary e-mail can be used for authentication.
+     */
     readonly authWithEmail: boolean;
+    /**
+     * Whether the user has a password set.
+     */
+    readonly hasPassword: boolean;
     readonly oauthProviders: readonly string[];
-    hasPermission(this: CurrentUser, scope: Team, permissionId: string): Promise<boolean>;
-    getSelectedTeam(this: CurrentUser): Promise<Team | null>;
-    useSelectedTeam(this: CurrentUser): Team | null;
-    getConnection(id: StandardProvider, options?: {
-        scopes?: string[];
-    }): Promise<OAuthConnection | null>;
-    getConnection(id: StandardProvider, options: {
+    updatePassword(options: {
+        oldPassword: string;
+        newPassword: string;
+    }): Promise<KnownErrors["PasswordMismatch"] | KnownErrors["PasswordRequirementsNotMet"] | void>;
+    /**
+     * A shorthand method to update multiple fields of the user at once.
+     */
+    update(update: UserUpdateJson): Promise<void>;
+    hasPermission(scope: Team, permissionId: string): Promise<boolean>;
+    readonly selectedTeam: Team | null;
+    setSelectedTeam(team: Team | null): Promise<void>;
+    getConnectedAccount(id: StandardProvider, options: {
         or: 'redirect';
         scopes?: string[];
     }): Promise<OAuthConnection>;
-    getConnection(id: StandardProvider, options?: {
-        or?: 'redirect';
+    getConnectedAccount(id: StandardProvider, options?: {
+        or?: 'redirect' | 'throw' | 'return-null';
         scopes?: string[];
     }): Promise<OAuthConnection | null>;
-    useConnection(id: StandardProvider, options?: {
-        scopes?: string[];
-    }): OAuthConnection | null;
-    useConnection(id: StandardProvider, options: {
+    useConnectedAccount(id: StandardProvider, options: {
         or: 'redirect';
         scopes?: string[];
     }): OAuthConnection;
-    useConnection(id: StandardProvider, options?: {
-        or?: 'redirect';
+    useConnectedAccount(id: StandardProvider, options?: {
+        or?: 'redirect' | 'throw' | 'return-null';
         scopes?: string[];
     }): OAuthConnection | null;
-    toJson(this: CurrentUser): UserJson;
-} & AsyncStoreProperty<"team", [id: string], Team | null, false> & AsyncStoreProperty<"teams", [], Team[], true> & Omit<AsyncStoreProperty<"permission", [scope: Team, permissionId: string, options?: {
+    toClientJson(): UserJson;
+} & AsyncStoreProperty<"team", [id: string], Team | null, false> & AsyncStoreProperty<"teams", [], Team[], true> & AsyncStoreProperty<"permission", [scope: Team, permissionId: string, options?: {
     direct?: boolean;
-}], Permission | null, false>, "onPermissionChange"> & Omit<AsyncStoreProperty<"permissions", [scope: Team, options?: {
+}], Permission | null, false> & AsyncStoreProperty<"permissions", [scope: Team, options?: {
     direct?: boolean;
-}], Permission[], true>, "onPermissionsChange">);
-type CurrentUser = Auth<User, UserUpdateJson> & User;
-type CurrentInternalUser = CurrentUser & InternalAuth<CurrentUser>;
+}], Permission[], true>;
+type InternalUserExtra = {
+    createProject(newProject: ProjectUpdateOptions & {
+        displayName: string;
+    }): Promise<Project>;
+} & AsyncStoreProperty<"ownedProjects", [], Project[], true>;
+type CurrentUser = Auth & User;
+type CurrentInternalUser = CurrentUser & InternalUserExtra;
 /**
  * A user including sensitive fields that should only be used on the server, never sent to the client
  * (such as sensitive information and serverMetadata).
  */
-type ServerUser = (Omit<User, 'hasPermission' | 'toJson' | keyof AsyncStoreProperty<"team", [], Team | null, false> | keyof AsyncStoreProperty<"teams", [], Team[], true> | keyof AsyncStoreProperty<"permission", [], Permission[], false> | keyof AsyncStoreProperty<"permissions", [], Permission[], true>> & {
+type ServerUser = {
+    setPrimaryEmail(email: string, options?: {
+        verified?: boolean | undefined;
+    }): Promise<void>;
     readonly serverMetadata: ReadonlyJson;
-    /**
-     * Returns a new user object with the sensitive fields removed.
-     */
-    getClientUser(this: ServerUser): User;
-    update(this: ServerUser, user: Partial<ServerUserUpdateJson>): Promise<void>;
-    delete(this: ServerUser): Promise<void>;
+    setServerMetadata(metadata: ReadonlyJson): Promise<void>;
+    updatePassword(options: {
+        oldPassword?: string;
+        newPassword: string;
+    }): Promise<KnownErrors["PasswordMismatch"] | KnownErrors["PasswordRequirementsNotMet"] | void>;
+    update(user: Partial<ServerUserUpdateJson>): Promise<void>;
+    delete(): Promise<void>;
     grantPermission(scope: Team, permissionId: string): Promise<void>;
     revokePermission(scope: Team, permissionId: string): Promise<void>;
     hasPermission(scope: Team, permissionId: string): Promise<boolean>;
-    toJson(this: ServerUser): ServerUserJson;
-} & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & Omit<AsyncStoreProperty<"permission", [scope: Team, permissionId: string, options?: {
+    toServerJson(): ServerUserJson;
+} & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & AsyncStoreProperty<"permission", [scope: Team, permissionId: string, options?: {
     direct?: boolean;
-}], ServerPermission | null, false>, "onPermissionChange"> & Omit<AsyncStoreProperty<"permissions", [scope: Team, options?: {
+}], ServerPermission | null, false> & AsyncStoreProperty<"permissions", [scope: Team, options?: {
     direct?: boolean;
-}], ServerPermission[], true>, "onPermissionsChange">);
-type CurrentServerUser = Auth<ServerUser, ServerUserUpdateJson> & Omit<ServerUser, "getClientUser"> & {
-    getClientUser(this: CurrentServerUser): CurrentUser;
-};
-type CurrentInternalServerUser = CurrentServerUser & InternalAuth<CurrentServerUser>;
+}], ServerPermission[], true> & User;
+type CurrentServerUser = Auth & ServerUser;
+type CurrentInternalServerUser = CurrentServerUser & InternalUserExtra;
 type Project = {
     readonly id: string;
     readonly displayName: string;
@@ -260,7 +263,7 @@ type Team = {
     id: string;
     displayName: string;
     createdAt: Date;
-    toJson(this: Team): TeamJson;
+    toJson(): TeamJson;
 };
 type ServerTeam = Team & {
     listMembers(): Promise<ServerTeamMember[]>;
@@ -276,7 +279,7 @@ type TeamMember = {
     displayName: string | null;
 };
 type ServerTeamMember = TeamMember & {
-    getUser(): Promise<ServerUser>;
+    user: ServerUser;
 };
 type Permission = {
     id: string;
@@ -331,14 +334,14 @@ type ApiKeySet = ApiKeySetBase & {
 type EmailConfig = EmailConfigJson;
 type DomainConfig = DomainConfigJson;
 type OAuthProviderConfig = OAuthProviderConfigJson;
-type GetUserOptions = {
+type GetUserOptions<HasTokenStore> = {
     or?: 'redirect' | 'throw' | 'return-null';
     tokenStore?: TokenStoreInit;
-};
+} & (HasTokenStore extends false ? {
+    tokenStore: TokenStoreInit;
+} : {});
 type AsyncStoreProperty<Name extends string, Args extends any[], Value, IsMultiple extends boolean> = {
     [key in `${IsMultiple extends true ? "list" : "get"}${Capitalize<Name>}`]: (...args: Args) => Promise<Value>;
-} & {
-    [key in `on${Capitalize<Name>}Change`]: (...tupleArgs: [...args: Args, callback: (value: Value) => void]) => void;
 } & {
     [key in `use${Capitalize<Name>}`]: (...args: Args) => Value;
 };
@@ -371,36 +374,34 @@ type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId extends s
     verifyPasswordResetCode(code: string): Promise<KnownErrors["PasswordResetCodeError"] | void>;
     verifyEmail(code: string): Promise<KnownErrors["EmailVerificationError"] | void>;
     signInWithMagicLink(code: string): Promise<KnownErrors["MagicLinkError"] | void>;
-    [stackAppInternalsSymbol]: {
-        toClientJson(): StackClientAppJson<HasTokenStore, ProjectId>;
-        setCurrentUser(userJsonPromise: Promise<UserJson | null>): void;
-    };
-} & AsyncStoreProperty<"project", [], ClientProjectJson, false> & {
-    [K in `redirectTo${Capitalize<keyof Omit<HandlerUrls, 'handler' | 'oauthCallback'>>}`]: (options?: RedirectToOptions) => Promise<void>;
-} & (HasTokenStore extends false ? {} : {
     redirectToOAuthCallback(): Promise<void>;
-    useUser(options: GetUserOptions & {
+    useUser(options: GetUserOptions<HasTokenStore> & {
         or: 'redirect';
     }): ProjectCurrentUser<ProjectId>;
-    useUser(options: GetUserOptions & {
+    useUser(options: GetUserOptions<HasTokenStore> & {
         or: 'throw';
     }): ProjectCurrentUser<ProjectId>;
-    useUser(options?: GetUserOptions): ProjectCurrentUser<ProjectId> | null;
-    getUser(options: GetUserOptions & {
+    useUser(options?: GetUserOptions<HasTokenStore>): ProjectCurrentUser<ProjectId> | null;
+    getUser(options: GetUserOptions<HasTokenStore> & {
         or: 'redirect';
     }): Promise<ProjectCurrentUser<ProjectId>>;
-    getUser(options: GetUserOptions & {
+    getUser(options: GetUserOptions<HasTokenStore> & {
         or: 'throw';
     }): Promise<ProjectCurrentUser<ProjectId>>;
-    getUser(options?: GetUserOptions): Promise<ProjectCurrentUser<ProjectId> | null>;
-    onUserChange: AsyncStoreProperty<"user", [], CurrentUser | null, false>["onUserChange"];
-}));
+    getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentUser<ProjectId> | null>;
+    [stackAppInternalsSymbol]: {
+        toClientJson(): StackClientAppJson<HasTokenStore, ProjectId>;
+        setCurrentUser(userJsonPromise: Promise<UserJson | null>): void;
+    };
+} & AsyncStoreProperty<"project", [], ClientProjectJson, false> & {
+    [K in `redirectTo${Capitalize<keyof Omit<HandlerUrls, 'handler' | 'oauthCallback'>>}`]: (options?: RedirectToOptions) => Promise<void>;
+});
 declare const StackClientApp: StackClientAppConstructor;
 type StackServerAppConstructor = {
     new <TokenStoreType extends string, HasTokenStore extends (TokenStoreType extends {} ? true : boolean), ProjectId extends string>(options: StackServerAppConstructorOptions<HasTokenStore, ProjectId>): StackServerApp<HasTokenStore, ProjectId>;
     new (options: StackServerAppConstructorOptions<boolean, string>): StackServerApp<boolean, string>;
 };
-type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends string = string> = (StackClientApp<HasTokenStore, ProjectId> & {
+type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends string = string> = ({
     createTeam(data: ServerTeamCustomizableJson): Promise<ServerTeam>;
     createPermissionDefinition(data: ServerPermissionDefinitionCustomizableJson): Promise<ServerPermission>;
     updatePermissionDefinition(permissionId: string, data: Partial<ServerPermissionDefinitionCustomizableJson>): Promise<void>;
@@ -411,7 +412,25 @@ type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends s
     listEmailTemplates(): Promise<ListEmailTemplatesCrud['Server']['Read']>;
     updateEmailTemplate(type: EmailTemplateType, data: EmailTemplateCrud['Server']['Update']): Promise<void>;
     resetEmailTemplate(type: EmailTemplateType): Promise<void>;
-} & AsyncStoreProperty<"serverUser", [], CurrentServerUser | null, false> & AsyncStoreProperty<"serverUsers", [], ServerUser[], true> & Omit<AsyncStoreProperty<"team", [id: string], ServerTeam | null, false>, "onTeamChange"> & Omit<AsyncStoreProperty<"teams", [], ServerTeam[], true>, "onTeamsChange">);
+    /**
+     * @deprecated use `getUser()` instead
+     */
+    getServerUser(): Promise<ProjectCurrentServerUser<ProjectId> | null>;
+    useUser(options: GetUserOptions<HasTokenStore> & {
+        or: 'redirect';
+    }): ProjectCurrentServerUser<ProjectId>;
+    useUser(options: GetUserOptions<HasTokenStore> & {
+        or: 'throw';
+    }): ProjectCurrentServerUser<ProjectId>;
+    useUser(options?: GetUserOptions<HasTokenStore>): ProjectCurrentServerUser<ProjectId> | null;
+    getUser(options: GetUserOptions<HasTokenStore> & {
+        or: 'redirect';
+    }): Promise<ProjectCurrentServerUser<ProjectId>>;
+    getUser(options: GetUserOptions<HasTokenStore> & {
+        or: 'throw';
+    }): Promise<ProjectCurrentServerUser<ProjectId>>;
+    getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentServerUser<ProjectId> | null>;
+} & StackClientApp<HasTokenStore, ProjectId> & AsyncStoreProperty<"users", [], ServerUser[], true> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true>);
 declare const StackServerApp: StackServerAppConstructor;
 type StackAdminAppConstructor = {
     new <HasTokenStore extends boolean, ProjectId extends string>(options: StackAdminAppConstructorOptions<HasTokenStore, ProjectId>): StackAdminApp<HasTokenStore, ProjectId>;