@stackframe/stack 2.4.3 → 2.4.6

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

@@ -16,6 +16,7 @@ import { filterUndefined, omit } from "@stackframe/stack-shared/dist/utils/objec
 import { neverResolve, resolved, runAsynchronously, wait } from "@stackframe/stack-shared/dist/utils/promises";
 import { AsyncCache } from "@stackframe/stack-shared/dist/utils/caches";
 import { suspend } from "@stackframe/stack-shared/dist/utils/react";
+var clientVersion = "js @stackframe/stack@2.4.6";
 function permissionDefinitionScopeToType(scope) {
   return { "any-team": "team", "specific-team": "team", "global": "global" }[scope.type];
 }
@@ -195,6 +196,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       this._interface = new StackClientInterface({
         baseUrl: options.baseUrl ?? getDefaultBaseUrl(),
         projectId: options.projectId ?? getDefaultProjectId(),
+        clientVersion,
         publishableClientKey: options.publishableClientKey ?? getDefaultPublishableClientKey()
       });
     }
@@ -308,8 +310,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         return permissions.find((p) => p.id === permissionId) ?? null;
       },
       async hasPermission(scope, permissionId) {
-        const permissions = await this.listPermissions(scope);
-        return permissions.some((p) => p.id === permissionId);
+        return await this.getPermission(scope, permissionId) !== null;
       },
       toJson() {
         return json;
@@ -368,22 +369,6 @@ var _StackClientAppImpl = class __StackClientAppImpl {
       return currentUser;
     }
   }
-  _userToJson(user) {
-    return {
-      projectId: user.projectId,
-      id: user.id,
-      displayName: user.displayName,
-      primaryEmail: user.primaryEmail,
-      primaryEmailVerified: user.primaryEmailVerified,
-      profileImageUrl: user.profileImageUrl,
-      signedUpAtMillis: user.signedUpAt.getTime(),
-      clientMetadata: user.clientMetadata,
-      authMethod: user.authMethod,
-      hasPassword: user.hasPassword,
-      authWithEmail: user.authWithEmail,
-      oauthProviders: user.oauthProviders
-    };
-  }
   _projectAdminFromJson(data, adminInterface, onRefresh) {
     if (data.id !== adminInterface.projectId) {
       throw new Error(`The project ID of the provided project JSON (${data.id}) does not match the project ID of the app (${adminInterface.projectId})! This is a Stack bug.`);
@@ -421,6 +406,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     return new StackAdminInterface({
       baseUrl: this._interface.options.baseUrl,
       projectId: forProjectId,
+      clientVersion,
       projectOwnerTokens: tokenStore
     });
   }
@@ -430,12 +416,12 @@ var _StackClientAppImpl = class __StackClientAppImpl {
   get urls() {
     return getUrls(this._urlOptions);
   }
-  _redirectTo(handlerName) {
+  async _redirectTo(handlerName) {
     if (!this.urls[handlerName]) {
       throw new Error(`No URL for handler name ${handlerName}`);
     }
     window.location.href = this.urls[handlerName];
-    return wait(2e3);
+    return await wait(2e3);
   }
   async redirectToSignIn() {
     return await this._redirectTo("signIn");
@@ -755,24 +741,21 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
     return await this._interface.listTeamMemberPermissions({ teamId, userId, type, direct });
   });
   constructor(options) {
-    if ("interface" in options) {
-      super({
-        interface: options.interface,
-        tokenStore: options.tokenStore,
-        urls: options.urls
-      });
-    } else {
-      super({
-        interface: new StackServerInterface({
-          baseUrl: options.baseUrl ?? getDefaultBaseUrl(),
-          projectId: options.projectId ?? getDefaultProjectId(),
-          publishableClientKey: options.publishableClientKey ?? getDefaultPublishableClientKey(),
-          secretServerKey: options.secretServerKey ?? getDefaultSecretServerKey()
-        }),
-        tokenStore: options.tokenStore,
-        urls: options.urls ?? {}
-      });
-    }
+    super("interface" in options ? {
+      interface: options.interface,
+      tokenStore: options.tokenStore,
+      urls: options.urls
+    } : {
+      interface: new StackServerInterface({
+        baseUrl: options.baseUrl ?? getDefaultBaseUrl(),
+        projectId: options.projectId ?? getDefaultProjectId(),
+        clientVersion,
+        publishableClientKey: options.publishableClientKey ?? getDefaultPublishableClientKey(),
+        secretServerKey: options.secretServerKey ?? getDefaultSecretServerKey()
+      }),
+      tokenStore: options.tokenStore,
+      urls: options.urls ?? {}
+    });
   }
   _serverUserFromJson(json) {
     if (json === null)
@@ -856,7 +839,7 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
         return permissions.some((p) => p.id === permissionId);
       },
       toJson() {
-        return app._serverUserToJson(this);
+        return json;
       }
     };
   }
@@ -928,23 +911,6 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       }
     };
   }
-  _serverUserToJson(user) {
-    return {
-      projectId: user.projectId,
-      id: user.id,
-      displayName: user.displayName,
-      primaryEmail: user.primaryEmail,
-      primaryEmailVerified: user.primaryEmailVerified,
-      profileImageUrl: user.profileImageUrl,
-      signedUpAtMillis: user.signedUpAt.getTime(),
-      clientMetadata: user.clientMetadata,
-      serverMetadata: user.serverMetadata,
-      authMethod: user.authMethod,
-      hasPassword: user.hasPassword,
-      authWithEmail: user.authWithEmail,
-      oauthProviders: user.oauthProviders
-    };
-  }
   _serverTeamFromJson(json) {
     const app = this;
     return {
@@ -1105,6 +1071,7 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
       interface: new StackAdminInterface({
         baseUrl: options.baseUrl ?? getDefaultBaseUrl(),
         projectId: options.projectId ?? getDefaultProjectId(),
+        clientVersion,
         ..."projectOwnerTokens" in options ? {
           projectOwnerTokens: options.projectOwnerTokens
         } : {