@stackframe/stack 2.5.23 → 2.5.25

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

@@ -615,7 +615,7 @@ type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         or: 'throw';
     }): Promise<ProjectCurrentServerUser<ProjectId>>;
     getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentServerUser<ProjectId> | null>;
-} & AsyncStoreProperty<"users", [], ServerUser[], true> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & StackClientApp<HasTokenStore, ProjectId>);
+} & AsyncStoreProperty<"user", [id: string], ServerUser | null, false> & AsyncStoreProperty<"users", [], ServerUser[], true> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & StackClientApp<HasTokenStore, ProjectId>);
 declare const StackServerApp: StackServerAppConstructor;
 type StackAdminAppConstructor = {
     new <HasTokenStore extends boolean, ProjectId extends string>(options: StackAdminAppConstructorOptions<HasTokenStore, ProjectId>): StackAdminApp<HasTokenStore, ProjectId>;

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

@@ -615,7 +615,7 @@ type StackServerApp<HasTokenStore extends boolean = boolean, ProjectId extends s
         or: 'throw';
     }): Promise<ProjectCurrentServerUser<ProjectId>>;
     getUser(options?: GetUserOptions<HasTokenStore>): Promise<ProjectCurrentServerUser<ProjectId> | null>;
-} & AsyncStoreProperty<"users", [], ServerUser[], true> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & StackClientApp<HasTokenStore, ProjectId>);
+} & AsyncStoreProperty<"user", [id: string], ServerUser | null, false> & AsyncStoreProperty<"users", [], ServerUser[], true> & AsyncStoreProperty<"team", [id: string], ServerTeam | null, false> & AsyncStoreProperty<"teams", [], ServerTeam[], true> & StackClientApp<HasTokenStore, ProjectId>);
 declare const StackServerApp: StackServerAppConstructor;
 type StackAdminAppConstructor = {
     new <HasTokenStore extends boolean, ProjectId extends string>(options: StackAdminAppConstructorOptions<HasTokenStore, ProjectId>): StackAdminApp<HasTokenStore, ProjectId>;

package/dist/lib/stack-app.js

@@ -63,7 +63,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.5.23";
+var clientVersion = "js @stackframe/stack@2.5.25";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -1505,24 +1505,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");
@@ -1533,28 +1538,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": {
-          (0, import_promises.runAsynchronously)(this.redirectToSignIn({ replace: true }));
-          (0, import_react.suspend)();
-          throw new import_errors.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": {
+            (0, import_promises.runAsynchronously)(this.redirectToSignIn({ replace: true }));
+            (0, import_react.suspend)();
+            throw new import_errors.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 (0, import_react2.useMemo)(() => {
+        return crud && this._currentUserFromCrud(crud, session);
+      }, [crud, session, options?.or]);
     }
-    return (0, import_react2.useMemo)(() => {
-      return crud && this._currentUserFromCrud(crud, session);
-    }, [crud, session, options?.or]);
   }
   useUserById(userId) {
     const crud = useAsyncCache(this._serverUserCache, [userId], "useUserById()");