cleanup

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx

@@ -69,45 +69,30 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
       const currentUrl = window.location.origin + window.location.pathname
 
       try {
-        if (
-          'upgrade' in betterAuthSubscription &&
-          typeof betterAuthSubscription.upgrade === 'function'
-        ) {
-          const upgradeParams: any = {
-            plan: targetPlan,
-            referenceId,
-            successUrl: currentUrl,
-            cancelUrl: currentUrl,
-            seats: targetPlan === 'team' ? 1 : undefined,
-          }
-
-          // Add subscriptionId if we have an existing subscription to ensure proper plan switching
-          if (currentSubscriptionId) {
-            upgradeParams.subscriptionId = currentSubscriptionId
-            logger.info('Upgrading existing subscription', {
-              targetPlan,
-              currentSubscriptionId,
-              referenceId,
-            })
-          } else {
-            logger.info('Creating new subscription (no existing subscription found)', {
-              targetPlan,
-              referenceId,
-            })
-          }
+        const upgradeParams: any = {
+          plan: targetPlan,
+          referenceId,
+          successUrl: currentUrl,
+          cancelUrl: currentUrl,
+          seats: targetPlan === 'team' ? 1 : undefined,
+        }
 
-          await betterAuthSubscription.upgrade(upgradeParams)
+        // Add subscriptionId if we have an existing subscription to ensure proper plan switching
+        if (currentSubscriptionId) {
+          upgradeParams.subscriptionId = currentSubscriptionId
+          logger.info('Upgrading existing subscription', {
+            targetPlan,
+            currentSubscriptionId,
+            referenceId,
+          })
         } else {
-          logger.warn('Stripe upgrade not available - development mode or missing configuration', {
+          logger.info('Creating new subscription (no existing subscription found)', {
             targetPlan,
             referenceId,
-            betterAuthSubscription: typeof betterAuthSubscription,
           })
-
-          alert(
-            `Upgrade to ${targetPlan} plan - Stripe integration not available in development mode`
-          )
         }
+
+        await betterAuthSubscription.upgrade(upgradeParams)
       } catch (error) {
         logger.error('Failed to initiate subscription upgrade:', error)
         alert('Failed to initiate upgrade. Please try again or contact support.')

apps/sim/db/schema.ts

@@ -585,7 +585,7 @@ export const organization = pgTable('organization', {
   name: text('name').notNull(),
   slug: text('slug').notNull(),
   logo: text('logo'),
-  metadata: json('metadata'), // Use for storing Stripe customer ID and other billing data
+  metadata: json('metadata'),
   createdAt: timestamp('created_at').defaultNow().notNull(),
   updatedAt: timestamp('updated_at').defaultNow().notNull(),
 })

apps/sim/lib/billing/index.ts

@@ -3,15 +3,11 @@
  * Provides clean, organized exports for the billing system
  */
 
-// Calculations and monitoring
 export * from './calculations/usage-monitor'
-// Simplified billing system
 export * from './core/billing'
 export * from './core/billing-periods'
 export * from './core/organization-billing'
-// Core functionality
 export * from './core/subscription'
-// Re-export commonly used functions with cleaner names
 export {
   getHighestPrioritySubscription as getActiveSubscription,
   getUserSubscriptionState as getSubscriptionState,
@@ -27,15 +23,11 @@ export {
   getUserUsageLimit as getUsageLimit,
   updateUserUsageLimit as updateUsageLimit,
 } from './core/usage'
-// Utilities
 export * from './subscriptions/utils'
-// Convenience exports for common operations
 export {
   calculateDefaultUsageLimit as getDefaultLimit,
   canEditUsageLimit as canEditLimit,
   getMinimumUsageLimit as getMinimumLimit,
 } from './subscriptions/utils'
-// Types
 export * from './types'
-// Validation
 export * from './validation/seat-management'

apps/sim/lib/environment.ts

@@ -14,22 +14,22 @@ export const getNodeEnv = () => {
 /**
  * Is the application running in production mode
  */
-export const isProd = true
+export const isProd = getNodeEnv() === 'production'
 
 /**
  * Is the application running in development mode
  */
-export const isDev = false
+export const isDev = getNodeEnv() === 'development'
 
 /**
  * Is the application running in test mode
  */
-export const isTest = true
+export const isTest = getNodeEnv() === 'test'
 
 /**
  * Is this the hosted version of the application
  */
-export const isHosted = true
+export const isHosted = env.NEXT_PUBLIC_APP_URL === 'https://www.simstudio.ai'
 
 /**
  * Get cost multiplier based on environment

apps/sim/package.json

@@ -19,9 +19,6 @@
     "db:push": "bunx drizzle-kit push",
     "db:studio": "bunx drizzle-kit studio",
     "db:migrate": "bunx drizzle-kit migrate",
-    "db:backfill": "bun run scripts/backfill-subscription-billing-data.ts",
-    "db:backfill:dry-run": "bun run scripts/backfill-subscription-billing-data.ts --dry-run",
-    "db:analyze": "bun run scripts/analyze-subscription-data.ts",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",

apps/sim/stores/subscription/store.ts

@@ -12,7 +12,6 @@ import type {
 
 const logger = createLogger('SubscriptionStore')
 
-// Cache duration: 30 seconds (reasonable for subscription data)
 const CACHE_DURATION = 30 * 1000
 
 // Default values to avoid null checks throughout the app