@stackframe/stack 2.7.12 → 2.7.14

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

@@ -14,6 +14,7 @@ type RequestLike = {
         get: (name: string) => string | null;
     };
 };
+type RedirectMethod = "window" | "nextjs" | "none";
 type TokenStoreInit<HasTokenStore extends boolean = boolean> = HasTokenStore extends true ? ("cookie" | "nextjs-cookie" | "memory" | RequestLike | {
     accessToken: string;
     refreshToken: string;
@@ -48,6 +49,7 @@ type StackClientAppConstructorOptions<HasTokenStore extends boolean, ProjectId e
     urls?: Partial<HandlerUrls>;
     oauthScopesOnSignIn?: Partial<OAuthScopesOnSignIn>;
     tokenStore: TokenStoreInit<HasTokenStore>;
+    redirectMethod?: RedirectMethod;
     /**
      * By default, the Stack app will automatically prefetch some data from Stack's server when this app is first
      * constructed. This improves the performance of your app, but will create network requests that are unnecessary if
@@ -184,7 +186,9 @@ type Auth = {
         accessToken: string | null;
         refreshToken: string | null;
     }>;
-    registerPasskey(): Promise<Result<undefined, KnownErrors["PasskeyRegistrationFailed"] | KnownErrors["PasskeyWebAuthnError"]>>;
+    registerPasskey(options?: {
+        hostname?: string;
+    }): Promise<Result<undefined, KnownErrors["PasskeyRegistrationFailed"] | KnownErrors["PasskeyWebAuthnError"]>>;
 };
 /**
  * ```
@@ -307,7 +311,7 @@ type UserUpdateOptions = {
     passkeyAuthEnabled?: boolean;
 };
 type ServerBaseUser = {
-    setPrimaryEmail(email: string, options?: {
+    setPrimaryEmail(email: string | null, options?: {
         verified?: boolean | undefined;
     }): Promise<void>;
     readonly lastActiveAt: Date;
@@ -339,7 +343,7 @@ type ServerUser = ServerBaseUser & BaseUser & UserExtra;
 type CurrentServerUser = Auth & ServerUser;
 type CurrentInternalServerUser = CurrentServerUser & InternalUserExtra;
 type ServerUserUpdateOptions = {
-    primaryEmail?: string;
+    primaryEmail?: string | null;
     primaryEmailVerified?: boolean;
     primaryEmailAuthEnabled?: boolean;
     clientReadOnlyMetadata?: ReadonlyJson;
@@ -347,7 +351,7 @@ type ServerUserUpdateOptions = {
     password?: string;
 } & UserUpdateOptions;
 type ServerUserCreateOptions = {
-    primaryEmail?: string;
+    primaryEmail?: string | null;
     primaryEmailAuthEnabled?: boolean;
     password?: string;
     otpAuthEnabled?: boolean;
@@ -699,12 +703,12 @@ type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         or: 'throw';
     }): Promise<ProjectCurrentServerUser<ProjectId>>;
     getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentServerUser<ProjectId> | null>;
-    listUsers(options?: ServerListUsersOptions): Promise<ServerUser[] & {
-        nextCursor: string | null;
-    }>;
     useUsers(options?: ServerListUsersOptions): ServerUser[] & {
         nextCursor: string | null;
     };
+    listUsers(options?: ServerListUsersOptions): Promise<ServerUser[] & {
+        nextCursor: string | null;
+    }>;
 } & AsyncStoreProperty<"user", [id: string], ServerUser | null, false> & Omit<AsyncStoreProperty<"users", [], ServerUser[], true>, "listUsers" | "useUsers"> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & StackClientApp<HasTokenStore, ProjectId>);
 declare const StackServerApp: StackServerAppConstructor;
 type StackAdminAppConstructor = {
@@ -757,4 +761,4 @@ type EmailConfig = {
     senderName: string;
 };
 
-export { type AdminDomainConfig, type AdminEmailConfig, type AdminOAuthProviderConfig, type AdminOwnedProject, type AdminProject, type AdminProjectConfig, type AdminProjectConfigUpdateOptions, type AdminProjectCreateOptions, type AdminProjectUpdateOptions, type AdminTeamPermission, type AdminTeamPermissionDefinition, type AdminTeamPermissionDefinitionCreateOptions, type AdminTeamPermissionDefinitionUpdateOptions, type ApiKey, type ApiKeyBase, type ApiKeyBaseCrudRead, type ApiKeyCreateOptions, type ApiKeyFirstView, type Connection, type CurrentInternalServerUser, type CurrentInternalUser, type CurrentServerUser, type CurrentUser, type EditableTeamMemberProfile, type GetUserOptions, type HandlerUrls, type OAuthConnection, type OAuthProviderConfig, type OAuthScopesOnSignIn, type Project, type ProjectConfig, type ServerListUsersOptions, type ServerTeam, type ServerTeamCreateOptions, type ServerTeamMemberProfile, type ServerTeamUpdateOptions, type ServerTeamUser, type ServerUser, StackAdminApp, type StackAdminAppConstructorOptions, StackClientApp, type StackClientAppConstructorOptions, type StackClientAppJson, StackServerApp, type StackServerAppConstructorOptions, type Team, type TeamCreateOptions, type TeamInvitation, type TeamMemberProfile, type TeamPermission, type TeamUpdateOptions, type TeamUser, type TokenStoreInit, type User, serverTeamPermissionDefinitionCreateOptionsToCrud, serverTeamPermissionDefinitionUpdateOptionsToCrud, stackAppInternalsSymbol };
+export { type AdminDomainConfig, type AdminEmailConfig, type AdminOAuthProviderConfig, type AdminOwnedProject, type AdminProject, type AdminProjectConfig, type AdminProjectConfigUpdateOptions, type AdminProjectCreateOptions, type AdminProjectUpdateOptions, type AdminTeamPermission, type AdminTeamPermissionDefinition, type AdminTeamPermissionDefinitionCreateOptions, type AdminTeamPermissionDefinitionUpdateOptions, type ApiKey, type ApiKeyBase, type ApiKeyBaseCrudRead, type ApiKeyCreateOptions, type ApiKeyFirstView, type Connection, type CurrentInternalServerUser, type CurrentInternalUser, type CurrentServerUser, type CurrentUser, type EditableTeamMemberProfile, type GetUserOptions, type HandlerUrls, type OAuthConnection, type OAuthProviderConfig, type OAuthScopesOnSignIn, type Project, type ProjectConfig, type ServerListUsersOptions, type ServerTeam, type ServerTeamCreateOptions, type ServerTeamMemberProfile, type ServerTeamUpdateOptions, type ServerTeamUser, type ServerUser, StackAdminApp, type StackAdminAppConstructor, type StackAdminAppConstructorOptions, StackClientApp, type StackClientAppConstructor, type StackClientAppConstructorOptions, type StackClientAppJson, StackServerApp, type StackServerAppConstructor, type StackServerAppConstructorOptions, type Team, type TeamCreateOptions, type TeamInvitation, type TeamMemberProfile, type TeamPermission, type TeamUpdateOptions, type TeamUser, type TokenStoreInit, type User, serverTeamPermissionDefinitionCreateOptionsToCrud, serverTeamPermissionDefinitionUpdateOptionsToCrud, stackAppInternalsSymbol };

package/dist/lib/stack-app.js

@@ -64,7 +64,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.7.12";
+var clientVersion = "js @stackframe/stack@2.7.14";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -89,18 +89,6 @@ function getUrls(partial) {
     ...(0, import_objects.filterUndefined)(partial)
   };
 }
-async function _redirectTo(url, options) {
-  if (import_stack_sc.isReactServer) {
-    NextNavigation.redirect(url.toString(), options?.replace ? NextNavigation.RedirectType.replace : NextNavigation.RedirectType.push);
-  } else {
-    if (options?.replace) {
-      window.location.replace(url);
-    } else {
-      window.location.assign(url);
-    }
-    await (0, import_promises.wait)(2e3);
-  }
-}
 function getDefaultProjectId() {
   return process.env.NEXT_PUBLIC_STACK_PROJECT_ID || (0, import_errors.throwErr)(new Error("Welcome to Stack Auth! It seems that you haven't provided a project ID. Please create a project on the Stack dashboard at https://app.stack-auth.com and put it in the NEXT_PUBLIC_STACK_PROJECT_ID environment variable."));
 }
@@ -114,7 +102,8 @@ function getDefaultSuperSecretAdminKey() {
   return process.env.STACK_SUPER_SECRET_ADMIN_KEY || (0, import_errors.throwErr)(new Error("No super secret admin key provided. Please copy your key from the Stack dashboard and put it in the STACK_SUPER_SECRET_ADMIN_KEY environment variable."));
 }
 function getDefaultBaseUrl() {
-  return process.env.NEXT_PUBLIC_STACK_API_URL || process.env.NEXT_PUBLIC_STACK_URL || defaultBaseUrl;
+  const url = process.env.NEXT_PUBLIC_STACK_API_URL || process.env.NEXT_PUBLIC_STACK_URL || defaultBaseUrl;
+  return url.endsWith("/") ? url.slice(0, -1) : url;
 }
 var defaultBaseUrl = "https://api.stack-auth.com";
 function createEmptyTokenStore() {
@@ -272,6 +261,8 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       });
     }
     this._tokenStoreInit = _options.tokenStore;
+    this._redirectMethod = _options.redirectMethod || "none";
+    this._redirectMethod = _options.redirectMethod || "nextjs";
     this._urlOptions = _options.urls ?? {};
     this._oauthScopesOnSignIn = _options.oauthScopesOnSignIn ?? {};
     if (_options.uniqueIdentifier) {
@@ -285,6 +276,13 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
     }
   }
+  async _createCookieHelper() {
+    if (this._tokenStoreInit === "nextjs-cookie" || this._tokenStoreInit === "cookie") {
+      return await (0, import_cookie.createCookieHelper)();
+    } else {
+      return await (0, import_cookie.createEmptyCookieHelper)();
+    }
+  }
   async _getUserOAuthConnectionCacheFn(options) {
     const user = await options.getUser();
     let hasConnection = true;
@@ -522,7 +520,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     return session;
   }
   async _getSession(overrideTokenStoreInit) {
-    const tokenStore = this._getOrCreateTokenStore(await (0, import_cookie.createCookieHelper)(), overrideTokenStoreInit);
+    const tokenStore = this._getOrCreateTokenStore(await this._createCookieHelper(), overrideTokenStoreInit);
     return this._getSessionFromTokenStore(tokenStore);
   }
   _useSession(overrideTokenStoreInit) {
@@ -540,7 +538,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     if (!("accessToken" in tokens) || !("refreshToken" in tokens)) {
       throw new import_errors.StackAssertionError("Invalid tokens object; can't sign in with this", { tokens });
     }
-    const tokenStore = this._getOrCreateTokenStore(await (0, import_cookie.createCookieHelper)());
+    const tokenStore = this._getOrCreateTokenStore(await this._createCookieHelper());
     tokenStore.set(tokens);
   }
   _hasPersistentTokenStore(overrideTokenStoreInit) {
@@ -610,8 +608,8 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       clientMetadata: crud.client_metadata,
       clientReadOnlyMetadata: crud.client_read_only_metadata,
       async inviteUser(options) {
-        if (!options.callbackUrl && typeof window === "undefined") {
-          throw new Error("Cannot invite user without a callback URL from the server. Make sure you pass the `callbackUrl` option: `inviteUser({ email, callbackUrl: ... })`");
+        if (!options.callbackUrl && !await app._getCurrentUrl()) {
+          throw new Error("Cannot invite user without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `inviteUser({ email, callbackUrl: ... })`");
         }
         await app._interface.sendTeamInvitation({
           teamId: crud.id,
@@ -691,7 +689,11 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         const tokens = await this.currentSession.getTokens();
         return tokens;
       },
-      async registerPasskey() {
+      async registerPasskey(options) {
+        const hostname = (await app._getCurrentUrl())?.hostname;
+        if (!hostname) {
+          throw new import_errors.StackAssertionError("hostname must be provided if the Stack App does not have a redirect method");
+        }
         const initiationResult = await app._interface.initiatePasskeyRegistration({}, session);
         if (initiationResult.status !== "ok") {
           return import_results.Result.error(new import_stack_shared.KnownErrors.PasskeyRegistrationFailed("Failed to get initiation options for passkey registration"));
@@ -700,7 +702,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         if (options_json.rp.id !== "THIS_VALUE_WILL_BE_REPLACED.example.com") {
           throw new import_errors.StackAssertionError(`Expected returned RP ID from server to equal sentinel, but found ${options_json.rp.id}`);
         }
-        options_json.rp.id = window.location.hostname;
+        options_json.rp.id = hostname;
         let attResp;
         try {
           attResp = await (0, import_browser.startRegistration)({ optionsJSON: options_json });
@@ -839,8 +841,8 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         if (!crud.primary_email) {
           throw new import_errors.StackAssertionError("User does not have a primary email");
         }
-        if (!options?.callbackUrl && typeof window === "undefined") {
-          throw new Error("Cannot send verification email without a callback URL from the server. Make sure you pass the `callbackUrl` option: `sendVerificationEmail({ callbackUrl: ... })`");
+        if (!options?.callbackUrl && !await app._getCurrentUrl()) {
+          throw new Error("Cannot send verification email without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `sendVerificationEmail({ callbackUrl: ... })`");
         }
         return await app._interface.sendVerificationEmail(crud.primary_email, options?.callbackUrl ?? (0, import_url.constructRedirectUrl)(app.urls.emailVerification), session);
       },
@@ -928,11 +930,32 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   get urls() {
     return getUrls(this._urlOptions);
   }
+  async _getCurrentUrl() {
+    if (this._redirectMethod === "none") {
+      return null;
+    }
+    return new URL(window.location.href);
+  }
+  async _redirectTo(options) {
+    if (this._redirectMethod === "none") {
+      return;
+    }
+    if (import_stack_sc.isReactServer && this._redirectMethod === "nextjs") {
+      NextNavigation.redirect(options.url.toString(), options.replace ? NextNavigation.RedirectType.replace : NextNavigation.RedirectType.push);
+    } else {
+      if (options.replace) {
+        window.location.replace(options.url);
+      } else {
+        window.location.assign(options.url);
+      }
+      await (0, import_promises.wait)(2e3);
+    }
+  }
   async _redirectIfTrusted(url, options) {
     if (!await this._isTrusted(url)) {
       throw new Error(`Redirect URL ${url} is not trusted; should be relative.`);
     }
-    return await _redirectTo(url, options);
+    return await this._redirectTo({ url, ...options });
   }
   async _redirectToHandler(handlerName, options) {
     let url = this.urls[handlerName];
@@ -1016,14 +1039,14 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     return await this._redirectToHandler("teamInvitation", options);
   }
   async sendForgotPasswordEmail(email, options) {
-    if (!options?.callbackUrl && typeof window === "undefined") {
-      throw new Error("Cannot send forgot password email without a callback URL from the server. Make sure you pass the `callbackUrl` option: `sendForgotPasswordEmail({ email, callbackUrl: ... })`");
+    if (!options?.callbackUrl && !await this._getCurrentUrl()) {
+      throw new Error("Cannot send forgot password email without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `sendForgotPasswordEmail({ email, callbackUrl: ... })`");
     }
     return await this._interface.sendForgotPasswordEmail(email, options?.callbackUrl ?? (0, import_url.constructRedirectUrl)(this.urls.passwordReset));
   }
   async sendMagicLinkEmail(email, options) {
-    if (!options?.callbackUrl && typeof window === "undefined") {
-      throw new Error("Cannot send magic link email without a callback URL from the server. Make sure you pass the `callbackUrl` option: `sendMagicLinkEmail({ email, callbackUrl: ... })`");
+    if (!options?.callbackUrl && !await this._getCurrentUrl()) {
+      throw new Error("Cannot send magic link email without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `sendMagicLinkEmail({ email, callbackUrl: ... })`");
     }
     return await this._interface.sendMagicLinkEmail(email, options?.callbackUrl ?? (0, import_url.constructRedirectUrl)(this.urls.magicLinkCallback));
   }
@@ -1120,6 +1143,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     return res;
   }
   async signInWithOAuth(provider) {
+    if (typeof window === "undefined") {
+      throw new Error("signInWithOAuth can currently only be called in a browser environment");
+    }
     this._ensurePersistentTokenStore();
     await (0, import_auth.signInWithOAuth)(
       this._interface,
@@ -1263,6 +1289,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     }
   }
   async callOAuthCallback() {
+    if (typeof window === "undefined") {
+      throw new Error("callOAuthCallback can currently only be called in a browser environment");
+    }
     this._ensurePersistentTokenStore();
     let result;
     try {
@@ -1272,13 +1301,15 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     } catch (e) {
       if (e instanceof import_stack_shared.KnownErrors.InvalidTotpCode) {
         alert("Invalid TOTP code. Please try signing in again.");
+        return false;
+      } else {
+        throw e;
       }
-      throw e;
     }
     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 });
+        await this._redirectTo({ url: result.data.afterCallbackRedirectUrl, replace: true });
         return true;
       } else if (result.data.newUser) {
         await this.redirectToAfterSignUp({ replace: true });
@@ -1294,7 +1325,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     await import_stores.storeLock.withWriteLock(async () => {
       await this._interface.signOut(session);
       if (options?.redirectUrl) {
-        await _redirectTo(options.redirectUrl);
+        await this._redirectTo({ url: options.redirectUrl, replace: true });
       } else {
         await this.redirectToAfterSignOut();
       }
@@ -1521,8 +1552,8 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       isPrimary: crud.is_primary,
       usedForAuth: crud.used_for_auth,
       async sendVerificationEmail(options) {
-        if (!options?.callbackUrl && typeof window === "undefined") {
-          throw new Error("Cannot send verification email without a callback URL from the server. Make sure you pass the `callbackUrl` option: `sendVerificationEmail({ callbackUrl: ... })`");
+        if (!options?.callbackUrl && !await app._getCurrentUrl()) {
+          throw new Error("Cannot send verification email without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `sendVerificationEmail({ callbackUrl: ... })`");
         }
         await app._interface.sendServerContactChannelVerificationEmail(userId, crud.id, options?.callbackUrl ?? (0, import_url.constructRedirectUrl)(app.urls.emailVerification));
       },
@@ -1753,8 +1784,8 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
         await app._serverTeamMemberProfilesCache.refresh([crud.id]);
       },
       async inviteUser(options) {
-        if (!options.callbackUrl && typeof window === "undefined") {
-          throw new Error("Cannot invite user without a callback URL from the server. Make sure you pass the `callbackUrl` option: `inviteUser({ email, callbackUrl: ... })`");
+        if (!options.callbackUrl && !await app._getCurrentUrl()) {
+          throw new Error("Cannot invite user without a callback URL from the server or without a redirect method. Make sure you pass the `callbackUrl` option: `inviteUser({ email, callbackUrl: ... })`");
         }
         await app._interface.sendServerTeamInvitation({
           teamId: crud.id,
@@ -1902,7 +1933,9 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   async _refreshUsers() {
     await Promise.all([
       super._refreshUsers(),
-      this._serverUsersCache.refreshWhere(() => true)
+      this._serverUserCache.refreshWhere(() => true),
+      this._serverUsersCache.refreshWhere(() => true),
+      this._serverContactChannelsCache.refreshWhere(() => true)
     ]);
   }
 };