diff --git a/extensions/meteringAndBilling/eventListeners/subscriptionEvents.js b/extensions/meteringAndBilling/eventListeners/subscriptionEvents.js index f3a70a81..3b18ea1e 100644 --- a/extensions/meteringAndBilling/eventListeners/subscriptionEvents.js +++ b/extensions/meteringAndBilling/eventListeners/subscriptionEvents.js @@ -13,8 +13,8 @@ extension.on('metering:registerAvailablePolicies', async ( console.warn('WARNING!!! unlimitedUsage is enabled, this is not recommended for production use'); event.availablePolicies.push({ id: 'unlimited', - monthUsageAllowence: 500_000_000 * 100_000_000, // unless you're like, jeff's, mark's and elon's illegitamate son, you probably won't hit $5m a month - monthlyStorageAllowence: 100_000 * 1024 * 1024, // 100MiB + monthUsageAllowance: 500_000_000 * 100_000_000, // unless you're like, jeff's, mark's and elon's illegitamate son, you probably won't hit $5m a month + monthlyStorageAllowance: 100_000 * 1024 * 1024, // 100MiB }); } }); diff --git a/extensions/meteringAndBilling/routes/usage.js b/extensions/meteringAndBilling/routes/usage.js index 5ef84cbc..6cfb4c60 100644 --- a/extensions/meteringAndBilling/routes/usage.js +++ b/extensions/meteringAndBilling/routes/usage.js @@ -10,10 +10,10 @@ extension.get('/meteringAndBilling/usage', { subdomain: 'api' }, async (req, res throw Error('actor not found in context'); } const actorUsagePromise = meteringAndBillingService.getActorCurrentMonthUsageDetails(actor); - const actorAllowenceInfoPromise = meteringAndBillingService.getAllowedUsage(actor); + const actorAllowanceInfoPromise = meteringAndBillingService.getAllowedUsage(actor); - const [actorUsage, allowenceInfo] = await Promise.all([actorUsagePromise, actorAllowenceInfoPromise]); - res.status(200).json({ ...actorUsage, allowenceInfo }); + const [actorUsage, alowanceInfo] = await Promise.all([actorUsagePromise, actorAllowanceInfoPromise]); + res.status(200).json({ ...actorUsage, alowanceInfo }); return; }); diff --git a/src/backend/src/services/MeteringService/MeteringService.ts b/src/backend/src/services/MeteringService/MeteringService.ts index a069c475..a0977cc7 100644 --- a/src/backend/src/services/MeteringService/MeteringService.ts +++ b/src/backend/src/services/MeteringService/MeteringService.ts @@ -220,8 +220,8 @@ export class MeteringAndBillingService { const [userSubscription, userPolicyAddons, currentMonthUsage] = await Promise.all([userSubscriptionPromise, userPolicyAddonsPromise, currentUsagePromise]); return { - remaining: Math.max(0, userSubscription.monthUsageAllowence + (userPolicyAddons?.purchasedCredits || 0) - currentMonthUsage.usage.total), - monthUsageAllowence: userSubscription?.monthUsageAllowence, + remaining: Math.max(0, userSubscription.monthUsageAllowance + (userPolicyAddons?.purchasedCredits || 0) - currentMonthUsage.usage.total), + monthUsageAllowance: userSubscription?.monthUsageAllowance, userPolicyAddons, }; } diff --git a/src/backend/src/services/MeteringService/subPolicies/registeredUserFreePolicy.ts b/src/backend/src/services/MeteringService/subPolicies/registeredUserFreePolicy.ts index 5a04f536..fc8fa7d0 100644 --- a/src/backend/src/services/MeteringService/subPolicies/registeredUserFreePolicy.ts +++ b/src/backend/src/services/MeteringService/subPolicies/registeredUserFreePolicy.ts @@ -2,6 +2,6 @@ import { toMicroCents } from "../utils"; export const REGISTERED_USER_FREE = { id: 'user_free', - monthUsageAllowence: toMicroCents(0.50), - monthlyStorageAllowence: 100 * 1024 * 1024, // 100MiB + monthUsageAllowance: toMicroCents(0.50), + monthlyStorageAllowance: 100 * 1024 * 1024, // 100MiB }; \ No newline at end of file diff --git a/src/backend/src/services/MeteringService/subPolicies/tempUserFreePolicy.ts b/src/backend/src/services/MeteringService/subPolicies/tempUserFreePolicy.ts index ba237784..c7a8fadc 100644 --- a/src/backend/src/services/MeteringService/subPolicies/tempUserFreePolicy.ts +++ b/src/backend/src/services/MeteringService/subPolicies/tempUserFreePolicy.ts @@ -2,6 +2,6 @@ import { toMicroCents } from "../utils"; export const TEMP_USER_FREE = { id: 'temp_free', - monthUsageAllowence: toMicroCents(0.25), - monthlyStorageAllowence: 100 * 1024 * 1024, // 100MiB + monthUsageAllowance: toMicroCents(0.25), + monthlyStorageAllowance: 100 * 1024 * 1024, // 100MiB }; \ No newline at end of file