Page MenuHomePhorge
Files F117878465

D4722.1775340821.diff
No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D4722.1775340821.diff
View Options

diff --git a/src/app/Entitlement.php b/src/app/Entitlement.php
--- a/src/app/Entitlement.php
+++ b/src/app/Entitlement.php
@@ -94,14 +94,14 @@
// TODO: I agree this format may need to be extended in future
foreach ($object->entitlements as $ent) {
- $sku = $ent->sku;
+ $sku_id = $ent->sku_id;
- if (!isset($skus[$sku->id])) {
- $skus[$sku->id] = ['costs' => [], 'count' => 0];
+ if (!isset($skus[$sku_id])) {
+ $skus[$sku_id] = ['costs' => [], 'count' => 0];
}
- $skus[$sku->id]['count']++;
- $skus[$sku->id]['costs'][] = $ent->cost;
+ $skus[$sku_id]['count']++;
+ $skus[$sku_id]['costs'][] = $ent->cost;
}
return $skus;
diff --git a/src/app/Http/Controllers/API/V4/UsersController.php b/src/app/Http/Controllers/API/V4/UsersController.php
--- a/src/app/Http/Controllers/API/V4/UsersController.php
+++ b/src/app/Http/Controllers/API/V4/UsersController.php
@@ -164,29 +164,27 @@
]
);
- // Check if the user is a controller of his wallet
- $isController = $user->canDelete($user);
-
+ $wallet = $user->wallet();
+ $isController = $wallet->isController($user);
$isDegraded = $user->isDegraded();
- $hasMeet = !$isDegraded && Sku::withObjectTenantContext($user)->where('title', 'room')->exists();
- // Enable all features if there are no skus for domain-hosting
- $hasCustomDomain = $user->wallet()->entitlements()
- ->where('entitleable_type', Domain::class)
- ->count() > 0 || !Sku::withObjectTenantContext($user)->where('title', 'domain-hosting')->exists();
+
+ $plan = $isController ? $wallet->plan() : null;
+
+ $allSkus = Sku::withObjectTenantContext($user)->pluck('title')->all();
// Get user's entitlements titles
- $skus = $user->entitlements()->select('skus.title')
+ $skus = $user->entitlements()->distinct()
->join('skus', 'skus.id', '=', 'entitlements.sku_id')
- ->get()
->pluck('title')
->sort()
- ->unique()
->values()
->all();
- $hasBeta = in_array('beta', $skus) || !Sku::withObjectTenantContext($user)->where('title', 'beta')->exists();
-
- $plan = $isController ? $user->wallet()->plan() : null;
+ $hasBeta = in_array('beta', $skus) || !in_array('beta', $allSkus);
+ $hasMeet = !$isDegraded && \config('app.with_meet') && in_array('room', $allSkus);
+ $hasCustomDomain = $wallet->entitlements()->where('entitleable_type', Domain::class)->count() > 0
+ // Enable all features if there are no skus for domain-hosting
+ || !in_array('domain-hosting', $allSkus);
$result = [
'skus' => $skus,
@@ -197,7 +195,7 @@
'enableFiles' => !$isDegraded && $hasBeta && \config('app.with_files'),
'enableFolders' => $isController && $hasCustomDomain && \config('app.with_shared_folders'),
'enableResources' => $isController && $hasCustomDomain && $hasBeta && \config('app.with_resources'),
- 'enableRooms' => $hasMeet && \config('app.with_meet'),
+ 'enableRooms' => $hasMeet,
'enableSettings' => $isController,
'enableSubscriptions' => $isController && \config('app.with_subscriptions'),
'enableUsers' => $isController,

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 10:13 PM (13 h, 36 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18831209
Default Alt Text
D4722.1775340821.diff (3 KB)

Event Timeline