Allow selecting users that are allowed to see the feature flag enabled

area17 · Jun 8, 2024 · c1b78b5 · c1b78b5
1 parent b599ae2
commit c1b78b5
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 17 deletions.
diff --git a/docs/screenshot02.png b/docs/screenshot02.png
diff --git a/src/Models/TwillFeatureFlag.php b/src/Models/TwillFeatureFlag.php
@@ -4,7 +4,9 @@
 
 use A17\Twill\Models\Model;
 use Illuminate\Support\Str;
+use A17\Twill\Models\Behaviors\HasRelated;
 use A17\Twill\Models\Behaviors\HasRevisions;
+use Illuminate\Foundation\Auth\User as AuthenticatableContract;
 
 /**
  * @property string $code
@@ -18,9 +20,18 @@
  */
 class TwillFeatureFlag extends Model
 {
+    use HasRelated;
     use HasRevisions;
 
-    protected $fillable = ['published', 'title', 'description', 'code', 'publicly_available', 'ip_addresses', 'publicly_available_twill_users'];
+    protected $fillable = [
+        'published',
+        'title',
+        'description',
+        'code',
+        'publicly_available',
+        'ip_addresses',
+        'publicly_available_twill_users',
+    ];
 
     /**
      * Save the model to the database.
@@ -49,4 +60,30 @@ public function getPubliclyAvailableIpsAttribute(): string|null
     {
         return $this->ip_addresses ?? null;
     }
+
+    public function userIsPubliclyAllowed(AuthenticatableContract|null $user): bool
+    {
+        if ($user === null) {
+            return false;
+        }
+
+        /** @phpstan-ignore-next-line */
+        if ($user->published === false) {
+            return false;
+        }
+
+        /** @phpstan-ignore-next-line */
+        if ($user->isSuperAdmin()) {
+            return true;
+        }
+
+        $allowedUsers = $this->getRelated('allowed_twill_users');
+
+        if ($allowedUsers->isEmpty()) {
+            return true;
+        }
+
+        /** @phpstan-ignore-next-line */
+        return $allowedUsers->pluck('email')->contains($user->email);
+    }
 }
diff --git a/src/Repositories/TwillFeatureFlagRepository.php b/src/Repositories/TwillFeatureFlagRepository.php
@@ -14,6 +14,10 @@ class TwillFeatureFlagRepository extends ModuleRepository
 {
     use HandleRevisions;
 
+    protected $relatedBrowsers = [
+        'allowed_twill_users' => ['moduleName' => 'users', 'relation' => 'allowed_twill_users'],
+    ];
+
     public function __construct(TwillFeatureFlag $model = null)
     {
         $this->bootCache();
@@ -53,7 +57,8 @@ public function getFeature(string $code): bool
 
     private function isRealProduction(): bool
     {
-        return (new Collection(config('app.domains.publicly_available')))->contains(request()->getHost());
+        return app()->environment('production') &&
+            (new Collection(config('app.domains.publicly_available')))->contains(request()->getHost());
     }
 
     public function featureList(bool $all = false): array
@@ -149,7 +154,8 @@ public function isPubliclyAvailableToTwillUsers(TwillFeatureFlag $featureFlag):
             return false;
         }
 
-        // Is the user authenticated on Twill?
-        return auth('twill_users')->check();
+        $auth = auth('twill_users');
+
+        return $auth->check() && $featureFlag->userIsPubliclyAllowed($auth->user());
     }
 }
diff --git a/src/resources/views/admin/form.blade.php b/src/resources/views/admin/form.blade.php
@@ -7,18 +7,18 @@
     'type' => 'text'
     ])
 
+    @formField('input', [
+    'label' => 'Description',
+    'name' => 'description',
+    'rows' => 4,
+    'type' => 'textarea'
+    ])
+
     @formField('checkbox', [
     'name' => 'publicly_available',
     'label' => 'Publicly available',
     ])
 
-    @if(features_can_be_public_on_twill())
-        @formField('checkbox', [
-        'name' => 'publicly_available_twill_users',
-        'label' => 'Publicly available for users logged in Twill',
-        ])
-    @endif
-
     @formField('input', [
     'label' => 'IP Addresses',
     'name' => 'ip_addresses',
@@ -29,10 +29,23 @@
     'translated' => false,
     ])
 
-    @formField('input', [
-    'label' => 'Description',
-    'name' => 'description',
-    'rows' => 4,
-    'type' => 'textarea'
-    ])
+    @if (features_can_be_public_on_twill())
+        @formField('checkbox', [
+        'name' => 'publicly_available_twill_users',
+        'label' => 'Publicly available for users logged in Twill',
+        ])
+
+        @formConnectedFields([
+        'fieldName' => 'publicly_available_twill_users',
+        'fieldValues' => true,
+        ])
+        @formField('browser', [
+        'moduleName' => 'users',
+        'name' => 'allowed_twill_users',
+        'label' => 'Allowed users',
+        'note' => 'If no users are selected, all users will be allowed',
+        'max' => 999,
+        ])
+    @endformConnectedFields
+    @endif
 @stop