@stackframe/stack 2.5.23 → 2.5.24

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @stackframe/stack
 
+## 2.5.24
+
+### Patch Changes
+
+- Various bugfixes
+- Updated dependencies
+  - @stackframe/stack-shared@2.5.24
+  - @stackframe/stack-ui@2.5.24
+  - @stackframe/stack-sc@2.5.24
+
 ## 2.5.23
 
 ### Patch Changes

package/dist/esm/lib/stack-app.js

@@ -24,7 +24,7 @@ import { constructRedirectUrl } from "../utils/url";
 import { addNewOAuthProviderOrScope, callOAuthCallback, signInWithOAuth } from "./auth";
 import { deleteCookie, getCookie, setOrDeleteCookie } from "./cookie";
 var NextNavigation = scrambleDuringCompileTime(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.5.23";
+var clientVersion = "js @stackframe/stack@2.5.24";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -1466,24 +1466,29 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
     return this._serverUserFromCrud(crud);
   }
   async getUser(options) {
-    this._ensurePersistentTokenStore(options?.tokenStore);
-    const session = this._getSession(options?.tokenStore);
-    const crud = await this._currentServerUserCache.getOrWait([session], "write-only");
-    if (crud === null) {
-      switch (options?.or) {
-        case "redirect": {
-          await this.redirectToSignIn({ replace: true });
-          break;
-        }
-        case "throw": {
-          throw new Error("User is not signed in but getUser was called with { or: 'throw' }");
-        }
-        default: {
-          return null;
+    if (typeof options === "string") {
+      const allUsers = await this.listUsers();
+      return allUsers.find((u) => u.id === options) ?? null;
+    } else {
+      this._ensurePersistentTokenStore(options?.tokenStore);
+      const session = this._getSession(options?.tokenStore);
+      const crud = await this._currentServerUserCache.getOrWait([session], "write-only");
+      if (crud === null) {
+        switch (options?.or) {
+          case "redirect": {
+            await this.redirectToSignIn({ replace: true });
+            break;
+          }
+          case "throw": {
+            throw new Error("User is not signed in but getUser was called with { or: 'throw' }");
+          }
+          default: {
+            return null;
+          }
         }
       }
+      return crud && this._currentUserFromCrud(crud, session);
     }
-    return crud && this._currentUserFromCrud(crud, session);
   }
   async getServerUser() {
     console.warn("stackServerApp.getServerUser is deprecated; use stackServerApp.getUser instead");
@@ -1494,28 +1499,33 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
     return crud && this._serverUserFromCrud(crud);
   }
   useUser(options) {
-    this._ensurePersistentTokenStore(options?.tokenStore);
-    const router = NextNavigation.useRouter();
-    const session = this._getSession(options?.tokenStore);
-    const crud = useAsyncCache(this._currentServerUserCache, [session], "useUser()");
-    if (crud === null) {
-      switch (options?.or) {
-        case "redirect": {
-          runAsynchronously(this.redirectToSignIn({ replace: true }));
-          suspend();
-          throw new StackAssertionError("suspend should never return");
-        }
-        case "throw": {
-          throw new Error("User is not signed in but useUser was called with { or: 'throw' }");
-        }
-        case void 0:
-        case "return-null": {
+    if (typeof options === "string") {
+      const users = this.useUsers();
+      return users.find((u) => u.id === options) ?? null;
+    } else {
+      this._ensurePersistentTokenStore(options?.tokenStore);
+      const router = NextNavigation.useRouter();
+      const session = this._getSession(options?.tokenStore);
+      const crud = useAsyncCache(this._currentServerUserCache, [session], "useUser()");
+      if (crud === null) {
+        switch (options?.or) {
+          case "redirect": {
+            runAsynchronously(this.redirectToSignIn({ replace: true }));
+            suspend();
+            throw new StackAssertionError("suspend should never return");
+          }
+          case "throw": {
+            throw new Error("User is not signed in but useUser was called with { or: 'throw' }");
+          }
+          case void 0:
+          case "return-null": {
+          }
         }
       }
+      return useMemo(() => {
+        return crud && this._currentUserFromCrud(crud, session);
+      }, [crud, session, options?.or]);
     }
-    return useMemo(() => {
-      return crud && this._currentUserFromCrud(crud, session);
-    }, [crud, session, options?.or]);
   }
   useUserById(userId) {
     const crud = useAsyncCache(this._serverUserCache, [userId], "useUserById()");