@stackframe/stack 2.5.10 → 2.5.12

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

@@ -23,7 +23,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.10";
+var clientVersion = "js @stackframe/stack@2.5.12";
 function getUrls(partial) {
   const handler = partial.handler ?? "/handler";
   const home = partial.home ?? "/";
@@ -672,31 +672,33 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     if (!url) {
       throw new Error(`No URL for handler name ${handlerName}`);
     }
-    if (handlerName === "afterSignIn" || handlerName === "afterSignUp") {
-      if (isReactServer || typeof window === "undefined") {
-        try {
-          await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
-        } catch (e) {
-        }
-      } else {
-        const queryParams = new URLSearchParams(window.location.search);
-        url = queryParams.get("after_auth_return_to") || url;
-      }
-    } else if (handlerName === "signIn" || handlerName === "signUp") {
-      if (isReactServer || typeof window === "undefined") {
-        try {
-          await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
-        } catch (e) {
+    if (!options?.noRedirectBack) {
+      if (handlerName === "afterSignIn" || handlerName === "afterSignUp") {
+        if (isReactServer || typeof window === "undefined") {
+          try {
+            await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
+          } catch (e) {
+          }
+        } else {
+          const queryParams = new URLSearchParams(window.location.search);
+          url = queryParams.get("after_auth_return_to") || url;
         }
-      } else {
-        const currentUrl = new URL(window.location.href);
-        const nextUrl = new URL(url, currentUrl);
-        if (currentUrl.searchParams.has("after_auth_return_to")) {
-          nextUrl.searchParams.set("after_auth_return_to", currentUrl.searchParams.get("after_auth_return_to"));
-        } else if (currentUrl.protocol === nextUrl.protocol && currentUrl.host === nextUrl.host) {
-          nextUrl.searchParams.set("after_auth_return_to", getRelativePart(currentUrl));
+      } else if (handlerName === "signIn" || handlerName === "signUp") {
+        if (isReactServer || typeof window === "undefined") {
+          try {
+            await this._checkFeatureSupport("rsc-handler-" + handlerName, {});
+          } catch (e) {
+          }
+        } else {
+          const currentUrl = new URL(window.location.href);
+          const nextUrl = new URL(url, currentUrl);
+          if (currentUrl.searchParams.has("after_auth_return_to")) {
+            nextUrl.searchParams.set("after_auth_return_to", currentUrl.searchParams.get("after_auth_return_to"));
+          } else if (currentUrl.protocol === nextUrl.protocol && currentUrl.host === nextUrl.host) {
+            nextUrl.searchParams.set("after_auth_return_to", getRelativePart(currentUrl));
+          }
+          url = getRelativePart(nextUrl);
         }
-        url = getRelativePart(nextUrl);
       }
     }
     await this._redirectIfTrusted(url, options);
@@ -1033,24 +1035,15 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
     });
   }
   async _updateServerUser(userId, update) {
-    const result = await this._interface.updateServerUser(userId, userUpdateOptionsToCrud(update));
+    const result = await this._interface.updateServerUser(userId, serverUserUpdateOptionsToCrud(update));
     await this._refreshUsers();
     return result;
   }
-  _createBaseUser(crud) {
+  _serverUserFromCrud(crud) {
     const app = this;
-    if (!crud) {
-      throw new StackAssertionError("User not found");
-    }
     return {
       ...super._createBaseUser(crud),
-      ..."server_metadata" in crud ? {
-        // server user
-        serverMetadata: crud.server_metadata
-      } : {},
-      async setServerMetadata(metadata) {
-        await app._updateServerUser(crud.id, { serverMetadata: metadata });
-      },
+      serverMetadata: crud.server_metadata,
       async setPrimaryEmail(email, options) {
         await app._updateServerUser(crud.id, { primaryEmail: email, primaryEmailVerified: options?.verified });
       },
@@ -1078,21 +1071,16 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
             return tokens;
           }
         };
-      }
-    };
-  }
-  _createUserExtra(crud) {
-    if (!crud) {
-      throw new StackAssertionError("User not found");
-    }
-    const app = this;
-    return {
+      },
       async setDisplayName(displayName) {
         return await this.update({ displayName });
       },
       async setClientMetadata(metadata) {
         return await this.update({ clientMetadata: metadata });
       },
+      async setServerMetadata(metadata) {
+        return await this.update({ serverMetadata: metadata });
+      },
       async setSelectedTeam(team) {
         return await this.update({ selectedTeamId: team?.id ?? null });
       },
@@ -1153,12 +1141,6 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
       }
     };
   }
-  _serverUserFromCrud(crud) {
-    return {
-      ...this._createUserExtra(crud),
-      ...this._createBaseUser(crud)
-    };
-  }
   _currentUserFromCrud(crud, session) {
     const app = this;
     const currentUser = {
@@ -1526,7 +1508,7 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
     return this._serverTeamPermissionDefinitionFromCrud(crud);
   }
   async updateTeamPermissionDefinition(permissionId, data) {
-    await this._interface.updatePermissionDefinition(permissionId, data);
+    await this._interface.updatePermissionDefinition(permissionId, serverTeamPermissionDefinitionUpdateOptionsToCrud(data));
     await this._adminTeamPermissionDefinitionsCache.refresh([]);
   }
   async deleteTeamPermissionDefinition(permissionId) {
@@ -1560,6 +1542,18 @@ function userUpdateOptionsToCrud(options) {
     selected_team_id: options.selectedTeamId
   };
 }
+function serverUserUpdateOptionsToCrud(options) {
+  return {
+    display_name: options.displayName,
+    primary_email: options.primaryEmail,
+    client_metadata: options.clientMetadata,
+    server_metadata: options.serverMetadata,
+    selected_team_id: options.selectedTeamId,
+    primary_email_auth_enabled: options.primaryEmailAuthEnabled,
+    primary_email_verified: options.primaryEmailVerified,
+    password: options.password
+  };
+}
 function adminProjectUpdateOptionsToCrud(options) {
   return {
     display_name: options.displayName,