@hexclave/next 1.0.25 → 1.0.26

package/src/lib/hexclave-app/apps/implementations/client-app-impl.ts

@@ -355,7 +355,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
         {
           provider,
           redirectUrl: this._getOAuthCallbackRedirectUri(),
-          errorRedirectUrl: this.urls.error,
+          errorRedirectUrl: this._getUrls().error,
           providerScope: mergeScopeStrings(scopeString, (this._oauthScopesOnSignIn[provider as ProviderType] ?? []).join(" ")),
         },
         session,
@@ -558,7 +558,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
         {
           provider: options.providerId,
           redirectUrl: this._getOAuthCallbackRedirectUri(),
-          errorRedirectUrl: this.urls.error,
+          errorRedirectUrl: this._getUrls().error,
           providerScope: mergeScopeStrings(options.scope || "", (this._oauthScopesOnSignIn[options.providerId] ?? []).join(" ")),
         },
         options.session,
@@ -864,7 +864,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
 
   protected _getOAuthCallbackRedirectUri(): string {
     if (!this._isOAuthCallbackUrlHosted()) {
-      return this.urls.oauthCallback;
+      return this._getUrls().oauthCallback;
     }
     if (typeof window === "undefined") {
       throw new HexclaveAssertionError("Hosted OAuth callback URLs require a browser environment to use the current URL as the redirect URI");
@@ -3024,13 +3024,13 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
   async redirectToMfa(options?: RedirectToOptions) { return await this._redirectToHandler("mfa", options); }
 
   async sendForgotPasswordEmail(email: string, options?: { callbackUrl?: string }): Promise<Result<undefined, KnownErrors["UserNotFound"]>> {
-    return await this._interface.sendForgotPasswordEmail(email, options?.callbackUrl ?? constructRedirectUrl(this.urls.passwordReset, "callbackUrl"));
+    return await this._interface.sendForgotPasswordEmail(email, options?.callbackUrl ?? constructRedirectUrl(this._getUrls().passwordReset, "callbackUrl"));
   }
 
   async sendMagicLinkEmail(email: string, options?: {
     callbackUrl?: string,
   }): Promise<Result<{ nonce: string }, KnownErrors["RedirectUrlNotWhitelisted"] | KnownErrors["BotChallengeFailed"]>> {
-    const callbackUrl = options?.callbackUrl ?? constructRedirectUrl(this.urls.magicLinkCallback, "callbackUrl");
+    const callbackUrl = options?.callbackUrl ?? constructRedirectUrl(this._getUrls().magicLinkCallback, "callbackUrl");
     return await this._executeResultWithBotChallengeFlow({
       action: "send_magic_link_email",
       execute: async (challenge) => {
@@ -3319,7 +3319,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
       return await this._interface.authorizeOAuth({
         provider,
         redirectUrl: constructRedirectUrl(this._getOAuthCallbackRedirectUri(), "redirectUrl"),
-        errorRedirectUrl: constructRedirectUrl(this.urls.error, "errorRedirectUrl"),
+        errorRedirectUrl: constructRedirectUrl(this._getUrls().error, "errorRedirectUrl"),
         afterCallbackRedirectUrl,
         type: "authenticate",
         providerScope: this._oauthScopesOnSignIn[provider]?.join(" "),
@@ -3439,7 +3439,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
     }
     this._ensurePersistentTokenStore();
     const session = await this._getSession();
-    const emailVerificationRedirectUrl = options.noVerificationCallback ? undefined : options.verificationCallbackUrl ?? constructRedirectUrl(this.urls.emailVerification, "verificationCallbackUrl");
+    const emailVerificationRedirectUrl = options.noVerificationCallback ? undefined : options.verificationCallbackUrl ?? constructRedirectUrl(this._getUrls().emailVerification, "verificationCallbackUrl");
 
     const executeSignUp = async (challenge: { token?: string, phase?: "invisible" | "visible", unavailable?: true }) => {
       let result = await this._interface.signUpWithCredential(
@@ -3602,7 +3602,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
 
     // Step 2: Open the browser for the user to authenticate and display the verification code
     const url = buildCliAuthConfirmUrl({
-      cliAuthConfirmUrl: this.urls.cliAuthConfirm,
+      cliAuthConfirmUrl: this._getUrls().cliAuthConfirm,
       appUrl: options.appUrl,
       loginCode,
     });
@@ -4040,6 +4040,7 @@ export class _HexclaveClientAppImplIncomplete<HasTokenStore extends boolean, Pro
       ) => {
         return await this._interface.sendClientRequest(path, requestOptions, await this._getSession(), requestType);
       },
+      getUrls: () => this._getUrls(),
       getRedirectMethod: () => this._redirectMethod ?? throwErr("Redirect method should have been initialized in the Stack client app constructor"),
       redirectToUrl: async (url: string | URL, options?: { replace?: boolean }) => {
         await this._redirectTo({ url, ...options });

package/src/lib/hexclave-app/apps/interfaces/admin-app.ts

@@ -13,6 +13,7 @@ import { AsyncStoreProperty, EmailConfig } from "../../common";
 import { AdminEmailOutbox, AdminSentEmail } from "../../email";
 import { InternalApiKey, InternalApiKeyCreateOptions, InternalApiKeyFirstView } from "../../internal-api-keys";
 import { AdminProjectPermission, AdminProjectPermissionDefinition, AdminProjectPermissionDefinitionCreateOptions, AdminProjectPermissionDefinitionUpdateOptions, AdminTeamPermission, AdminTeamPermissionDefinition, AdminTeamPermissionDefinitionCreateOptions, AdminTeamPermissionDefinitionUpdateOptions } from "../../permissions";
+import type { PlanUsage } from "../../plan-usage";
 import { AdminProject } from "../../projects";
 import { _HexclaveAdminAppImpl } from "../implementations";
 import { StackServerApp, StackServerAppConstructorOptions } from "./server-app";
@@ -75,6 +76,7 @@ export type StackAdminAppConstructorOptions<HasTokenStore extends boolean, Proje
 /** @deprecated Use `HexclaveAdminApp` from the `@hexclave/*` package instead — same symbol, new brand name. See https://docs.hexclave.com/migration. */
 export type StackAdminApp<HasTokenStore extends boolean = boolean, ProjectId extends string = string> = (
   & AsyncStoreProperty<"project", [], AdminProject, false>
+  & AsyncStoreProperty<"planUsage", [], PlanUsage, false>
   & AsyncStoreProperty<"internalApiKeys", [], InternalApiKey[], true>
   & AsyncStoreProperty<"teamPermissionDefinitions", [], AdminTeamPermissionDefinition[], true>
   & AsyncStoreProperty<"projectPermissionDefinitions", [], AdminProjectPermissionDefinition[], true>

package/src/lib/hexclave-app/apps/interfaces/client-app.ts

@@ -131,6 +131,7 @@ export type StackClientApp<HasTokenStore extends boolean = boolean, ProjectId ex
       sendAnalyticsEventBatch(body: string, options: { keepalive: boolean }): Promise<Result<Response, Error>>,
       addRequestListener(listener: RequestListener): () => void,
       sendRequest(path: string, requestOptions: RequestInit, requestType?: "client" | "server" | "admin"): Promise<Response>,
+      getUrls(): Readonly<ResolvedHandlerUrls>,
       getRedirectMethod(): RedirectMethod,
       redirectToUrl(url: string | URL, options?: { replace?: boolean }): Promise<void>,
       redirectToHandler(handlerName: keyof HandlerUrls, options?: RedirectToOptions): Promise<void>,

package/src/lib/hexclave-app/index.ts

@@ -118,6 +118,14 @@ export type {
   PushedConfigSource
 } from "./projects";
 
+export type {
+  PlanUsage,
+  PlanUsageKind,
+  PlanUsageNextPlanId,
+  PlanUsagePlanId,
+  PlanUsageRow,
+} from "./plan-usage";
+
 export type {
   EditableTeamMemberProfile, ReceivedTeamInvitation,
   SentTeamInvitation, ServerListUsersOptions,

package/src/lib/hexclave-app/plan-usage/index.ts

@@ -0,0 +1,29 @@
+
+//===========================================
+// THIS FILE IS AUTO-GENERATED FROM TEMPLATE. DO NOT EDIT IT DIRECTLY UNLESS YOU ALSO EDIT THE CORRESPONDING FILE IN packages/template
+//===========================================
+export type PlanUsageKind = "current" | "metered" | "capability";
+export type PlanUsagePlanId = "free" | "team" | "growth";
+export type PlanUsageNextPlanId = "team" | "growth";
+
+export type PlanUsageRow = {
+  itemId: string,
+  displayName: string,
+  kind: PlanUsageKind,
+  used: number | null,
+  limit: number | null,
+  remaining: number | null,
+  overage: number | null,
+  isUnlimited: boolean,
+};
+
+export type PlanUsage = {
+  ownerTeamId: string,
+  ownerTeamDisplayName: string,
+  planId: PlanUsagePlanId,
+  planDisplayName: string,
+  periodStart: Date,
+  periodEnd: Date,
+  nextPlanId: PlanUsageNextPlanId | null,
+  rows: PlanUsageRow[],
+};

package/src/lib/hexclave-app/projects/index.ts

@@ -44,6 +44,7 @@ export type AdminProject = {
   readonly isDevelopmentEnvironment: boolean,
   readonly ownerTeamId: string | null,
   readonly onboardingStatus: ProjectOnboardingStatus,
+  readonly onboardingState: NonNullable<ProjectsCrud["Admin"]["Read"]["onboarding_state"]> | null,
   readonly logoUrl: string | null | undefined,
   readonly logoFullUrl: string | null | undefined,
   readonly logoDarkModeUrl: string | null | undefined,