Beautiful Open-Source Form Builder
fix subscription entitlement resolution with duplicate records
JhumanJe774da53d7ae
diff --git a/api/app/Http/Controllers/SubscriptionController.php b/api/app/Http/Controllers/SubscriptionController.phpindex e6302bfbc..1fc0a185d 100644--- a/api/app/Http/Controllers/SubscriptionController.php+++ b/api/app/Http/Controllers/SubscriptionController.php@@ -8,6 +8,7 @@ use App\Service\BillingHelper;use App\Service\UserHelper;use Illuminate\Http\Request;use Illuminate\Support\Facades\Auth;+use Illuminate\Support\Facades\Cache;class SubscriptionController extends Controller{@@ -28,39 +29,59 @@ class SubscriptionController extends Controller{$this->middleware('not-subscribed');- // Check User does not have a pending subscription$user = Auth::user();- if ($user->subscriptions()->where('stripe_status', 'past_due')->first()) {+ $lockKey = "subscription_checkout:{$user->id}:{$pricing}";+ $checkoutLock = Cache::lock($lockKey, 15);++ if (!$checkoutLock->get()) {return $this->error([- 'message' => 'You already have a past due subscription. Please verify your details in the billing page,- and contact us if the issue persists.',- ]);+ 'message' => 'A checkout session is already being created. Please retry in a few seconds.',+ ], 429);}- $checkoutBuilder = $user- ->newSubscription($pricing, BillingHelper::getPricing($pricing)[$plan])- ->allowPromotionCodes();-- // Disable trial for now- // if ($trial != null) {- // $checkoutBuilder->trialUntil(now()->addDays(3)->addHour());- // }-- $checkout = $checkoutBuilder- ->collectTaxIds()- ->checkout([- 'success_url' => front_url('/subscriptions/success'),- 'cancel_url' => front_url('/subscriptions/error'),- 'billing_address_collection' => 'required',- 'customer_update' => [- 'address' => 'auto',- 'name' => 'never',- ],+ try {+ // Check User does not already have an active/trialing subscription+ if ($user->hasActiveDefaultSubscription()) {+ return $this->error([+ 'message' => 'You already have an active subscription.',+ ]);+ }++ // Check User does not have a pending subscription+ if ($user->subscriptions()->where('stripe_status', 'past_due')->first()) {+ return $this->error([+ 'message' => 'You already have a past due subscription. Please verify your details in the billing page, '+ . 'and contact us if the issue persists.',+ ]);+ }++ $checkoutBuilder = $user+ ->newSubscription($pricing, BillingHelper::getPricing($pricing)[$plan])+ ->allowPromotionCodes();++ // Disable trial for now+ // if ($trial != null) {+ // $checkoutBuilder->trialUntil(now()->addDays(3)->addHour());+ // }++ $checkout = $checkoutBuilder+ ->collectTaxIds()+ ->checkout([+ 'success_url' => front_url('/subscriptions/success'),+ 'cancel_url' => front_url('/subscriptions/error'),+ 'billing_address_collection' => 'required',+ 'customer_update' => [+ 'address' => 'auto',+ 'name' => 'never',+ ],+ ]);++ return $this->success([+ 'checkout_url' => $checkout->url,]);-- return $this->success([- 'checkout_url' => $checkout->url,- ]);+ } finally {+ $checkoutLock->release();+ }}public function getUsersCount()@@ -140,7 +161,13 @@ class SubscriptionController extends Controller// Upgrade the subscription to yearly plantry {- $subscription = $user->subscription();+ $subscription = $user->activeDefaultSubscription();+ if (!$subscription) {+ return $this->error([+ "message" => "No active subscription found for this user.",+ ]);+ }+$yearlyPriceId = BillingHelper::getPricing('default')['yearly'];$subscription->swap($yearlyPriceId);diff --git a/api/app/Http/Controllers/Webhook/StripeController.php b/api/app/Http/Controllers/Webhook/StripeController.phpindex 9492a1455..406c18be4 100644--- a/api/app/Http/Controllers/Webhook/StripeController.php+++ b/api/app/Http/Controllers/Webhook/StripeController.php@@ -27,6 +27,8 @@ class StripeController extends WebhookControllerif ($user = $this->getUserByStripeId($payload['data']['object']['customer'])) {$data = $payload['data']['object'];+ // We keep one local row per Stripe subscription id. If duplicates exist for the same+ // logical plan, application checks always resolve entitlement from the newest active/trialing row.$subscription = $user->subscriptions()->firstOrNew(['stripe_id' => $data['id']]);if (diff --git a/api/app/Http/Middleware/IsNotSubscribed.php b/api/app/Http/Middleware/IsNotSubscribed.phpindex a432befae..278f9bad6 100644--- a/api/app/Http/Middleware/IsNotSubscribed.php+++ b/api/app/Http/Middleware/IsNotSubscribed.php@@ -14,7 +14,7 @@ class IsNotSubscribed*/public function handle(Request $request, Closure $next){- if ($request->user() && $request->user()->subscribed()) {+ if ($request->user() && $request->user()->hasActiveDefaultSubscription()) {// This user is a paying customer...if ($request->expectsJson()) {return response([diff --git a/api/app/Http/Middleware/IsSubscribed.php b/api/app/Http/Middleware/IsSubscribed.phpindex d451dae2d..68b72f8af 100644--- a/api/app/Http/Middleware/IsSubscribed.php+++ b/api/app/Http/Middleware/IsSubscribed.php@@ -14,7 +14,7 @@ class IsSubscribed*/public function handle(Request $request, Closure $next){- if ($request->user() && ! $request->user()->subscribed()) {+ if ($request->user() && !$request->user()->hasActiveDefaultSubscription()) {// This user is not a paying customer...if ($request->expectsJson()) {return response([diff --git a/api/app/Jobs/Billing/WorkspaceUsersUpdated.php b/api/app/Jobs/Billing/WorkspaceUsersUpdated.phpindex cba639b71..83e704a5d 100644--- a/api/app/Jobs/Billing/WorkspaceUsersUpdated.php+++ b/api/app/Jobs/Billing/WorkspaceUsersUpdated.php@@ -58,7 +58,10 @@ class WorkspaceUsersUpdated implements ShouldQueue}// Now update the subscription accordingly- $subscription = $billingOwner->subscription();+ $subscription = $billingOwner->activeDefaultSubscription();+ if (!$subscription) {+ return;+ }$totalUsersCount = (new UserHelper($billingOwner))->getActiveMembersCount() - 1;$this->updateSubscriptionWithExtraUsers($subscription, $totalUsersCount);}diff --git a/api/app/Models/User.php b/api/app/Models/User.phpindex 6c552ca1c..5e5b5151c 100644--- a/api/app/Models/User.php+++ b/api/app/Models/User.php@@ -2,6 +2,7 @@namespace App\Models;+use App\Models\Billing\Subscription;use App\Models\Forms\Form;use App\Models\Traits\CachableAttributes;use App\Models\Traits\CachesAttributes;@@ -158,7 +159,7 @@ class User extends Authenticatable implements JWTSubject, CachableAttributes, Tw}return $this->remember('is_subscribed', 5 * 60, function (): bool {- return $this->subscribed()+ return $this->hasActiveDefaultSubscription()|| in_array($this->email, config('opnform.extra_pro_users_emails'))|| !is_null($this->activeLicense());});@@ -313,6 +314,21 @@ class User extends Authenticatable implements JWTSubject, CachableAttributes, Tw});}+ public function activeDefaultSubscription(): ?Subscription+ {+ return $this->subscriptions()+ ->where('type', 'default')+ ->whereIn('stripe_status', ['trialing', 'active'])+ ->orderByDesc('created_at')+ ->orderByDesc('id')+ ->first();+ }++ public function hasActiveDefaultSubscription(): bool+ {+ return !is_null($this->activeDefaultSubscription());+ }+/*** =================================* Oauth Relateddiff --git a/api/app/Models/Workspace.php b/api/app/Models/Workspace.phpindex 3cfcfdb00..f403647a1 100644--- a/api/app/Models/Workspace.php+++ b/api/app/Models/Workspace.php@@ -199,7 +199,7 @@ class Workspace extends Model implements CachableAttributesforeach ($owners as $owner) {if ($owner->is_subscribed) {- $subscription = $owner->subscription();+ $subscription = $owner->activeDefaultSubscription();if ($subscription && BillingHelper::getSubscriptionInterval($subscription) === 'yearly') {return true;}diff --git a/api/tests/Feature/Subscriptions/DuplicateSubscriptionHandlingTest.php b/api/tests/Feature/Subscriptions/DuplicateSubscriptionHandlingTest.phpnew file mode 100644index 000000000..728605238--- /dev/null+++ b/api/tests/Feature/Subscriptions/DuplicateSubscriptionHandlingTest.php@@ -0,0 +1,169 @@+<?php++use App\Http\Controllers\SubscriptionController;+use App\Http\Middleware\IsNotSubscribed;+use App\Http\Middleware\IsSubscribed;+use Illuminate\Http\Request;+use Illuminate\Support\Str;+use Illuminate\Support\Facades\Cache;++function createDefaultSubscriptionForTest($user, string $status)+{+ return $user->subscriptions()->create([+ 'type' => 'default',+ 'stripe_id' => (string) Str::uuid(),+ 'stripe_status' => $status,+ 'stripe_price' => (string) Str::uuid(),+ 'quantity' => 1,+ ]);+}++it('keeps user subscribed when newest subscription is canceled but an older one is active', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'active');+ createDefaultSubscriptionForTest($user, 'canceled');++ $user = $user->fresh();++ expect($user->hasActiveDefaultSubscription())->toBeTrue();+ expect($user->is_subscribed)->toBeTrue();+});++it('selects newest active trialing subscription while ignoring canceled rows', function () {+ $user = $this->createUser();++ $olderActive = createDefaultSubscriptionForTest($user, 'active');+ $newerActive = createDefaultSubscriptionForTest($user, 'active');+ createDefaultSubscriptionForTest($user, 'canceled');++ $selected = $user->fresh()->activeDefaultSubscription();++ expect($selected)->not->toBeNull();+ expect($selected->id)->toBe($newerActive->id);+ expect($selected->id)->not->toBe($olderActive->id);+});++it('treats trialing subscriptions as active for entitlement checks', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'trialing');++ $user = $user->fresh();++ expect($user->hasActiveDefaultSubscription())->toBeTrue();+ expect($user->is_subscribed)->toBeTrue();+});++it('does not treat canceled or past due subscriptions as active', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'canceled');+ createDefaultSubscriptionForTest($user, 'past_due');++ $user = $user->fresh();++ expect($user->hasActiveDefaultSubscription())->toBeFalse();+ expect($user->activeDefaultSubscription())->toBeNull();+});++it('ignores non-default active subscriptions for default entitlement checks', function () {+ $user = $this->createUser();+ $user->subscriptions()->create([+ 'type' => 'extra_user',+ 'stripe_id' => (string) Str::uuid(),+ 'stripe_status' => 'active',+ 'stripe_price' => (string) Str::uuid(),+ 'quantity' => 1,+ ]);++ $user = $user->fresh();++ expect($user->hasActiveDefaultSubscription())->toBeFalse();+ expect($user->activeDefaultSubscription())->toBeNull();+});++it('allows subscribed middleware access when at least one active subscription exists', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'active');+ createDefaultSubscriptionForTest($user, 'canceled');++ $request = Request::create('/subscription-test', 'GET', [], [], [], [+ 'HTTP_ACCEPT' => 'application/json',+ ]);+ $request->setUserResolver(fn () => $user->fresh());++ $response = (new IsSubscribed())->handle($request, fn () => response()->json(['ok' => true]));++ expect($response->status())->toBe(200);+ expect($response->getData(true)['ok'])->toBeTrue();+});++it('blocks not subscribed middleware when at least one active subscription exists', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'active');+ createDefaultSubscriptionForTest($user, 'canceled');++ $request = Request::create('/subscription-test', 'GET', [], [], [], [+ 'HTTP_ACCEPT' => 'application/json',+ ]);+ $request->setUserResolver(fn () => $user->fresh());++ $response = (new IsNotSubscribed())->handle($request, fn () => response()->json(['ok' => true]));++ expect($response->status())->toBe(401);+});++it('blocks checkout when a user already has an active subscription', function () {+ $user = $this->createUser();+ createDefaultSubscriptionForTest($user, 'active');+ $this->actingAsUser($user);++ $response = $this->getJson(route('subscription.checkout', [+ 'subscription' => SubscriptionController::PRO_SUBSCRIPTION_NAME,+ 'plan' => 'monthly',+ ]));++ $response->assertStatus(400)->assertJson([+ 'type' => 'error',+ 'message' => 'You already have an active subscription.',+ ]);+});++it('blocks checkout while another checkout creation is already in progress', function () {+ $user = $this->createUser();+ $this->actingAsUser($user);++ $lock = Cache::lock(+ 'subscription_checkout:' . $user->id . ':' . SubscriptionController::PRO_SUBSCRIPTION_NAME,+ 15+ );+ expect($lock->get())->toBeTrue();++ try {+ $response = $this->getJson(route('subscription.checkout', [+ 'subscription' => SubscriptionController::PRO_SUBSCRIPTION_NAME,+ 'plan' => 'monthly',+ ]));++ $response->assertStatus(429)->assertJson([+ 'type' => 'error',+ 'message' => 'A checkout session is already being created. Please retry in a few seconds.',+ ]);+ } finally {+ $lock->release();+ }+});++it('returns explicit error when upgrading yearly without an active subscription row', function () {+ $user = $this->createUser();+ config(['opnform.extra_pro_users_emails' => [$user->email]]);+ $workspace = $this->createUserWorkspace($user);+ $this->actingAsUser($user);++ $response = $this->postJson(route('subscription.upgrade-to-yearly'), [+ 'workspace_id' => $workspace->id,+ ]);++ $response->assertStatus(400)->assertJson([+ 'type' => 'error',+ 'message' => 'No active subscription found for this user.',+ ]);+});