autumn-js 0.1.34 → 0.1.36

package/dist/libraries/backend/{chunk-ENRZQDOT.mjs → chunk-QOJMX7ML.mjs}

@@ -316,14 +316,6 @@ var toContainerResult = async ({
       }
     } catch (error2) {
       throw error2;
-      return {
-        data: null,
-        error: new AutumnError({
-          message: "Failed to parse JSON response from Autumn",
-          code: "internal_error"
-        }),
-        statusCode: response.status
-      };
     }
     return {
       data: null,
@@ -335,7 +327,7 @@ var toContainerResult = async ({
     };
   }
   try {
-    let data = await response.json();
+    const data = await response.json();
     return {
       data,
       error: null,
@@ -343,14 +335,6 @@ var toContainerResult = async ({
     };
   } catch (error) {
     throw error;
-    return {
-      data: null,
-      error: new AutumnError({
-        message: "Failed to parse Autumn API response",
-        code: "internal_error"
-      }),
-      statusCode: response?.status
-    };
   }
 };
 
@@ -978,15 +962,8 @@ var toBackendError = ({
 export {
   Autumn,
   CustomerExpandEnum,
-  BillingPortalParamsSchema,
-  CancelParamsSchema,
-  TrackParamsSchema,
-  CheckParamsSchema,
+  QueryRangeEnum,
   fetchPricingTable,
-  CreateReferralCodeParamsSchema,
-  RedeemReferralCodeParamsSchema,
-  AttachParamsSchema,
-  CheckoutParamsSchema,
   toBackendRes,
   toBackendError
 };

package/dist/libraries/backend/chunk-SRJD6EXQ.mjs

@@ -0,0 +1,104 @@
+// src/libraries/backend/utils/betterAuth/middlewares.ts
+import { getSessionFromCtx } from "better-auth/api";
+var scopeContainsOrg = ({ options }) => {
+  return options?.customerScope === "organization" || options?.customerScope === "user_and_organization";
+};
+async function getOrganizationContext(ctx, options) {
+  if (!scopeContainsOrg({ options }) && !options?.identify) {
+    return {
+      activeOrganizationId: null,
+      activeOrganization: null,
+      activeOrganizationEmail: null
+    };
+  }
+  try {
+    const session = await getSessionFromCtx(ctx);
+    const orgId = session?.session.activeOrganizationId;
+    if (orgId && session) {
+      const [member, organization] = await Promise.all([
+        ctx.context.adapter.findOne({
+          model: "member",
+          where: [
+            { field: "userId", value: session.user.id },
+            { field: "organizationId", value: orgId }
+          ]
+        }),
+        ctx.context.adapter.findOne({
+          model: "organization",
+          where: [{ field: "id", value: orgId }]
+        })
+      ]);
+      if (!member) {
+        return {
+          activeOrganizationId: null,
+          activeOrganization: null,
+          activeOrganizationEmail: null
+        };
+      }
+      const creatorRole = ctx.context.orgOptions?.creatorRole || "owner";
+      let ownerUserId = member.role === creatorRole ? member.userId : null;
+      let owner = null;
+      if (member.role !== creatorRole) {
+        const ownerMembers = await ctx.context.adapter.findMany({
+          model: "member",
+          where: [
+            { field: "organizationId", value: orgId },
+            { field: "role", value: creatorRole }
+          ]
+        });
+        ownerUserId = ownerMembers.length > 0 ? ownerMembers[0].userId : null;
+      }
+      if (ownerUserId) {
+        const ownerUser = await ctx.context.adapter.findOne({
+          model: "user",
+          where: [{ field: "id", value: ownerUserId }]
+        });
+        owner = ownerUser;
+      }
+      return {
+        activeOrganizationId: orgId,
+        activeOrganization: organization,
+        activeOrganizationEmail: owner?.email
+      };
+    }
+    return {
+      activeOrganizationId: null,
+      activeOrganization: null,
+      activeOrganizationEmail: null
+    };
+  } catch (error) {
+    console.log("[org context error]", error);
+    return {
+      activeOrganizationId: null,
+      activeOrganization: null,
+      activeOrganizationEmail: null
+    };
+  }
+}
+async function getIdentityContext({
+  orgContext,
+  options,
+  session
+}) {
+  if (!options?.identify) return null;
+  const orgData = orgContext.activeOrganization?.id ? {
+    ...orgContext.activeOrganization,
+    ownerEmail: orgContext.activeOrganizationEmail
+  } : null;
+  try {
+    const identity = await options.identify({
+      session,
+      organization: orgData
+    });
+    return identity;
+  } catch (error) {
+    console.log("[identity context error]", error);
+    return null;
+  }
+}
+
+export {
+  scopeContainsOrg,
+  getOrganizationContext,
+  getIdentityContext
+};

package/dist/libraries/backend/{chunk-D5C5Q5FZ.mjs → chunk-USQ76FYI.mjs}

@@ -1,6 +1,6 @@
 import {
   withAuth
-} from "./chunk-F3S66STP.mjs";
+} from "./chunk-35N7BIAE.mjs";
 import {
   BASE_PATH
 } from "./chunk-KSG3E4Q2.mjs";

package/dist/libraries/backend/convex.js

@@ -350,14 +350,6 @@ var toContainerResult = async ({
       }
     } catch (error2) {
       throw error2;
-      return {
-        data: null,
-        error: new AutumnError({
-          message: "Failed to parse JSON response from Autumn",
-          code: "internal_error"
-        }),
-        statusCode: response.status
-      };
     }
     return {
       data: null,
@@ -369,7 +361,7 @@ var toContainerResult = async ({
     };
   }
   try {
-    let data = await response.json();
+    const data = await response.json();
     return {
       data,
       error: null,
@@ -377,14 +369,6 @@ var toContainerResult = async ({
     };
   } catch (error) {
     throw error;
-    return {
-      data: null,
-      error: new AutumnError({
-        message: "Failed to parse Autumn API response",
-        code: "internal_error"
-      }),
-      statusCode: response?.status
-    };
   }
 };
 
@@ -1046,6 +1030,43 @@ var toBackendError = ({
   };
 };
 
+// src/utils/toSnakeCase.ts
+function stringToSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
+}
+var toSnakeCase = ({
+  obj,
+  excludeKeys,
+  excludeChildrenOf
+}) => {
+  if (Array.isArray(obj)) {
+    return obj.map(
+      (item) => toSnakeCase({ obj: item, excludeKeys, excludeChildrenOf })
+    );
+  } else if (obj !== null && typeof obj === "object") {
+    return Object.fromEntries(
+      Object.entries(obj).map(([key, value]) => {
+        const snakeKey = stringToSnakeCase(key);
+        if (excludeKeys?.includes(key)) {
+          return [key, value];
+        }
+        if (excludeChildrenOf?.includes(key)) {
+          return [snakeKey, value];
+        }
+        return [
+          snakeKey,
+          toSnakeCase({
+            obj: value,
+            excludeKeys,
+            excludeChildrenOf
+          })
+        ];
+      })
+    );
+  }
+  return obj;
+};
+
 // src/libraries/backend/utils/withAuth.ts
 var withAuth = ({
   fn,
@@ -1080,6 +1101,12 @@ var withAuth = ({
       }
     }
     let cusData = authResult?.customerData || body?.customer_data;
+    if (body) {
+      body = toSnakeCase({
+        obj: body,
+        excludeChildrenOf: ["checkoutSessionParams", "properties"]
+      });
+    }
     try {
       let res = await fn({
         body,
@@ -1103,31 +1130,8 @@ var withAuth = ({
 
 // src/libraries/backend/routes/genRoutes.ts
 var import_rou3 = require("rou3");
-
-// src/libraries/react/utils/toSnakeCase.ts
-function stringToSnakeCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
-}
-var toSnakeCase = (obj, excludeKeys) => {
-  if (Array.isArray(obj)) {
-    return obj.map((item) => toSnakeCase(item, excludeKeys));
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => {
-        const snakeKey = stringToSnakeCase(key);
-        if (excludeKeys && excludeKeys.includes(key)) {
-          return [snakeKey, value];
-        }
-        return [snakeKey, toSnakeCase(value, excludeKeys)];
-      })
-    );
-  }
-  return obj;
-};
-
-// src/libraries/backend/routes/genRoutes.ts
 var sanitizeBody = (body) => {
-  let bodyCopy = { ...body };
+  const bodyCopy = { ...body };
   delete bodyCopy.customer_id;
   delete bodyCopy.customer_data;
   return bodyCopy;
@@ -1139,11 +1143,12 @@ var checkoutHandler = withAuth({
     customer_data,
     body
   }) => {
-    return await autumn.checkout({
+    const result = await autumn.checkout({
       ...sanitizeBody(body),
       customer_id,
       customer_data
     });
+    return result;
   }
 });
 var attachHandler = withAuth({
@@ -1230,7 +1235,11 @@ var queryHandler = withAuth({
     customer_id,
     body
   }) => {
-    return await autumn.query({ customer_id, ...toSnakeCase(body) });
+    return await autumn.query({
+      customer_id,
+      range: body.range,
+      feature_id: body.featureId
+    });
   }
 });
 var addGenRoutes = (router) => {

package/dist/libraries/backend/convex.mjs

@@ -3,15 +3,15 @@ import {
 } from "./chunk-UNZHJTEY.mjs";
 import {
   createRouterWithOptions
-} from "./chunk-WBHGLFLE.mjs";
-import "./chunk-SRHT6RDB.mjs";
-import "./chunk-7OEFNFGZ.mjs";
-import "./chunk-D5C5Q5FZ.mjs";
-import "./chunk-SVTPC45F.mjs";
-import "./chunk-F3S66STP.mjs";
+} from "./chunk-4MEEJLXG.mjs";
+import "./chunk-PO4EL4BW.mjs";
+import "./chunk-MHIUO3ST.mjs";
+import "./chunk-USQ76FYI.mjs";
+import "./chunk-LOSIWWM2.mjs";
+import "./chunk-35N7BIAE.mjs";
 import {
   Autumn
-} from "./chunk-ENRZQDOT.mjs";
+} from "./chunk-QOJMX7ML.mjs";
 import "./chunk-2TEL6LR5.mjs";
 import "./chunk-KSG3E4Q2.mjs";
 

package/dist/libraries/backend/elysia.js

@@ -350,14 +350,6 @@ var toContainerResult = async ({
       }
     } catch (error2) {
       throw error2;
-      return {
-        data: null,
-        error: new AutumnError({
-          message: "Failed to parse JSON response from Autumn",
-          code: "internal_error"
-        }),
-        statusCode: response.status
-      };
     }
     return {
       data: null,
@@ -369,7 +361,7 @@ var toContainerResult = async ({
     };
   }
   try {
-    let data = await response.json();
+    const data = await response.json();
     return {
       data,
       error: null,
@@ -377,14 +369,6 @@ var toContainerResult = async ({
     };
   } catch (error) {
     throw error;
-    return {
-      data: null,
-      error: new AutumnError({
-        message: "Failed to parse Autumn API response",
-        code: "internal_error"
-      }),
-      statusCode: response?.status
-    };
   }
 };
 
@@ -1046,6 +1030,43 @@ var toBackendError = ({
   };
 };
 
+// src/utils/toSnakeCase.ts
+function stringToSnakeCase(str) {
+  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
+}
+var toSnakeCase = ({
+  obj,
+  excludeKeys,
+  excludeChildrenOf
+}) => {
+  if (Array.isArray(obj)) {
+    return obj.map(
+      (item) => toSnakeCase({ obj: item, excludeKeys, excludeChildrenOf })
+    );
+  } else if (obj !== null && typeof obj === "object") {
+    return Object.fromEntries(
+      Object.entries(obj).map(([key, value]) => {
+        const snakeKey = stringToSnakeCase(key);
+        if (excludeKeys?.includes(key)) {
+          return [key, value];
+        }
+        if (excludeChildrenOf?.includes(key)) {
+          return [snakeKey, value];
+        }
+        return [
+          snakeKey,
+          toSnakeCase({
+            obj: value,
+            excludeKeys,
+            excludeChildrenOf
+          })
+        ];
+      })
+    );
+  }
+  return obj;
+};
+
 // src/libraries/backend/utils/withAuth.ts
 var withAuth = ({
   fn,
@@ -1080,6 +1101,12 @@ var withAuth = ({
       }
     }
     let cusData = authResult?.customerData || body?.customer_data;
+    if (body) {
+      body = toSnakeCase({
+        obj: body,
+        excludeChildrenOf: ["checkoutSessionParams", "properties"]
+      });
+    }
     try {
       let res = await fn({
         body,
@@ -1103,31 +1130,8 @@ var withAuth = ({
 
 // src/libraries/backend/routes/genRoutes.ts
 var import_rou3 = require("rou3");
-
-// src/libraries/react/utils/toSnakeCase.ts
-function stringToSnakeCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
-}
-var toSnakeCase = (obj, excludeKeys) => {
-  if (Array.isArray(obj)) {
-    return obj.map((item) => toSnakeCase(item, excludeKeys));
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => {
-        const snakeKey = stringToSnakeCase(key);
-        if (excludeKeys && excludeKeys.includes(key)) {
-          return [snakeKey, value];
-        }
-        return [snakeKey, toSnakeCase(value, excludeKeys)];
-      })
-    );
-  }
-  return obj;
-};
-
-// src/libraries/backend/routes/genRoutes.ts
 var sanitizeBody = (body) => {
-  let bodyCopy = { ...body };
+  const bodyCopy = { ...body };
   delete bodyCopy.customer_id;
   delete bodyCopy.customer_data;
   return bodyCopy;
@@ -1139,11 +1143,12 @@ var checkoutHandler = withAuth({
     customer_data,
     body
   }) => {
-    return await autumn.checkout({
+    const result = await autumn.checkout({
       ...sanitizeBody(body),
       customer_id,
       customer_data
     });
+    return result;
   }
 });
 var attachHandler = withAuth({
@@ -1230,7 +1235,11 @@ var queryHandler = withAuth({
     customer_id,
     body
   }) => {
-    return await autumn.query({ customer_id, ...toSnakeCase(body) });
+    return await autumn.query({
+      customer_id,
+      range: body.range,
+      feature_id: body.featureId
+    });
   }
 });
 var addGenRoutes = (router) => {
@@ -1463,24 +1472,6 @@ var secretKeyCheck = (secretKey) => {
   return { found: true, error: null };
 };
 
-// src/utils/toSnakeCase.ts
-function stringToSnakeCase2(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
-}
-var toSnakeCase2 = (obj) => {
-  if (Array.isArray(obj)) {
-    return obj.map(toSnakeCase2);
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => [
-        stringToSnakeCase2(key),
-        toSnakeCase2(value)
-      ])
-    );
-  }
-  return obj;
-};
-
 // src/libraries/backend/elysia.ts
 function autumnHandler(options) {
   const { found, error: resError } = secretKeyCheck(options.secretKey);
@@ -1538,7 +1529,7 @@ function autumnHandler(options) {
       try {
         const result = await handler({
           autumn,
-          body: toSnakeCase2(body),
+          body: toSnakeCase({ obj: body }),
           path,
           getCustomer: async () => await options.identify(context),
           pathParams,

package/dist/libraries/backend/elysia.mjs

@@ -3,15 +3,17 @@ import {
 } from "./chunk-UNZHJTEY.mjs";
 import {
   createRouterWithOptions
-} from "./chunk-WBHGLFLE.mjs";
-import "./chunk-SRHT6RDB.mjs";
-import "./chunk-7OEFNFGZ.mjs";
-import "./chunk-D5C5Q5FZ.mjs";
-import "./chunk-SVTPC45F.mjs";
-import "./chunk-F3S66STP.mjs";
+} from "./chunk-4MEEJLXG.mjs";
+import "./chunk-PO4EL4BW.mjs";
+import "./chunk-MHIUO3ST.mjs";
+import "./chunk-USQ76FYI.mjs";
+import "./chunk-LOSIWWM2.mjs";
+import {
+  toSnakeCase
+} from "./chunk-35N7BIAE.mjs";
 import {
   Autumn
-} from "./chunk-ENRZQDOT.mjs";
+} from "./chunk-QOJMX7ML.mjs";
 import "./chunk-2TEL6LR5.mjs";
 import {
   autumnApiUrl
@@ -19,26 +21,6 @@ import {
 
 // src/libraries/backend/elysia.ts
 import { findRoute } from "rou3";
-
-// src/utils/toSnakeCase.ts
-function stringToSnakeCase(str) {
-  return str.replace(/([a-z])([A-Z])/g, "$1_$2").replace(/[-\s]+/g, "_").toLowerCase();
-}
-var toSnakeCase = (obj) => {
-  if (Array.isArray(obj)) {
-    return obj.map(toSnakeCase);
-  } else if (obj !== null && typeof obj === "object") {
-    return Object.fromEntries(
-      Object.entries(obj).map(([key, value]) => [
-        stringToSnakeCase(key),
-        toSnakeCase(value)
-      ])
-    );
-  }
-  return obj;
-};
-
-// src/libraries/backend/elysia.ts
 function autumnHandler(options) {
   const { found, error: resError } = secretKeyCheck(options.secretKey);
   if (!found && !options.secretKey) {
@@ -95,7 +77,7 @@ function autumnHandler(options) {
       try {
         const result = await handler({
           autumn,
-          body: toSnakeCase(body),
+          body: toSnakeCase({ obj: body }),
           path,
           getCustomer: async () => await options.identify(context),
           pathParams,