WIP

codebar-ag · Oct 24, 2023 · 94eb3b8 · 94eb3b8
1 parent ca7bae7
commit 94eb3b8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -291,12 +291,12 @@ return [
     |--------------------------------------------------------------------------
     | Provider Settings
     |--------------------------------------------------------------------------
-    | By default, all providers are enabled.
-    | You may disable a provider by adding it to the disabled array.
+    | Add the providers you want to use here.
+    | e.g ProviderEnum::MICROSOFT_OFFICE_365,
     |
     */
     'providers' => [
-         ProviderEnum::MICROSOFT_OFFICE_365(),
+         ProviderEnum::MICROSOFT_OFFICE_365,
     ],
 
 

diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
         "illuminate/contracts": "^10.0",
         "laravel/socialite": "^5.8",
         "socialiteproviders/microsoft": "^4.2",
-        "spatie/laravel-enum": "^3.0",
         "spatie/laravel-package-tools": "^1.16.1",
         "spatie/laravel-flash": "^1.9",
         "spatie/laravel-activitylog": "^4.7",

diff --git a/config/laravel-auth.php b/config/laravel-auth.php
@@ -86,11 +86,11 @@
     | Provider Settings
     |--------------------------------------------------------------------------
     | Add the providers you want to use here.
-    | e.g ProviderEnum::MICROSOFT_OFFICE_365(),
+    | e.g ProviderEnum::MICROSOFT_OFFICE_365,
     |
     */
     'providers' => [
-        ProviderEnum::MICROSOFT_OFFICE_365(),
+        ProviderEnum::MICROSOFT_OFFICE_365,
     ],
 
     /*

diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
@@ -51,9 +51,9 @@
 
     <div class="space-y-4">
         @if(config('laravel-auth.features.sso'))
-            @if(in_array(\CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365(), config('laravel-auth.providers')))
+            @if(in_array(\CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365, config('laravel-auth.providers')))
                 <x-auth::form.button.ahref
-                        :href="route('auth.provider', \CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365())"
+                        :href="route('auth.provider', \CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365->value)"
                         class="bg-gray-500 hover:bg-gray-400"
                 >
                     <svg class="fill-white w-4 h-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 278050 333334" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"><path fill="currentColor" d="M278050 305556l-29-16V28627L178807 0 448 66971l-448 87 22 200227 60865-23821V80555l117920-28193-17 239519L122 267285l178668 65976v73l99231-27462v-316z"/></svg>

diff --git a/src/Controllers/ProviderController.php b/src/Controllers/ProviderController.php
@@ -35,20 +35,20 @@ public function serviceRedirect($service)
 
     protected function allowed($provider)
     {
-        if (! in_array($provider->value, config('laravel-auth.providers'))) {
+        if (! in_array($provider, config('laravel-auth.providers'))) {
             abort(503);
         }
     }
 
     public function microsoft()
     {
-        return Socialite::driver(ProviderEnum::MICROSOFT_OFFICE_365()->value)->redirect();
+        return Socialite::driver(ProviderEnum::MICROSOFT_OFFICE_365->value)->redirect();
     }
 
     public function microsoftRedirect()
     {
         try {
-            $socialiteUser = Socialite::driver(ProviderEnum::MICROSOFT_OFFICE_365()->value)->user();
+            $socialiteUser = Socialite::driver(ProviderEnum::MICROSOFT_OFFICE_365->value)->user();
         } catch (\Exception $e) {
             flash(__('Authentication Error.'), 'warning');
 
@@ -57,7 +57,7 @@ public function microsoftRedirect()
 
         $provider = AuthProvider::updateOrCreate(
             [
-                'provider' => ProviderEnum::MICROSOFT_OFFICE_365()->value,
+                'provider' => ProviderEnum::MICROSOFT_OFFICE_365->value,
                 'provider_id' => $socialiteUser->id,
             ],
             [

diff --git a/src/Enums/ProviderEnum.php b/src/Enums/ProviderEnum.php
@@ -2,17 +2,10 @@
 
 namespace CodebarAg\LaravelAuth\Enums;
 
-use Spatie\Enum\Laravel\Enum;
-
 /**
  * @method static self MICROSOFT_OFFICE_365()
  */
-class ProviderEnum extends Enum
+enum ProviderEnum: string
 {
-    protected static function values(): array
-    {
-        return [
-            'MICROSOFT_OFFICE_365' => 'microsoft',
-        ];
-    }
+    case MICROSOFT_OFFICE_365 = 'microsoft';
 }