@stackframe/stack 2.7.16 → 2.7.18

package/dist/lib/auth.d.mts

@@ -22,7 +22,7 @@ declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: str
     status: "ok";
     data: {
         newUser: boolean;
-        afterCallbackRedirectUrl?: string | undefined;
+        afterCallbackRedirectUrl?: string;
         accessToken: string;
         refreshToken: string;
     };

package/dist/lib/auth.d.ts

@@ -22,7 +22,7 @@ declare function callOAuthCallback(iface: StackClientInterface, redirectUrl: str
     status: "ok";
     data: {
         newUser: boolean;
-        afterCallbackRedirectUrl?: string | undefined;
+        afterCallbackRedirectUrl?: string;
         accessToken: string;
         refreshToken: string;
     };

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

@@ -43,7 +43,10 @@ type OAuthScopesOnSignIn = {
 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;
+    baseUrl?: string | {
+        browser: string;
+        server: string;
+    };
     projectId?: ProjectId;
     publishableClientKey?: string;
     urls?: Partial<HandlerUrls>;

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

@@ -43,7 +43,10 @@ type OAuthScopesOnSignIn = {
 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;
+    baseUrl?: string | {
+        browser: string;
+        server: string;
+    };
     projectId?: ProjectId;
     publishableClientKey?: string;
     urls?: Partial<HandlerUrls>;

package/dist/lib/stack-app.js

@@ -39,7 +39,6 @@ __export(stack_app_exports, {
 });
 module.exports = __toCommonJS(stack_app_exports);
 var import_browser = require("@simplewebauthn/browser");
-var import_stack_sc = require("@stackframe/stack-sc");
 var import_stack_shared = require("@stackframe/stack-shared");
 var import_production_mode = require("@stackframe/stack-shared/dist/helpers/production-mode");
 var import_sessions = require("@stackframe/stack-shared/dist/sessions");
@@ -63,8 +62,14 @@ var import_react2 = __toESM(require("react"));
 var import_url = require("../utils/url");
 var import_auth = require("./auth");
 var import_cookie = require("./cookie");
+var sc = __toESM(require("@stackframe/stack-sc"));
+var isReactServer2 = false;
+isReactServer2 = sc.isReactServer;
 var NextNavigation = (0, import_compile_time.scrambleDuringCompileTime)(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.7.16";
+var clientVersion = "js @stackframe/stack@2.7.18";
+if (clientVersion.startsWith("STACK_COMPILE_TIME")) {
+  throw new import_errors.StackAssertionError("Client version was not replaced. Something went wrong during build!");
+}
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -90,10 +95,10 @@ function getUrls(partial) {
   };
 }
 function getDefaultProjectId() {
-  return (0, import_env.getPublicEnvVar)("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."));
+  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."));
 }
 function getDefaultPublishableClientKey() {
-  return (0, import_env.getPublicEnvVar)("NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY") || (0, import_errors.throwErr)(new Error("Welcome to Stack Auth! It seems that you haven't provided a publishable client key. Please create an API key for your project on the Stack dashboard at https://app.stack-auth.com and copy your publishable client key into the NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY environment variable."));
+  return process.env.NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY || (0, import_errors.throwErr)(new Error("Welcome to Stack Auth! It seems that you haven't provided a publishable client key. Please create an API key for your project on the Stack dashboard at https://app.stack-auth.com and copy your publishable client key into the NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY environment variable."));
 }
 function getDefaultSecretServerKey() {
   return process.env.STACK_SECRET_SERVER_KEY || (0, import_errors.throwErr)(new Error("No secret server key provided. Please copy your key from the Stack dashboard and put your it in the STACK_SECRET_SERVER_KEY environment variable."));
@@ -101,8 +106,26 @@ function getDefaultSecretServerKey() {
 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() {
-  const url = (0, import_env.getPublicEnvVar)("NEXT_PUBLIC_STACK_API_URL") || (0, import_env.getPublicEnvVar)("NEXT_PUBLIC_STACK_URL") || defaultBaseUrl;
+function getBaseUrl(userSpecifiedBaseUrl) {
+  let url;
+  if (userSpecifiedBaseUrl) {
+    if (typeof userSpecifiedBaseUrl === "string") {
+      url = userSpecifiedBaseUrl;
+    } else {
+      if ((0, import_env.isBrowserLike)()) {
+        url = userSpecifiedBaseUrl.browser;
+      } else {
+        url = userSpecifiedBaseUrl.server;
+      }
+    }
+  } else {
+    if ((0, import_env.isBrowserLike)()) {
+      url = process.env.NEXT_PUBLIC_BROWSER_STACK_API_URL;
+    } else {
+      url = process.env.NEXT_PUBLIC_SERVER_STACK_API_URL;
+    }
+    url = 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";
@@ -254,7 +277,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       this._interface = _options.interface;
     } else {
       this._interface = new import_stack_shared.StackClientInterface({
-        getBaseUrl: () => _options.baseUrl ?? getDefaultBaseUrl(),
+        getBaseUrl: () => getBaseUrl(_options.baseUrl),
         projectId: _options.projectId ?? getDefaultProjectId(),
         clientVersion,
         publishableClientKey: _options.publishableClientKey ?? getDefaultPublishableClientKey()
@@ -937,7 +960,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     if (this._redirectMethod === "none") {
       return;
     }
-    if (import_stack_sc.isReactServer && this._redirectMethod === "nextjs") {
+    if (isReactServer2 && this._redirectMethod === "nextjs") {
       NextNavigation.redirect(options.url.toString(), options.replace ? NextNavigation.RedirectType.replace : NextNavigation.RedirectType.push);
     } else {
       if (options.replace) {
@@ -961,7 +984,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     }
     if (!options?.noRedirectBack) {
       if (handlerName === "afterSignIn" || handlerName === "afterSignUp") {
-        if (import_stack_sc.isReactServer || typeof window === "undefined") {
+        if (isReactServer2 || typeof window === "undefined") {
           try {
             await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
           } catch (e) {
@@ -971,7 +994,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
           url = queryParams.get("after_auth_return_to") || url;
         }
       } else if (handlerName === "signIn" || handlerName === "signUp") {
-        if (import_stack_sc.isReactServer || typeof window === "undefined") {
+        if (isReactServer2 || typeof window === "undefined") {
           try {
             await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
           } catch (e) {
@@ -1439,12 +1462,15 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       oauthScopesOnSignIn: options.oauthScopesOnSignIn
     } : {
       interface: new import_stack_shared.StackServerInterface({
-        getBaseUrl: () => options.baseUrl ?? getDefaultBaseUrl(),
+        getBaseUrl: () => getBaseUrl(options.baseUrl),
         projectId: options.projectId ?? getDefaultProjectId(),
         clientVersion,
         publishableClientKey: options.publishableClientKey ?? getDefaultPublishableClientKey(),
         secretServerKey: options.secretServerKey ?? getDefaultSecretServerKey()
       }),
+      baseUrl: options.baseUrl,
+      projectId: options.projectId,
+      publishableClientKey: options.publishableClientKey,
       tokenStore: options.tokenStore,
       urls: options.urls ?? {},
       oauthScopesOnSignIn: options.oauthScopesOnSignIn ?? {}
@@ -1940,7 +1966,7 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
   constructor(options) {
     super({
       interface: new import_stack_shared.StackAdminInterface({
-        getBaseUrl: () => options.baseUrl ?? getDefaultBaseUrl(),
+        getBaseUrl: () => getBaseUrl(options.baseUrl),
         projectId: options.projectId ?? getDefaultProjectId(),
         clientVersion,
         ..."projectOwnerSession" in options ? {
@@ -1951,6 +1977,8 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
           superSecretAdminKey: options.superSecretAdminKey ?? getDefaultSuperSecretAdminKey()
         }
       }),
+      baseUrl: options.baseUrl,
+      projectId: options.projectId,
       tokenStore: options.tokenStore,
       urls: options.urls,
       oauthScopesOnSignIn: options.oauthScopesOnSignIn