@stackframe/stack-shared 2.7.23 → 2.7.26

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @stackframe/stack-shared
 
+## 2.7.26
+
+### Patch Changes
+
+- Various changes
+
+## 2.7.25
+
+## 2.7.24
+
 ## 2.7.23
 
 ### Patch Changes

package/dist/interface/crud/projects.d.ts

@@ -64,6 +64,7 @@ export declare const projectsCrudAdminReadSchema: import("yup").ObjectSchema<{
         team_member_default_permissions: {
             id: string;
         }[];
+        oauth_account_merge_strategy: "link_method" | "raise_error" | "allow_duplicates";
     };
 }, import("yup").AnyObject, {
     id: undefined;
@@ -96,6 +97,7 @@ export declare const projectsCrudAdminReadSchema: import("yup").ObjectSchema<{
         create_team_on_sign_up: undefined;
         team_creator_default_permissions: undefined;
         team_member_default_permissions: undefined;
+        oauth_account_merge_strategy: undefined;
     };
 }, "">;
 export declare const projectsCrudClientReadSchema: import("yup").ObjectSchema<{
@@ -166,6 +168,7 @@ export declare const projectsCrudAdminUpdateSchema: import("yup").ObjectSchema<{
         team_member_default_permissions?: {
             id: string;
         }[] | undefined;
+        oauth_account_merge_strategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
     } | undefined;
 }, import("yup").AnyObject, {
     display_name: undefined;
@@ -214,6 +217,7 @@ export declare const projectsCrudAdminCreateSchema: import("yup").ObjectSchema<{
         team_member_default_permissions?: {
             id: string;
         }[] | undefined;
+        oauth_account_merge_strategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
     } | undefined;
 } & {
     display_name: string;
@@ -300,6 +304,7 @@ export declare const projectsCrud: import("../../crud").CrudSchemaFromOptions<{
             team_member_default_permissions: {
                 id: string;
             }[];
+            oauth_account_merge_strategy: "link_method" | "raise_error" | "allow_duplicates";
         };
     }, import("yup").AnyObject, {
         id: undefined;
@@ -332,6 +337,7 @@ export declare const projectsCrud: import("../../crud").CrudSchemaFromOptions<{
             create_team_on_sign_up: undefined;
             team_creator_default_permissions: undefined;
             team_member_default_permissions: undefined;
+            oauth_account_merge_strategy: undefined;
         };
     }, "">;
     adminUpdateSchema: import("yup").ObjectSchema<{
@@ -375,6 +381,7 @@ export declare const projectsCrud: import("../../crud").CrudSchemaFromOptions<{
             team_member_default_permissions?: {
                 id: string;
             }[] | undefined;
+            oauth_account_merge_strategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
         } | undefined;
     }, import("yup").AnyObject, {
         display_name: undefined;
@@ -456,6 +463,7 @@ export declare const internalProjectsCrud: import("../../crud").CrudSchemaFromOp
             team_member_default_permissions: {
                 id: string;
             }[];
+            oauth_account_merge_strategy: "link_method" | "raise_error" | "allow_duplicates";
         };
     }, import("yup").AnyObject, {
         id: undefined;
@@ -488,6 +496,7 @@ export declare const internalProjectsCrud: import("../../crud").CrudSchemaFromOp
             create_team_on_sign_up: undefined;
             team_creator_default_permissions: undefined;
             team_member_default_permissions: undefined;
+            oauth_account_merge_strategy: undefined;
         };
     }, "">;
     clientCreateSchema: import("yup").ObjectSchema<{
@@ -531,6 +540,7 @@ export declare const internalProjectsCrud: import("../../crud").CrudSchemaFromOp
             team_member_default_permissions?: {
                 id: string;
             }[] | undefined;
+            oauth_account_merge_strategy?: "link_method" | "raise_error" | "allow_duplicates" | undefined;
         } | undefined;
     } & {
         display_name: string;

package/dist/interface/crud/projects.js

@@ -74,6 +74,7 @@ export const projectsCrudAdminReadSchema = yupObject({
         create_team_on_sign_up: schemaFields.projectCreateTeamOnSignUpSchema.defined(),
         team_creator_default_permissions: yupArray(teamPermissionSchema.defined()).defined(),
         team_member_default_permissions: yupArray(teamPermissionSchema.defined()).defined(),
+        oauth_account_merge_strategy: schemaFields.oauthAccountMergeStrategySchema.defined(),
     }).defined(),
 }).defined();
 export const projectsCrudClientReadSchema = yupObject({
@@ -107,6 +108,7 @@ export const projectsCrudAdminUpdateSchema = yupObject({
         create_team_on_sign_up: schemaFields.projectCreateTeamOnSignUpSchema.optional(),
         team_creator_default_permissions: yupArray(teamPermissionSchema.defined()).optional(),
         team_member_default_permissions: yupArray(teamPermissionSchema.defined()).optional(),
+        oauth_account_merge_strategy: schemaFields.oauthAccountMergeStrategySchema.optional(),
     }).optional().default(undefined),
 }).defined();
 export const projectsCrudAdminCreateSchema = projectsCrudAdminUpdateSchema.concat(yupObject({

package/dist/known-errors.d.ts

@@ -218,6 +218,9 @@ export declare const KnownErrors: {
     UserEmailAlreadyExists: KnownErrorConstructor<KnownError & KnownErrorBrand<"USER_EMAIL_ALREADY_EXISTS">, []> & {
         errorCode: "USER_EMAIL_ALREADY_EXISTS";
     };
+    EmailNotVerified: KnownErrorConstructor<KnownError & KnownErrorBrand<"EMAIL_NOT_VERIFIED">, []> & {
+        errorCode: "EMAIL_NOT_VERIFIED";
+    };
     UserIdDoesNotExist: KnownErrorConstructor<KnownError & KnownErrorBrand<"USER_ID_DOES_NOT_EXIST">, [userId: string]> & {
         errorCode: "USER_ID_DOES_NOT_EXIST";
     };
@@ -380,7 +383,7 @@ export declare const KnownErrors: {
     OAuthProviderAccessDenied: KnownErrorConstructor<KnownError & KnownErrorBrand<"OAUTH_PROVIDER_ACCESS_DENIED">, []> & {
         errorCode: "OAUTH_PROVIDER_ACCESS_DENIED";
     };
-    ContactChannelAlreadyUsedForAuthBySomeoneElse: KnownErrorConstructor<KnownError & KnownErrorBrand<"CONTACT_CHANNEL_ALREADY_USED_FOR_AUTH_BY_SOMEONE_ELSE">, [type: "email"]> & {
+    ContactChannelAlreadyUsedForAuthBySomeoneElse: KnownErrorConstructor<KnownError & KnownErrorBrand<"CONTACT_CHANNEL_ALREADY_USED_FOR_AUTH_BY_SOMEONE_ELSE">, [type: "email", contactChannelValue?: string | undefined]> & {
         errorCode: "CONTACT_CHANNEL_ALREADY_USED_FOR_AUTH_BY_SOMEONE_ELSE";
     };
 };

package/dist/known-errors.js

@@ -263,6 +263,10 @@ const UserEmailAlreadyExists = createKnownErrorConstructor(KnownError, "USER_EMA
     409,
     "User email already exists.",
 ], () => []);
+const EmailNotVerified = createKnownErrorConstructor(KnownError, "EMAIL_NOT_VERIFIED", () => [
+    400,
+    "The email is not verified.",
+], () => []);
 const CannotGetOwnUserWithoutUser = createKnownErrorConstructor(KnownError, "CANNOT_GET_OWN_USER_WITHOUT_USER", () => [
     400,
     "You have specified 'me' as a userId, but did not provide authentication for a user.",
@@ -531,11 +535,13 @@ const OAuthProviderAccessDenied = createKnownErrorConstructor(KnownError, "OAUTH
     400,
     "The OAuth provider denied access to the user.",
 ], () => []);
-const ContactChannelAlreadyUsedForAuthBySomeoneElse = createKnownErrorConstructor(KnownError, "CONTACT_CHANNEL_ALREADY_USED_FOR_AUTH_BY_SOMEONE_ELSE", (type) => [
+const ContactChannelAlreadyUsedForAuthBySomeoneElse = createKnownErrorConstructor(KnownError, "CONTACT_CHANNEL_ALREADY_USED_FOR_AUTH_BY_SOMEONE_ELSE", (type, contactChannelValue) => [
     409,
-    `This ${type} is already used for authentication by another account.`,
-    { type },
-], (json) => [json.type]);
+    contactChannelValue ?
+        `The ${type} (${contactChannelValue}) is already used for authentication by another account.` :
+        `This ${type} is already used for authentication by another account.`,
+    { type, contact_channel_value: contactChannelValue ?? null },
+], (json) => [json.type, json.contact_channel_value]);
 export const KnownErrors = {
     UnsupportedError,
     BodyParsingError,
@@ -575,6 +581,7 @@ export const KnownErrors = {
     ProviderRejected,
     RefreshTokenNotFoundOrExpired,
     UserEmailAlreadyExists,
+    EmailNotVerified,
     UserIdDoesNotExist,
     UserNotFound,
     ApiKeyNotFound,

package/dist/schema-fields.d.ts

@@ -72,6 +72,7 @@ export declare const oauthClientIdSchema: yup.StringSchema<string | undefined, y
 export declare const oauthClientSecretSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const oauthFacebookConfigIdSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const oauthMicrosoftTenantIdSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
+export declare const oauthAccountMergeStrategySchema: yup.StringSchema<"link_method" | "raise_error" | "allow_duplicates" | undefined, yup.AnyObject, undefined, "">;
 export declare const emailTypeSchema: yup.StringSchema<"shared" | "standard" | undefined, yup.AnyObject, undefined, "">;
 export declare const emailSenderNameSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;
 export declare const emailHostSchema: yup.StringSchema<string | undefined, yup.AnyObject, undefined, "">;

package/dist/schema-fields.js

@@ -171,6 +171,10 @@ export const adaptSchema = yupMixed();
  * Yup's URL schema does not recognize some URLs (including `http://localhost`) as a valid URL. This schema is a workaround for that.
  */
 export const urlSchema = yupString().test({
+    name: 'no-spaces',
+    message: (params) => `${params.path} contains spaces`,
+    test: (value) => value == null || !value.includes(' ')
+}).test({
     name: 'url',
     message: (params) => `${params.path} is not a valid URL`,
     test: (value) => value == null || isValidUrl(value)
@@ -244,6 +248,7 @@ export const oauthClientIdSchema = yupString().meta({ openapiField: { descriptio
 export const oauthClientSecretSchema = yupString().meta({ openapiField: { description: 'OAuth client secret. Needs to be specified when using type="standard"', exampleValue: 'google-oauth-client-secret' } });
 export const oauthFacebookConfigIdSchema = yupString().meta({ openapiField: { description: 'The configuration id for Facebook business login (for things like ads and marketing). This is only required if you are using the standard OAuth with Facebook and you are using Facebook business login.' } });
 export const oauthMicrosoftTenantIdSchema = yupString().meta({ openapiField: { description: 'The Microsoft tenant id for Microsoft directory. This is only required if you are using the standard OAuth with Microsoft and you have an Azure AD tenant.' } });
+export const oauthAccountMergeStrategySchema = yupString().oneOf(['link_method', 'raise_error', 'allow_duplicates']).meta({ openapiField: { description: 'Determines how to handle OAuth logins that match an existing user by email. `link_method` adds the OAuth method to the existing user. `raise_error` rejects the login with an error. `allow_duplicates` creates a new user.', exampleValue: 'link_method' } });
 // Project email config
 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' } });

package/dist/utils/arrays.js

@@ -75,7 +75,6 @@ import.meta.vitest?.test("groupBy", ({ expect }) => {
     expect(grouped.get("odd")).toEqual([1, 3, 5]);
     // Check the actual lengths of the words to ensure our test is correct
     const words = ["apple", "banana", "cherry", "date", "elderberry"];
-    console.log("Word lengths:", words.map(w => `${w}: ${w.length}`));
     const byLength = groupBy(words, (w) => w.length);
     // Adjust expectations based on actual word lengths
     expect(byLength.get(5)).toEqual(["apple"]);

package/dist/utils/proxies.js

@@ -57,37 +57,6 @@ export function logged(name, toLog, options = {}) {
     });
     return proxy;
 }
-import.meta.vitest?.test("logged", ({ expect }) => {
-    // Test with a simple object
-    const obj = {
-        value: 42,
-        method(x) { return x * 2; }
-    };
-    const loggedObj = logged("testObj", obj);
-    // Test property access
-    expect(loggedObj.value).toBe(42);
-    // Test method call
-    const result = loggedObj.method(21);
-    expect(result).toBe(42);
-    // Test property setting
-    loggedObj.value = 100;
-    expect(loggedObj.value).toBe(100);
-    // Test with a promise-returning method
-    const asyncObj = {
-        async asyncMethod(x) { return x * 3; }
-    };
-    const loggedAsyncObj = logged("asyncObj", asyncObj);
-    // Test async method
-    const promise = loggedAsyncObj.asyncMethod(7);
-    expect(promise instanceof Promise).toBe(true);
-    // Test error handling
-    const errorObj = {
-        throwError() { throw new Error("Test error"); }
-    };
-    const loggedErrorObj = logged("errorObj", errorObj);
-    // Test error throwing
-    expect(() => loggedErrorObj.throwError()).toThrow("Test error");
-});
 export function createLazyProxy(factory) {
     let cache = undefined;
     let initialized = false;

package/dist/utils/strings.js

@@ -2,6 +2,8 @@ import { findLastIndex, unique } from "./arrays";
 import { StackAssertionError } from "./errors";
 import { filterUndefined } from "./objects";
 export function typedToLowercase(s) {
+    if (typeof s !== "string")
+        throw new StackAssertionError("Expected a string for typedToLowercase", { s });
     return s.toLowerCase();
 }
 import.meta.vitest?.test("typedToLowercase", ({ expect }) => {
@@ -12,8 +14,11 @@ import.meta.vitest?.test("typedToLowercase", ({ expect }) => {
     expect(typedToLowercase("123")).toBe("123");
     expect(typedToLowercase("MIXED123case")).toBe("mixed123case");
     expect(typedToLowercase("Special@Chars!")).toBe("special@chars!");
+    expect(() => typedToLowercase(123)).toThrow("Expected a string for typedToLowercase");
 });
 export function typedToUppercase(s) {
+    if (typeof s !== "string")
+        throw new StackAssertionError("Expected a string for typedToUppercase", { s });
     return s.toUpperCase();
 }
 import.meta.vitest?.test("typedToUppercase", ({ expect }) => {
@@ -24,6 +29,7 @@ import.meta.vitest?.test("typedToUppercase", ({ expect }) => {
     expect(typedToUppercase("123")).toBe("123");
     expect(typedToUppercase("mixed123Case")).toBe("MIXED123CASE");
     expect(typedToUppercase("special@chars!")).toBe("SPECIAL@CHARS!");
+    expect(() => typedToUppercase(123)).toThrow("Expected a string for typedToUppercase");
 });
 export function typedCapitalize(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackframe/stack-shared",
-  "version": "2.7.23",
+  "version": "2.7.26",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",