@stackframe/stack 2.6.19 → 2.6.20

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.6.19";
+var clientVersion = "js @stackframe/stack@2.6.20";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -234,7 +234,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     );
     this._memoryTokenStore = createEmptyTokenStore();
     this._requestTokenStores = /* @__PURE__ */ new WeakMap();
-    this._storedCookieTokenStore = null;
+    this._storedBrowserCookieTokenStore = null;
     /**
      * A map from token stores and session keys to sessions.
      *
@@ -358,38 +358,38 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   get _accessTokenCookieName() {
     return `stack-access`;
   }
-  _getCookieTokenStore() {
+  _getBrowserCookieTokenStore() {
     if (!(0, import_env.isBrowserLike)()) {
       throw new Error("Cannot use cookie token store on the server!");
     }
-    if (this._storedCookieTokenStore === null) {
+    if (this._storedBrowserCookieTokenStore === null) {
       const getCurrentValue = (old) => {
         const tokens = this._getTokensFromCookies({
-          refreshTokenCookie: (0, import_cookie.getCookie)(this._refreshTokenCookieName) ?? (0, import_cookie.getCookie)("stack-refresh"),
+          refreshTokenCookie: (0, import_cookie.getCookieClient)(this._refreshTokenCookieName) ?? (0, import_cookie.getCookieClient)("stack-refresh"),
           // keep old cookie name for backwards-compatibility
-          accessTokenCookie: (0, import_cookie.getCookie)(this._accessTokenCookieName)
+          accessTokenCookie: (0, import_cookie.getCookieClient)(this._accessTokenCookieName)
         });
         return {
           refreshToken: tokens.refreshToken,
           accessToken: tokens.accessToken ?? (old?.refreshToken === tokens.refreshToken ? old.accessToken : null)
         };
       };
-      this._storedCookieTokenStore = new import_stores.Store(getCurrentValue(null));
+      this._storedBrowserCookieTokenStore = new import_stores.Store(getCurrentValue(null));
       let hasSucceededInWriting = true;
       setInterval(() => {
         if (hasSucceededInWriting) {
-          const oldValue = this._storedCookieTokenStore.get();
+          const oldValue = this._storedBrowserCookieTokenStore.get();
           const currentValue = getCurrentValue(oldValue);
           if (!(0, import_objects.deepPlainEquals)(currentValue, oldValue)) {
-            this._storedCookieTokenStore.set(currentValue);
+            this._storedBrowserCookieTokenStore.set(currentValue);
           }
         }
       }, 100);
-      this._storedCookieTokenStore.onChange((value) => {
+      this._storedBrowserCookieTokenStore.onChange((value) => {
         try {
-          (0, import_cookie.setOrDeleteCookie)(this._refreshTokenCookieName, value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
-          (0, import_cookie.setOrDeleteCookie)(this._accessTokenCookieName, value.accessToken ? JSON.stringify([value.refreshToken, value.accessToken]) : null, { maxAge: 60 * 60 * 24 });
-          (0, import_cookie.deleteCookie)("stack-refresh");
+          (0, import_cookie.setOrDeleteCookieClient)(this._refreshTokenCookieName, value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
+          (0, import_cookie.setOrDeleteCookieClient)(this._accessTokenCookieName, value.accessToken ? JSON.stringify([value.refreshToken, value.accessToken]) : null, { maxAge: 60 * 60 * 24 });
+          (0, import_cookie.deleteCookieClient)("stack-refresh");
           hasSucceededInWriting = true;
         } catch (e) {
           if (!(0, import_env.isBrowserLike)()) {
@@ -400,30 +400,31 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         }
       });
     }
-    return this._storedCookieTokenStore;
+    return this._storedBrowserCookieTokenStore;
   }
-  _getOrCreateTokenStore(overrideTokenStoreInit) {
+  _getOrCreateTokenStore(cookieHelper, overrideTokenStoreInit) {
     const tokenStoreInit = overrideTokenStoreInit === void 0 ? this._tokenStoreInit : overrideTokenStoreInit;
     switch (tokenStoreInit) {
       case "cookie": {
-        return this._getCookieTokenStore();
+        return this._getBrowserCookieTokenStore();
       }
       case "nextjs-cookie": {
         if ((0, import_env.isBrowserLike)()) {
-          return this._getCookieTokenStore();
+          return this._getBrowserCookieTokenStore();
         } else {
           const tokens = this._getTokensFromCookies({
-            refreshTokenCookie: (0, import_cookie.getCookie)(this._refreshTokenCookieName) ?? (0, import_cookie.getCookie)("stack-refresh"),
+            refreshTokenCookie: cookieHelper.get(this._refreshTokenCookieName) ?? cookieHelper.get("stack-refresh"),
             // keep old cookie name for backwards-compatibility
-            accessTokenCookie: (0, import_cookie.getCookie)(this._accessTokenCookieName)
+            accessTokenCookie: cookieHelper.get(this._accessTokenCookieName)
           });
           const store = new import_stores.Store(tokens);
           store.onChange((value) => {
-            try {
-              (0, import_cookie.setOrDeleteCookie)(this._refreshTokenCookieName, value.refreshToken, { maxAge: 60 * 60 * 24 * 365 });
-              (0, import_cookie.setOrDeleteCookie)(this._accessTokenCookieName, value.accessToken ? JSON.stringify([value.refreshToken, value.accessToken]) : null, { maxAge: 60 * 60 * 24 });
-            } catch (e) {
-            }
+            (0, import_promises.runAsynchronously)(async () => {
+              await Promise.all([
+                (0, import_cookie.setOrDeleteCookie)(this._refreshTokenCookieName, value.refreshToken, { maxAge: 60 * 60 * 24 * 365, noOpIfServerComponent: true }),
+                (0, import_cookie.setOrDeleteCookie)(this._accessTokenCookieName, value.accessToken ? JSON.stringify([value.refreshToken, value.accessToken]) : null, { maxAge: 60 * 60 * 24, noOpIfServerComponent: true })
+              ]);
+            });
           });
           return store;
         }
@@ -446,7 +447,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
             } catch (e) {
               throw new Error(`Invalid x-stack-auth header: ${stackAuthHeader}`, { cause: e });
             }
-            return this._getOrCreateTokenStore({
+            return this._getOrCreateTokenStore(cookieHelper, {
               accessToken: parsed2.accessToken ?? null,
               refreshToken: parsed2.refreshToken ?? null
             });
@@ -470,6 +471,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
     }
   }
+  _useTokenStore(overrideTokenStoreInit) {
+    (0, import_react.suspendIfSsr)();
+    const cookieHelper = (0, import_cookie.createBrowserCookieHelper)();
+    const tokenStore = this._getOrCreateTokenStore(cookieHelper, overrideTokenStoreInit);
+    return tokenStore;
+  }
   _getSessionFromTokenStore(tokenStore) {
     const tokenObj = tokenStore.get();
     const sessionKey = import_sessions.InternalSession.calculateSessionKey(tokenObj);
@@ -497,12 +504,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     sessionsBySessionKey.set(sessionKey, session);
     return session;
   }
-  _getSession(overrideTokenStoreInit) {
-    const tokenStore = this._getOrCreateTokenStore(overrideTokenStoreInit);
+  async _getSession(overrideTokenStoreInit) {
+    const tokenStore = this._getOrCreateTokenStore(await (0, import_cookie.createCookieHelper)(), overrideTokenStoreInit);
     return this._getSessionFromTokenStore(tokenStore);
   }
   _useSession(overrideTokenStoreInit) {
-    const tokenStore = this._getOrCreateTokenStore(overrideTokenStoreInit);
+    const tokenStore = this._useTokenStore(overrideTokenStoreInit);
     const subscribe = (0, import_react2.useCallback)((cb) => {
       const { unsubscribe } = tokenStore.onChange(() => {
         cb();
@@ -516,7 +523,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();
+    const tokenStore = this._getOrCreateTokenStore(await (0, import_cookie.createCookieHelper)());
     tokenStore.set(tokens);
   }
   _hasPersistentTokenStore(overrideTokenStoreInit) {
@@ -566,7 +573,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
     };
   }
-  _clientTeamFromCrud(crud) {
+  _clientTeamFromCrud(crud, session) {
     const app = this;
     return {
       id: crud.id,
@@ -575,28 +582,31 @@ 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 when calling the inviteUser function on the server.");
+        }
         await app._interface.sendTeamInvitation({
           teamId: crud.id,
           email: options.email,
-          session: app._getSession(),
-          callbackUrl: (0, import_url.constructRedirectUrl)(app.urls.teamInvitation)
+          session,
+          callbackUrl: options.callbackUrl ?? (0, import_url.constructRedirectUrl)(app.urls.teamInvitation)
         });
       },
       async listUsers() {
-        const result = await app._teamMemberProfilesCache.getOrWait([app._getSession(), crud.id], "write-only");
+        const result = await app._teamMemberProfilesCache.getOrWait([session, crud.id], "write-only");
         return result.map((crud2) => app._clientTeamUserFromCrud(crud2));
       },
       useUsers() {
-        const result = useAsyncCache(app._teamMemberProfilesCache, [app._getSession(), crud.id], "team.useUsers()");
+        const result = useAsyncCache(app._teamMemberProfilesCache, [session, crud.id], "team.useUsers()");
         return result.map((crud2) => app._clientTeamUserFromCrud(crud2));
       },
       async update(data) {
-        await app._interface.updateTeam({ data: teamUpdateOptionsToCrud(data), teamId: crud.id }, app._getSession());
-        await app._currentUserTeamsCache.refresh([app._getSession()]);
+        await app._interface.updateTeam({ data: teamUpdateOptionsToCrud(data), teamId: crud.id }, session);
+        await app._currentUserTeamsCache.refresh([session]);
       }
     };
   }
-  _clientContactChannelFromCrud(crud) {
+  _clientContactChannelFromCrud(crud, session) {
     const app = this;
     return {
       id: crud.id,
@@ -606,15 +616,15 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       isPrimary: crud.is_primary,
       usedForAuth: crud.used_for_auth,
       async sendVerificationEmail() {
-        await app._interface.sendCurrentUserContactChannelVerificationEmail(crud.id, (0, import_url.constructRedirectUrl)(app.urls.emailVerification), app._getSession());
+        await app._interface.sendCurrentUserContactChannelVerificationEmail(crud.id, (0, import_url.constructRedirectUrl)(app.urls.emailVerification), session);
       },
       async update(data) {
-        await app._interface.updateClientContactChannel(crud.id, contactChannelUpdateOptionsToCrud(data), app._getSession());
-        await app._clientContactChannelsCache.refresh([app._getSession()]);
+        await app._interface.updateClientContactChannel(crud.id, contactChannelUpdateOptionsToCrud(data), session);
+        await app._clientContactChannelsCache.refresh([session]);
       },
       async delete() {
-        await app._interface.deleteClientContactChannel(crud.id, app._getSession());
-        await app._clientContactChannelsCache.refresh([app._getSession()]);
+        await app._interface.deleteClientContactChannel(crud.id, session);
+        await app._clientContactChannelsCache.refresh([session]);
       }
     };
   }
@@ -670,10 +680,25 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       }
     };
   }
+  _editableTeamProfileFromCrud(crud, session) {
+    const app = this;
+    return {
+      displayName: crud.display_name,
+      profileImageUrl: crud.profile_image_url,
+      async update(update) {
+        await app._interface.updateTeamMemberProfile({
+          teamId: crud.team_id,
+          userId: crud.user_id,
+          profile: {
+            display_name: update.displayName,
+            profile_image_url: update.profileImageUrl
+          }
+        }, session);
+        await app._currentUserTeamProfileCache.refresh([session, crud.team_id]);
+      }
+    };
+  }
   _createBaseUser(crud) {
-    if (!crud) {
-      throw new import_errors.StackAssertionError("User not found");
-    }
     return {
       id: crud.id,
       displayName: crud.display_name,
@@ -688,32 +713,13 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       otpAuthEnabled: crud.otp_auth_enabled,
       oauthProviders: crud.oauth_providers,
       passkeyAuthEnabled: crud.passkey_auth_enabled,
-      selectedTeam: crud.selected_team && this._clientTeamFromCrud(crud.selected_team),
       isMultiFactorRequired: crud.requires_totp_mfa,
       toClientJson() {
         return crud;
       }
     };
   }
-  _editableTeamProfileFromCrud(crud) {
-    const app = this;
-    return {
-      displayName: crud.display_name,
-      profileImageUrl: crud.profile_image_url,
-      async update(update) {
-        await app._interface.updateTeamMemberProfile({
-          teamId: crud.team_id,
-          userId: crud.user_id,
-          profile: {
-            display_name: update.displayName,
-            profile_image_url: update.profileImageUrl
-          }
-        }, app._getSession());
-        await app._currentUserTeamProfileCache.refresh([app._getSession(), crud.team_id]);
-      }
-    };
-  }
-  _createUserExtra(crud, session) {
+  _createUserExtraFromCurrent(crud, session) {
     const app = this;
     async function getConnectedAccount(id, options) {
       const scopeString = options?.scopes?.join(" ");
@@ -747,11 +753,11 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       },
       async listTeams() {
         const teams = await app._currentUserTeamsCache.getOrWait([session], "write-only");
-        return teams.map((crud2) => app._clientTeamFromCrud(crud2));
+        return teams.map((crud2) => app._clientTeamFromCrud(crud2, session));
       },
       useTeams() {
         const teams = useAsyncCache(app._currentUserTeamsCache, [session], "user.useTeams()");
-        return (0, import_react2.useMemo)(() => teams.map((crud2) => app._clientTeamFromCrud(crud2)), [teams]);
+        return (0, import_react2.useMemo)(() => teams.map((crud2) => app._clientTeamFromCrud(crud2, session)), [teams]);
       },
       async createTeam(data) {
         const crud2 = await app._interface.createClientTeam({
@@ -759,7 +765,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
           creator_user_id: "me"
         }, session);
         await app._currentUserTeamsCache.refresh([session]);
-        return app._clientTeamFromCrud(crud2);
+        return app._clientTeamFromCrud(crud2, session);
       },
       async leaveTeam(team) {
         await app._interface.leaveTeam(team.id, session);
@@ -789,7 +795,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         return await app._updateClientUser(update, session);
       },
       async sendVerificationEmail() {
-        if (!crud?.primary_email) {
+        if (!crud.primary_email) {
           throw new import_errors.StackAssertionError("User does not have a primary email");
         }
         return await app._sendVerificationEmail(crud.primary_email, session);
@@ -804,13 +810,14 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         await app._currentUserCache.refresh([session]);
         return result;
       },
+      selectedTeam: crud.selected_team && this._clientTeamFromCrud(crud.selected_team, session),
       async getTeamProfile(team) {
         const result = await app._currentUserTeamProfileCache.getOrWait([session, team.id], "write-only");
-        return app._editableTeamProfileFromCrud(result);
+        return app._editableTeamProfileFromCrud(result, session);
       },
       useTeamProfile(team) {
         const result = useAsyncCache(app._currentUserTeamProfileCache, [session, team.id], "user.useTeamProfile()");
-        return app._editableTeamProfileFromCrud(result);
+        return app._editableTeamProfileFromCrud(result, session);
       },
       async delete() {
         await app._interface.deleteCurrentUser(session);
@@ -818,16 +825,16 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       },
       async listContactChannels() {
         const result = await app._clientContactChannelsCache.getOrWait([session], "write-only");
-        return result.map((crud2) => app._clientContactChannelFromCrud(crud2));
+        return result.map((crud2) => app._clientContactChannelFromCrud(crud2, session));
       },
       useContactChannels() {
         const result = useAsyncCache(app._clientContactChannelsCache, [session], "user.useContactChannels()");
-        return result.map((crud2) => app._clientContactChannelFromCrud(crud2));
+        return result.map((crud2) => app._clientContactChannelFromCrud(crud2, session));
       },
       async createContactChannel(data) {
         const crud2 = await app._interface.createClientContactChannel(contactChannelCreateOptionsToCrud("me", data), session);
         await app._clientContactChannelsCache.refresh([session]);
-        return app._clientContactChannelFromCrud(crud2);
+        return app._clientContactChannelFromCrud(crud2, session);
       }
     };
   }
@@ -850,7 +857,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     const currentUser = {
       ...this._createBaseUser(crud),
       ...this._createAuth(session),
-      ...this._createUserExtra(crud, session),
+      ...this._createUserExtraFromCurrent(crud, session),
       ...this._isInternalProject() ? this._createInternalUserExtra(session) : {}
     };
     Object.freeze(currentUser);
@@ -982,14 +989,14 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     return await this._interface.acceptTeamInvitation({
       type: "check",
       code,
-      session: this._getSession()
+      session: await this._getSession()
     });
   }
   async acceptTeamInvitation(code) {
     const result = await this._interface.acceptTeamInvitation({
       type: "use",
       code,
-      session: this._getSession()
+      session: await this._getSession()
     });
     if (result.status === "ok") {
       return import_results.Result.ok(void 0);
@@ -1001,7 +1008,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     const result = await this._interface.acceptTeamInvitation({
       type: "details",
       code,
-      session: this._getSession()
+      session: await this._getSession()
     });
     if (result.status === "ok") {
       return import_results.Result.ok({ teamDisplayName: result.data.team_display_name });
@@ -1011,13 +1018,13 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   }
   async verifyEmail(code) {
     const result = await this._interface.verifyEmail(code);
-    await this._currentUserCache.refresh([this._getSession()]);
-    await this._clientContactChannelsCache.refresh([this._getSession()]);
+    await this._currentUserCache.refresh([await this._getSession()]);
+    await this._clientContactChannelsCache.refresh([await this._getSession()]);
     return result;
   }
   async getUser(options) {
     this._ensurePersistentTokenStore(options?.tokenStore);
-    const session = this._getSession(options?.tokenStore);
+    const session = await this._getSession(options?.tokenStore);
     const crud = await this._currentUserCache.getOrWait([session], "write-only");
     if (crud === null) {
       switch (options?.or) {
@@ -1100,14 +1107,14 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       return await callback();
     } catch (e) {
       if (e instanceof import_stack_shared.KnownErrors.MultiFactorAuthenticationRequired) {
-        return import_results.Result.ok(await this._experimentalMfa(e, this._getSession()));
+        return import_results.Result.ok(await this._experimentalMfa(e, await this._getSession()));
       }
       throw e;
     }
   }
   async signInWithCredential(options) {
     this._ensurePersistentTokenStore();
-    const session = this._getSession();
+    const session = await this._getSession();
     let result;
     try {
       result = await this._catchMfaRequiredError(async () => {
@@ -1131,7 +1138,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   }
   async signUpWithCredential(options) {
     this._ensurePersistentTokenStore();
-    const session = this._getSession();
+    const session = await this._getSession();
     const emailVerificationRedirectUrl = (0, import_url.constructRedirectUrl)(this.urls.emailVerification);
     const result = await this._interface.signUpWithCredential(
       options.email,
@@ -1176,10 +1183,11 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   }
   async signInWithPasskey() {
     this._ensurePersistentTokenStore();
+    const session = await this._getSession();
     let result;
     try {
       result = await this._catchMfaRequiredError(async () => {
-        const initiationResult = await this._interface.initiatePasskeyAuthentication({}, this._getSession());
+        const initiationResult = await this._interface.initiatePasskeyAuthentication({}, session);
         if (initiationResult.status !== "ok") {
           return import_results.Result.error(new import_stack_shared.KnownErrors.PasskeyAuthenticationFailed("Failed to get initiation options for passkey authentication"));
         }
@@ -1334,7 +1342,9 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         };
       },
       setCurrentUser: (userJsonPromise) => {
-        (0, import_promises.runAsynchronously)(this._currentUserCache.forceSetCachedValueAsync([this._getSession()], userJsonPromise));
+        (0, import_promises.runAsynchronously)(async () => {
+          await this._currentUserCache.forceSetCachedValueAsync([await this._getSession()], userJsonPromise);
+        });
       }
     };
   }
@@ -1424,11 +1434,18 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   }
   _serverEditableTeamProfileFromCrud(crud) {
     const app = this;
-    const clientProfile = this._editableTeamProfileFromCrud(crud);
     return {
-      ...clientProfile,
+      displayName: crud.display_name,
+      profileImageUrl: crud.profile_image_url,
       async update(update) {
-        await clientProfile.update(update);
+        await app._interface.updateServerTeamMemberProfile({
+          teamId: crud.team_id,
+          userId: crud.user_id,
+          profile: {
+            display_name: update.displayName,
+            profile_image_url: update.profileImageUrl
+          }
+        });
         await app._serverUserTeamProfileCache.refresh([crud.team_id, crud.user_id]);
       }
     };
@@ -1436,7 +1453,12 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   _serverContactChannelFromCrud(userId, crud) {
     const app = this;
     return {
-      ...this._clientContactChannelFromCrud(crud),
+      id: crud.id,
+      value: crud.value,
+      type: crud.type,
+      isVerified: crud.is_verified,
+      isPrimary: crud.is_primary,
+      usedForAuth: crud.used_for_auth,
       async sendVerificationEmail() {
         await app._interface.sendServerContactChannelVerificationEmail(userId, crud.id, (0, import_url.constructRedirectUrl)(app.urls.emailVerification));
       },
@@ -1507,6 +1529,7 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       },
       getConnectedAccount,
       useConnectedAccount,
+      selectedTeam: crud.selected_team ? app._serverTeamFromCrud(crud.selected_team) : null,
       async getTeam(teamId) {
         const teams = await this.listTeams();
         return teams.find((t) => t.id === teamId) ?? null;
@@ -1656,11 +1679,14 @@ 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 when calling the inviteUser function on the server.");
+        }
         await app._interface.sendTeamInvitation({
           teamId: crud.id,
           email: options.email,
           session: null,
-          callbackUrl: (0, import_url.constructRedirectUrl)(app.urls.teamInvitation)
+          callbackUrl: options.callbackUrl ?? (0, import_url.constructRedirectUrl)(app.urls.teamInvitation)
         });
       }
     };
@@ -1672,11 +1698,10 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   }
   async getUser(options) {
     if (typeof options === "string") {
-      const allUsers = await this.listUsers();
-      return allUsers.find((u) => u.id === options) ?? null;
+      return await this.getServerUserById(options);
     } else {
       this._ensurePersistentTokenStore(options?.tokenStore);
-      const session = this._getSession(options?.tokenStore);
+      const session = await this._getSession(options?.tokenStore);
       const crud = await this._currentServerUserCache.getOrWait([session], "write-only");
       if (crud === null) {
         switch (options?.or) {
@@ -1705,12 +1730,11 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   }
   useUser(options) {
     if (typeof options === "string") {
-      const users = this.useUsers();
-      return users.find((u) => u.id === options) ?? null;
+      return this.useUserById(options);
     } else {
       this._ensurePersistentTokenStore(options?.tokenStore);
       const router = NextNavigation.useRouter();
-      const session = this._getSession(options?.tokenStore);
+      const session = this._useSession(options?.tokenStore);
       const crud = useAsyncCache(this._currentServerUserCache, [session], "useUser()");
       if (crud === null) {
         switch (options?.or) {
@@ -1796,7 +1820,7 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
   async _refreshUsers() {
     await Promise.all([
       super._refreshUsers(),
-      this._serverUsersCache.refresh([])
+      this._serverUsersCache.refreshWhere(() => true)
     ]);
   }
 };