fix: subscription check on API/MCP, autoload fix, debug cleanup
- Add subscription check to AuthenticateApiToken and AuthenticateMcpToken middlewares (returns 402 Payment Required if no active subscription) - Skip subscription check in self-hosted mode - Remove temporary OAuth debug log from SocialController - Run composer dump-autoload to fix email_asset() helper autoloading - Add 4 new tests for API subscription enforcement All 728 tests passing.
This commit is contained in:
parent
f3f72afecd
commit
6d29bdf0e0
3 changed files with 113 additions and 1 deletions
|
|
@ -5,6 +5,7 @@
|
|||
namespace App\Http\Middleware\Api;
|
||||
|
||||
use App\Models\ApiToken;
|
||||
use App\Models\Workspace;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
|
@ -37,11 +38,28 @@ public function handle(Request $request, Closure $next): Response
|
|||
|
||||
$apiToken->update(['last_used_at' => now()]);
|
||||
|
||||
$workspace = $apiToken->workspace;
|
||||
|
||||
if (! config('trypost.self_hosted') && ! $this->hasActiveSubscription($workspace)) {
|
||||
return response()->json(['message' => 'Active subscription required.'], Response::HTTP_PAYMENT_REQUIRED);
|
||||
}
|
||||
|
||||
$request->merge([
|
||||
'workspace' => $apiToken->workspace,
|
||||
'workspace' => $workspace,
|
||||
'api_token' => $apiToken,
|
||||
]);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
private function hasActiveSubscription(Workspace $workspace): bool
|
||||
{
|
||||
$owner = $workspace->owner;
|
||||
|
||||
if (! $owner) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $owner->subscribed('default') || $owner->onTrial('default');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
namespace App\Http\Middleware\Mcp;
|
||||
|
||||
use App\Models\ApiToken;
|
||||
use App\Models\Workspace;
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
|
@ -45,9 +46,24 @@ public function handle(Request $request, Closure $next): Response
|
|||
return response()->json(['message' => 'No workspace owner found.'], Response::HTTP_UNAUTHORIZED);
|
||||
}
|
||||
|
||||
if (! config('trypost.self_hosted') && ! $this->hasActiveSubscription($workspace)) {
|
||||
return response()->json(['message' => 'Active subscription required.'], Response::HTTP_PAYMENT_REQUIRED);
|
||||
}
|
||||
|
||||
$user->current_workspace_id = $workspace->id;
|
||||
Auth::login($user);
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
private function hasActiveSubscription(Workspace $workspace): bool
|
||||
{
|
||||
$owner = $workspace->owner;
|
||||
|
||||
if (! $owner) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $owner->subscribed('default') || $owner->onTrial('default');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,3 +117,81 @@ function createApiToken(array $overrides = []): array
|
|||
expect($result['token']->last_used_at)->not->toBeNull();
|
||||
expect($result['token']->last_used_at->toDateTimeString())->toBe(now()->toDateTimeString());
|
||||
});
|
||||
|
||||
test('returns 402 when workspace owner has no subscription', function () {
|
||||
config(['trypost.self_hosted' => false]);
|
||||
|
||||
$result = createApiToken();
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'Authorization' => 'Bearer '.$result['plain_token'],
|
||||
])->getJson(
|
||||
route('api.workspace.show'),
|
||||
['HTTP_HOST' => 'api.trypost.test']
|
||||
);
|
||||
|
||||
$response->assertStatus(402);
|
||||
$response->assertJson(['message' => 'Active subscription required.']);
|
||||
});
|
||||
|
||||
test('allows access when workspace owner has active subscription', function () {
|
||||
config(['trypost.self_hosted' => false]);
|
||||
|
||||
$result = createApiToken();
|
||||
$owner = $result['workspace']->owner;
|
||||
|
||||
$owner->subscriptions()->create([
|
||||
'type' => 'default',
|
||||
'stripe_id' => 'sub_test_123',
|
||||
'stripe_status' => 'active',
|
||||
'stripe_price' => 'price_123',
|
||||
]);
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'Authorization' => 'Bearer '.$result['plain_token'],
|
||||
])->getJson(
|
||||
route('api.workspace.show'),
|
||||
['HTTP_HOST' => 'api.trypost.test']
|
||||
);
|
||||
|
||||
$response->assertOk();
|
||||
});
|
||||
|
||||
test('allows access when workspace owner is on trial', function () {
|
||||
config(['trypost.self_hosted' => false]);
|
||||
|
||||
$result = createApiToken();
|
||||
$owner = $result['workspace']->owner;
|
||||
|
||||
$owner->subscriptions()->create([
|
||||
'type' => 'default',
|
||||
'stripe_id' => 'sub_trial_123',
|
||||
'stripe_status' => 'trialing',
|
||||
'stripe_price' => 'price_123',
|
||||
'trial_ends_at' => now()->addDays(7),
|
||||
]);
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'Authorization' => 'Bearer '.$result['plain_token'],
|
||||
])->getJson(
|
||||
route('api.workspace.show'),
|
||||
['HTTP_HOST' => 'api.trypost.test']
|
||||
);
|
||||
|
||||
$response->assertOk();
|
||||
});
|
||||
|
||||
test('skips subscription check in self-hosted mode', function () {
|
||||
config(['trypost.self_hosted' => true]);
|
||||
|
||||
$result = createApiToken();
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'Authorization' => 'Bearer '.$result['plain_token'],
|
||||
])->getJson(
|
||||
route('api.workspace.show'),
|
||||
['HTTP_HOST' => 'api.trypost.test']
|
||||
);
|
||||
|
||||
$response->assertOk();
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue