Feature Flag Cleanup: AzureMatchingPropertyFeature (#1223)

canyongbs · Jan 3, 2025 · 345ce12 · 345ce12
1 parent 488eb3a
commit 345ce12
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 105 deletions.
diff --git a/...n/database/migrations/2024_12_30_144224_data_activate_azure_matching_property_feature.php b/...n/database/migrations/2024_12_30_144224_data_activate_azure_matching_property_feature.php
diff --git a/app-modules/authorization/src/Enums/SocialiteProvider.php b/app-modules/authorization/src/Enums/SocialiteProvider.php
@@ -40,7 +40,6 @@
 use AdvisingApp\Authorization\Settings\AzureSsoSettings;
 use AdvisingApp\Authorization\Settings\GoogleSsoSettings;
 use AdvisingApp\MeetingCenter\Settings\AzureCalendarSettings;
-use App\Features\AzureMatchingPropertyFeature;
 use Exception;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Facades\Socialite;
@@ -101,10 +100,6 @@ public function getEmailFromUser(mixed $user): string
     {
         return match ($this->value) {
             'azure', 'azure_calendar' => (function () use ($user) {
-                if (! AzureMatchingPropertyFeature::active()) {
-                    return $user->getEmail();
-                }
-
                 /** @var User $user */
 
                 return match (app(AzureSsoSettings::class)->matching_property) {

diff --git a/app-modules/authorization/src/Filament/Pages/ManageAzureSsoSettings.php b/app-modules/authorization/src/Filament/Pages/ManageAzureSsoSettings.php
@@ -38,7 +38,6 @@
 
 use AdvisingApp\Authorization\Enums\AzureMatchingProperty;
 use AdvisingApp\Authorization\Settings\AzureSsoSettings;
-use App\Features\AzureMatchingPropertyFeature;
 use App\Filament\Clusters\ProductIntegrations;
 use App\Models\User;
 use Filament\Forms\Components\Section;
@@ -102,8 +101,7 @@ public function form(Form $form): Form
                             ->label('Matching Property')
                             ->options(AzureMatchingProperty::class)
                             ->enum(AzureMatchingProperty::class)
-                            ->required(fn (Get $get) => $get('is_enabled'))
-                            ->visible(AzureMatchingPropertyFeature::active()),
+                            ->required(fn (Get $get) => $get('is_enabled')),
                     ])->visible(fn (Get $get) => $get('is_enabled')),
             ]);
     }

diff --git a/app/Features/AzureMatchingPropertyFeature.php b/app/Features/AzureMatchingPropertyFeature.php