@stackframe/stack-shared 2.7.13 → 2.7.14

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @stackframe/stack-shared
 
+## 2.7.14
+
+### Patch Changes
+
+- Various changes
+  - @stackframe/stack-sc@2.7.14
+
 ## 2.7.13
 
 ### Patch Changes

package/dist/interface/crud/projects.js

@@ -45,7 +45,9 @@ export const emailConfigSchema = yupObject({
     }),
 });
 const domainSchema = yupObject({
-    domain: schemaFields.projectTrustedDomainSchema.defined(),
+    domain: schemaFields.urlSchema.defined()
+        .matches(/^https?:\/\//, 'URL must start with http:// or https://')
+        .meta({ openapiField: { description: 'URL. Must start with http:// or https://', exampleValue: 'https://example.com' } }),
     handler_path: schemaFields.handlerPathSchema.defined(),
 });
 export const projectsCrudAdminReadSchema = yupObject({

package/dist/interface/crud/users.js

@@ -7,7 +7,7 @@ export const usersCrudServerUpdateSchema = fieldSchema.yupObject({
     client_metadata: fieldSchema.userClientMetadataSchema.optional(),
     client_read_only_metadata: fieldSchema.userClientReadOnlyMetadataSchema.optional(),
     server_metadata: fieldSchema.userServerMetadataSchema.optional(),
-    primary_email: fieldSchema.primaryEmailSchema.nullable().optional(),
+    primary_email: fieldSchema.primaryEmailSchema.nullable().optional().nonEmpty(),
     primary_email_verified: fieldSchema.primaryEmailVerifiedSchema.optional(),
     primary_email_auth_enabled: fieldSchema.primaryEmailAuthEnabledSchema.optional(),
     passkey_auth_enabled: fieldSchema.userOtpAuthEnabledSchema.optional(),

package/dist/interface/serverInterface.js

@@ -2,6 +2,7 @@ import { KnownErrors } from "../known-errors";
 import { StackAssertionError } from "../utils/errors";
 import { filterUndefined } from "../utils/objects";
 import { Result } from "../utils/results";
+import { urlString } from "../utils/urls";
 import { StackClientInterface } from "./clientInterface";
 export class StackServerInterface extends StackClientInterface {
     constructor(options) {
@@ -57,35 +58,35 @@ export class StackServerInterface extends StackClientInterface {
         return user;
     }
     async getServerUserById(userId) {
-        const response = await this.sendServerRequest(`/users/${userId}`, {}, null);
+        const response = await this.sendServerRequest(urlString `/users/${userId}`, {}, null);
         const user = await response.json();
         if (!user)
             return Result.error(new Error("Failed to get user"));
         return Result.ok(user);
     }
     async listServerTeamInvitations(options) {
-        const response = await this.sendServerRequest("/team-invitations?team_id=" + options.teamId, {}, null);
+        const response = await this.sendServerRequest(urlString `/team-invitations?team_id=${options.teamId}`, {}, null);
         const result = await response.json();
         return result.items;
     }
     async revokeServerTeamInvitation(invitationId, teamId) {
-        await this.sendServerRequest(`/team-invitations/${invitationId}?team_id=${teamId}`, { method: "DELETE" }, null);
+        await this.sendServerRequest(urlString `/team-invitations/${invitationId}?team_id=${teamId}`, { method: "DELETE" }, null);
     }
     async listServerTeamMemberProfiles(options) {
-        const response = await this.sendServerRequest("/team-member-profiles?team_id=" + options.teamId, {}, null);
+        const response = await this.sendServerRequest(urlString `/team-member-profiles?team_id=${options.teamId}`, {}, null);
         const result = await response.json();
         return result.items;
     }
     async getServerTeamMemberProfile(options) {
-        const response = await this.sendServerRequest(`/team-member-profiles/${options.teamId}/${options.userId}`, {}, null);
+        const response = await this.sendServerRequest(urlString `/team-member-profiles/${options.teamId}/${options.userId}`, {}, null);
         return await response.json();
     }
     async listServerTeamPermissions(options, session) {
-        const response = await this.sendServerRequest("/team-permissions?" + new URLSearchParams(filterUndefined({
+        const response = await this.sendServerRequest(`/team-permissions?${new URLSearchParams(filterUndefined({
             user_id: options.userId,
             team_id: options.teamId,
             recursive: options.recursive.toString(),
-        })), {}, session);
+        }))}`, {}, session);
         const result = await response.json();
         return result.items;
     }
@@ -107,9 +108,9 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async listServerTeams(options) {
-        const response = await this.sendServerRequest("/teams?" + new URLSearchParams(filterUndefined({
+        const response = await this.sendServerRequest(`/teams?${new URLSearchParams(filterUndefined({
             user_id: options?.userId,
-        })), {}, null);
+        }))}`, {}, null);
         const result = await response.json();
         return result.items;
     }
@@ -130,7 +131,7 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async updateServerTeam(teamId, data) {
-        const response = await this.sendServerRequest(`/teams/${teamId}`, {
+        const response = await this.sendServerRequest(urlString `/teams/${teamId}`, {
             method: "PATCH",
             headers: {
                 "content-type": "application/json",
@@ -140,10 +141,10 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async deleteServerTeam(teamId) {
-        await this.sendServerRequest(`/teams/${teamId}`, { method: "DELETE" }, null);
+        await this.sendServerRequest(urlString `/teams/${teamId}`, { method: "DELETE" }, null);
     }
     async addServerUserToTeam(options) {
-        const response = await this.sendServerRequest(`/team-memberships/${options.teamId}/${options.userId}`, {
+        const response = await this.sendServerRequest(urlString `/team-memberships/${options.teamId}/${options.userId}`, {
             method: "POST",
             headers: {
                 "content-type": "application/json",
@@ -153,7 +154,7 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async removeServerUserFromTeam(options) {
-        await this.sendServerRequest(`/team-memberships/${options.teamId}/${options.userId}`, {
+        await this.sendServerRequest(urlString `/team-memberships/${options.teamId}/${options.userId}`, {
             method: "DELETE",
             headers: {
                 "content-type": "application/json",
@@ -162,7 +163,7 @@ export class StackServerInterface extends StackClientInterface {
         }, null);
     }
     async updateServerUser(userId, update) {
-        const response = await this.sendServerRequest(`/users/${userId}`, {
+        const response = await this.sendServerRequest(urlString `/users/${userId}`, {
             method: "PATCH",
             headers: {
                 "content-type": "application/json",
@@ -172,7 +173,7 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async createServerProviderAccessToken(userId, provider, scope) {
-        const response = await this.sendServerRequest(`/connected-accounts/${userId}/${provider}/access-token`, {
+        const response = await this.sendServerRequest(urlString `/connected-accounts/${userId}/${provider}/access-token`, {
             method: "POST",
             headers: {
                 "content-type": "application/json",
@@ -199,7 +200,7 @@ export class StackServerInterface extends StackClientInterface {
         };
     }
     async leaveServerTeam(options) {
-        await this.sendClientRequest(`/team-memberships/${options.teamId}/${options.userId}`, {
+        await this.sendClientRequest(urlString `/team-memberships/${options.teamId}/${options.userId}`, {
             method: "DELETE",
             headers: {
                 "content-type": "application/json",
@@ -208,7 +209,7 @@ export class StackServerInterface extends StackClientInterface {
         }, null);
     }
     async updateServerTeamMemberProfile(options) {
-        await this.sendServerRequest(`/team-member-profiles/${options.teamId}/${options.userId}`, {
+        await this.sendServerRequest(urlString `/team-member-profiles/${options.teamId}/${options.userId}`, {
             method: "PATCH",
             headers: {
                 "content-type": "application/json",
@@ -217,7 +218,7 @@ export class StackServerInterface extends StackClientInterface {
         }, null);
     }
     async grantServerTeamUserPermission(teamId, userId, permissionId) {
-        await this.sendServerRequest(`/team-permissions/${teamId}/${userId}/${permissionId}`, {
+        await this.sendServerRequest(urlString `/team-permissions/${teamId}/${userId}/${permissionId}`, {
             method: "POST",
             headers: {
                 "content-type": "application/json",
@@ -226,7 +227,7 @@ export class StackServerInterface extends StackClientInterface {
         }, null);
     }
     async revokeServerTeamUserPermission(teamId, userId, permissionId) {
-        await this.sendServerRequest(`/team-permissions/${teamId}/${userId}/${permissionId}`, {
+        await this.sendServerRequest(urlString `/team-permissions/${teamId}/${userId}/${permissionId}`, {
             method: "DELETE",
             headers: {
                 "content-type": "application/json",
@@ -235,7 +236,7 @@ export class StackServerInterface extends StackClientInterface {
         }, null);
     }
     async deleteServerServerUser(userId) {
-        await this.sendServerRequest(`/users/${userId}`, {
+        await this.sendServerRequest(urlString `/users/${userId}`, {
             method: "DELETE",
             headers: {
                 "content-type": "application/json",
@@ -254,7 +255,7 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async updateServerContactChannel(userId, contactChannelId, data) {
-        const response = await this.sendServerRequest(`/contact-channels/${userId}/${contactChannelId}`, {
+        const response = await this.sendServerRequest(urlString `/contact-channels/${userId}/${contactChannelId}`, {
             method: "PATCH",
             headers: {
                 "content-type": "application/json",
@@ -264,19 +265,19 @@ export class StackServerInterface extends StackClientInterface {
         return await response.json();
     }
     async deleteServerContactChannel(userId, contactChannelId) {
-        await this.sendServerRequest(`/contact-channels/${userId}/${contactChannelId}`, {
+        await this.sendServerRequest(urlString `/contact-channels/${userId}/${contactChannelId}`, {
             method: "DELETE",
         }, null);
     }
     async listServerContactChannels(userId) {
-        const response = await this.sendServerRequest(`/contact-channels?user_id=${userId}`, {
+        const response = await this.sendServerRequest(urlString `/contact-channels?user_id=${userId}`, {
             method: "GET",
         }, null);
         const json = await response.json();
         return json.items;
     }
     async sendServerContactChannelVerificationEmail(userId, contactChannelId, callbackUrl) {
-        await this.sendServerRequest(`/contact-channels/${userId}/${contactChannelId}/send-verification-code`, {
+        await this.sendServerRequest(urlString `/contact-channels/${userId}/${contactChannelId}/send-verification-code`, {
             method: "POST",
             headers: {
                 "content-type": "application/json",

package/dist/schema-fields.d.ts

@@ -79,7 +79,6 @@ export declare const emailPortSchema: yup.NumberSchema<number | undefined, yup.A
 export declare const emailUsernameSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const emailSenderEmailSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const emailPasswordSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
-export declare const projectTrustedDomainSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const handlerPathSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare class ReplaceFieldWithOwnUserId extends Error {
     readonly path: string;

package/dist/schema-fields.js

@@ -248,12 +248,11 @@ export const oauthMicrosoftTenantIdSchema = yupString().meta({ openapiField: { d
 export const emailTypeSchema = yupString().oneOf(['shared', 'standard']).meta({ openapiField: { description: 'Email provider type, one of shared, standard. "shared" uses Stack shared email provider and it is only meant for development. "standard" uses your own email server and will have your email address as the sender.', exampleValue: 'standard' } });
 export const emailSenderNameSchema = yupString().meta({ openapiField: { description: 'Email sender name. Needs to be specified when using type="standard"', exampleValue: 'Stack' } });
 export const emailHostSchema = yupString().meta({ openapiField: { description: 'Email host. Needs to be specified when using type="standard"', exampleValue: 'smtp.your-domain.com' } });
-export const emailPortSchema = yupNumber().meta({ openapiField: { description: 'Email port. Needs to be specified when using type="standard"', exampleValue: 587 } });
+export const emailPortSchema = yupNumber().min(0).max(65535).meta({ openapiField: { description: 'Email port. Needs to be specified when using type="standard"', exampleValue: 587 } });
 export const emailUsernameSchema = yupString().meta({ openapiField: { description: 'Email username. Needs to be specified when using type="standard"', exampleValue: 'smtp-email' } });
 export const emailSenderEmailSchema = emailSchema.meta({ openapiField: { description: 'Email sender email. Needs to be specified when using type="standard"', exampleValue: 'example@your-domain.com' } });
 export const emailPasswordSchema = passwordSchema.meta({ openapiField: { description: 'Email password. Needs to be specified when using type="standard"', exampleValue: 'your-email-password' } });
 // Project domain config
-export const projectTrustedDomainSchema = urlSchema.test('is-https', 'Trusted domain must start with https://', (value) => value?.startsWith('https://')).meta({ openapiField: { description: 'Your domain URL. Make sure you own and trust this domain. Needs to start with https://', exampleValue: 'https://example.com' } });
 export const handlerPathSchema = yupString().test('is-handler-path', 'Handler path must start with /', (value) => value?.startsWith('/')).meta({ openapiField: { description: 'Handler path. If you did not setup a custom handler path, it should be "/handler" by default. It needs to start with /', exampleValue: '/handler' } });
 // Users
 export class ReplaceFieldWithOwnUserId extends Error {

package/dist/utils/caches.d.ts

@@ -17,16 +17,16 @@ export declare class AsyncCache<D extends any[], T> {
     refreshWhere(predicate: (dependencies: D) => boolean): Promise<void>;
     readonly isCacheAvailable: (key: D) => boolean;
     readonly getIfCached: (key: D) => ({
+        status: "error";
+        error: unknown;
+    } & {
+        status: "error";
+    }) | ({
         status: "pending";
     } & {
         progress: void;
     } & {
         status: "pending";
-    }) | ({
-        status: "error";
-        error: unknown;
-    } & {
-        status: "error";
     }) | ({
         status: "ok";
         data: T;
@@ -57,16 +57,16 @@ declare class AsyncValueCache<T> {
     });
     isCacheAvailable(): boolean;
     getIfCached(): ({
+        status: "error";
+        error: unknown;
+    } & {
+        status: "error";
+    }) | ({
         status: "pending";
     } & {
         progress: void;
     } & {
         status: "pending";
-    }) | ({
-        status: "error";
-        error: unknown;
-    } & {
-        status: "error";
     }) | ({
         status: "ok";
         data: T;

package/dist/utils/promises.js

@@ -1,3 +1,4 @@
+import { KnownError } from "..";
 import { StackAssertionError, captureError, concatStacktraces } from "./errors";
 import { DependenciesMap } from "./maps";
 import { Result } from "./results";
@@ -105,7 +106,12 @@ export function runAsynchronouslyWithAlert(...args) {
     return runAsynchronously(args[0], {
         ...args[1],
         onError: error => {
-            alert(`An unhandled error occurred. Please ${process.env.NODE_ENV === "development" ? `check the browser console for the full error.` : "report this to the developer."}\n\n${error}`);
+            if (error instanceof KnownError && process.env.NODE_ENV.includes("production")) {
+                alert(error.message);
+            }
+            else {
+                alert(`An unhandled error occurred. Please ${process.env.NODE_ENV === "development" ? `check the browser console for the full error.` : "report this to the developer."}\n\n${error}`);
+            }
             args[1]?.onError?.(error);
         },
     }, ...args.slice(2));

package/dist/utils/stores.d.ts

@@ -60,12 +60,6 @@ export declare class AsyncStore<T> implements ReadonlyAsyncStore<T> {
     isAvailable(): boolean;
     isRejected(): boolean;
     get(): ({
-        status: "pending";
-    } & {
-        progress: void;
-    } & {
-        status: "pending";
-    }) | ({
         status: "error";
         error: unknown;
     } & {
@@ -75,6 +69,12 @@ export declare class AsyncStore<T> implements ReadonlyAsyncStore<T> {
         data: T;
     } & {
         status: "ok";
+    }) | ({
+        status: "pending";
+    } & {
+        progress: void;
+    } & {
+        status: "pending";
     });
     getOrWait(): ReactPromise<T>;
     _setIfLatest(result: Result<T>, curCounter: number): boolean;

package/dist/utils/strings.js

@@ -67,11 +67,7 @@ export function trimLines(s) {
  * Useful for implementing your own template literal tags.
  */
 export function templateIdentity(strings, ...values) {
-    if (strings.length === 0)
-        return "";
-    if (values.length !== strings.length - 1)
-        throw new Error("Invalid number of values; must be one less than strings");
-    return strings.slice(1).reduce((result, string, i) => `${result}${values[i] ?? "n/a"}${string}`, strings[0]);
+    return strings.reduce((result, str, i) => result + str + (values[i] ?? ''), '');
 }
 export function deindent(strings, ...values) {
     if (typeof strings === "string")

package/dist/utils/urls.d.ts

@@ -3,3 +3,15 @@ export declare function isValidUrl(url: string): boolean;
 export declare function isLocalhost(urlOrString: string | URL): boolean;
 export declare function isRelative(url: string): boolean;
 export declare function getRelativePart(url: URL): string;
+/**
+ * A template literal tag that returns a URL.
+ *
+ * Any values passed are encoded.
+ */
+export declare function url(strings: TemplateStringsArray | readonly string[], ...values: (string | number | boolean)[]): URL;
+/**
+ * A template literal tag that returns a URL string.
+ *
+ * Any values passed are encoded.
+ */
+export declare function urlString(strings: TemplateStringsArray | readonly string[], ...values: (string | number | boolean)[]): string;

package/dist/utils/urls.js

@@ -1,4 +1,5 @@
 import { generateSecureRandomString } from "./crypto";
+import { templateIdentity } from "./strings";
 export function createUrlIfValid(...args) {
     try {
         return new URL(...args);
@@ -34,3 +35,19 @@ export function isRelative(url) {
 export function getRelativePart(url) {
     return url.pathname + url.search + url.hash;
 }
+/**
+ * A template literal tag that returns a URL.
+ *
+ * Any values passed are encoded.
+ */
+export function url(strings, ...values) {
+    return new URL(urlString(strings, ...values));
+}
+/**
+ * A template literal tag that returns a URL string.
+ *
+ * Any values passed are encoded.
+ */
+export function urlString(strings, ...values) {
+    return templateIdentity(strings, values.map(encodeURIComponent));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackframe/stack-shared",
-  "version": "2.7.13",
+  "version": "2.7.14",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -52,7 +52,7 @@
     "oauth4webapi": "^2.10.3",
     "semver": "^7.6.3",
     "uuid": "^9.0.1",
-    "@stackframe/stack-sc": "2.7.13"
+    "@stackframe/stack-sc": "2.7.14"
   },
   "devDependencies": {
     "@sentry/nextjs": "^8.40.0",