Page MenuHomePhorge
Files F117917355

D2629.1775414169.diff
No OneTemporary
Actions

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D2629.1775414169.diff
View Options

diff --git a/src/app/Http/Controllers/API/V4/SkusController.php b/src/app/Http/Controllers/API/V4/SkusController.php
--- a/src/app/Http/Controllers/API/V4/SkusController.php
+++ b/src/app/Http/Controllers/API/V4/SkusController.php
@@ -54,7 +54,7 @@
public function index()
{
// Note: Order by title for consistent ordering in tests
- $skus = Sku::where('active', true)->orderBy('title')->get();
+ $skus = Sku::withEnvTenant()->where('active', true)->orderBy('title')->get();
$response = [];
@@ -134,7 +134,7 @@
$response = [];
// Note: Order by title for consistent ordering in tests
- $skus = Sku::orderBy('title')->get();
+ $skus = Sku::withEnvTenant()->orderBy('title')->get();
foreach ($skus as $sku) {
if (!class_exists($sku->handler_class)) {
diff --git a/src/tests/Feature/Controller/SkusTest.php b/src/tests/Feature/Controller/SkusTest.php
--- a/src/tests/Feature/Controller/SkusTest.php
+++ b/src/tests/Feature/Controller/SkusTest.php
@@ -18,6 +18,7 @@
$this->clearBetaEntitlements();
$this->clearMeetEntitlements();
+ Sku::where('title', 'test')->delete();
}
/**
@@ -27,6 +28,7 @@
{
$this->clearBetaEntitlements();
$this->clearMeetEntitlements();
+ Sku::where('title', 'test')->delete();
parent::tearDown();
}
@@ -44,6 +46,18 @@
$user = $this->getTestUser('john@kolab.org');
$sku = Sku::where('title', 'mailbox')->first();
+ // Create an sku for another tenant, to make sure it is not included in the result
+ $nsku = Sku::create([
+ 'title' => 'test',
+ 'name' => 'Test',
+ 'description' => '',
+ 'active' => true,
+ 'cost' => 100,
+ 'handler_class' => 'App\Handlers\Mailbox',
+ ]);
+ $nsku->tenant_id = 2;
+ $nsku->save();
+
$response = $this->actingAs($user)->get("api/v4/skus");
$response->assertStatus(200);
@@ -75,6 +89,18 @@
$response = $this->get("api/v4/users/{$user->id}/skus");
$response->assertStatus(401);
+ // Create an sku for another tenant, to make sure it is not included in the result
+ $nsku = Sku::create([
+ 'title' => 'test',
+ 'name' => 'Test',
+ 'description' => '',
+ 'active' => true,
+ 'cost' => 100,
+ 'handler_class' => 'App\Handlers\Mailbox',
+ ]);
+ $nsku->tenant_id = 2;
+ $nsku->save();
+
$response = $this->actingAs($user)->get("api/v4/users/{$user->id}/skus");
$response->assertStatus(200);

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 5, 6:36 PM (23 h, 20 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18818010
Default Alt Text
D2629.1775414169.diff (2 KB)

Event Timeline