Merge pull request #14 from codebar-ag/feature-updates

Feature updates
codebar-ag · Sep 18, 2023 · 96003bc · 96003bc
2 parents 9f68300 + 14087ae
commit 96003bc
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -218,11 +218,12 @@ return [
     | Logo Settings
     |--------------------------------------------------------------------------
     | You may like to define a different logo for the login page.
-    | The path is relative to the public folder.
+    | You can pass either a path relative to the public folder or a full url.
     |
     */
     'logo' => [
         'path' => 'vendor/auth/images/lock.svg',
+        // 'path' => 'https://example.test/images/logo.png',
     ],
 
     /*
@@ -281,7 +282,21 @@ return [
         'disabled' => [
             // ProviderEnum::MICROSOFT_OFFICE_365(),
         ],
-    ]
+    ],
+
+
+    /*
+    |--------------------------------------------------------------------------
+    | Feature Settings
+    |--------------------------------------------------------------------------
+    | By default, all features are enabled.
+    | You may disable a provider by adding changing the value to false.
+    |
+    */
+    'features' => [
+        'password_reset' => true,
+        'email_verification' => true,
+    ],
 ];
 ```
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "laravel/socialite": "^5.8",
         "socialiteproviders/microsoft": "^4.2",
         "spatie/laravel-enum": "^3.0",
-        "spatie/laravel-package-tools": "^1.14.0",
+        "spatie/laravel-package-tools": "^1.16.1",
         "spatie/laravel-flash": "^1.9",
         "spatie/laravel-activitylog": "^4.7",
         "spatie/laravel-honeypot": "^4.3"

diff --git a/config/laravel-auth.php b/config/laravel-auth.php
@@ -93,4 +93,17 @@
             ProviderEnum::MICROSOFT_OFFICE_365(),
         ],
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Feature Settings
+    |--------------------------------------------------------------------------
+    | By default, all features are enabled.
+    | You may disable a provider by adding changing the value to false.
+    |
+    */
+    'features' => [
+        'password_reset' => true,
+        'email_verification' => true,
+    ],
 ];
diff --git a/resources/dist/authcss.css b/resources/dist/authcss.css
diff --git a/resources/views/components/logo.blade.php b/resources/views/components/logo.blade.php
@@ -1,3 +1,5 @@
-@if(config('laravel-auth.logo.path'))
+@if(config('laravel-auth.logo.path') && !filter_var(config('laravel-auth.logo.path'), FILTER_VALIDATE_URL))
     <img src="{{ asset(config('laravel-auth.logo.path')) }}" alt="{{__('auth::translations.logo')}}" {{ $attributes->merge(['class' => 'mx-auto w-[25%]']) }}>
+@else
+    <img src="{{ config('laravel-auth.logo.path') }}" alt="{{__('auth::translations.logo')}}" {{ $attributes->merge(['class' => 'mx-auto w-[25%]']) }}>
 @endif
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
@@ -31,10 +31,12 @@
                 :label="__('auth::translations.remember-me')"
             />
 
-            <div class="flex items-center">
-                <a href="{{ route('auth.request-password') }}"
-                       class="block text-sm text-gray-900 hover:text-gray-500 underline">{{ __('auth::translations.forgot-password') }}</a>
-            </div>
+            @if(config('laravel-auth.features.password_reset'))
+                <div class="flex items-center">
+                    <a href="{{ route('auth.request-password') }}"
+                           class="block text-sm text-gray-900 hover:text-gray-500 underline">{{ __('auth::translations.forgot-password') }}</a>
+                </div>
+            @endif
         </div>
 
         <div class="space-y-4">
@@ -45,7 +47,7 @@ class="block text-sm text-gray-900 hover:text-gray-500 underline">{{ __('auth::t
             @if(! in_array(\CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365(), config('laravel-auth.providers.disabled')))
                 <x-auth::form.button.ahref
                     :href="route('auth.provider', \CodebarAg\LaravelAuth\Enums\ProviderEnum::MICROSOFT_OFFICE_365())"
-                    class="bg-gray-500"
+                    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>
                     <span>{{ __('auth::translations.sign-in-with-microsoft') }}</span>

diff --git a/routes/auth.php b/routes/auth.php
@@ -20,22 +20,24 @@
                 ->name('login.store');
         });
 
-        Route::prefix('password')->group(function () {
-            Route::get('/')->uses([RequestPasswordController::class, 'index'])
-                ->name('request-password');
+        if (config('laravel-auth.features.password_reset')) {
+            Route::prefix('password')->group(function () {
+                Route::get('/')->uses([RequestPasswordController::class, 'index'])
+                    ->name('request-password');
 
-            Route::post('store')->uses([RequestPasswordController::class, 'store'])
-                ->name('request-password.store')
-                ->middleware(ProtectAgainstSpam::class);
+                Route::post('store')->uses([RequestPasswordController::class, 'store'])
+                    ->name('request-password.store')
+                    ->middleware(ProtectAgainstSpam::class);
 
-            Route::get('token/{token}')->uses([ResetPasswordController::class, 'index'])
-                ->name('reset-password')
-                ->middleware('signed');
+                Route::get('token/{token}')->uses([ResetPasswordController::class, 'index'])
+                    ->name('reset-password')
+                    ->middleware('signed');
 
-            Route::post('reset')->uses([ResetPasswordController::class, 'store'])
-                ->name('reset-password.store')
-                ->middleware(ProtectAgainstSpam::class);
-        });
+                Route::post('reset')->uses([ResetPasswordController::class, 'store'])
+                    ->name('reset-password.store')
+                    ->middleware(ProtectAgainstSpam::class);
+            });
+        }
 
         Route::prefix('service')->group(function () {
             Route::get('{service}', [ProviderController::class, 'service'])->name('provider');
@@ -47,15 +49,17 @@
         Route::any('logout')->uses(LogoutController::class)
             ->name('logout');
 
-        Route::prefix('email')->group(function () {
-            Route::get('verify')->uses([EmailVerificationController::class, 'index'])
-                ->name('verification.notice');
+        if (config('laravel-auth.features.email_verification')) {
+            Route::prefix('email')->group(function () {
+                Route::get('verify')->uses([EmailVerificationController::class, 'index'])
+                    ->name('verification.notice');
 
-            Route::get('verify/{id}/{hash}')->uses([EmailVerificationController::class, 'store'])
-                ->middleware(['signed'])->name('verification.verify');
+                Route::get('verify/{id}/{hash}')->uses([EmailVerificationController::class, 'store'])
+                    ->middleware(['signed'])->name('verification.verify');
 
-            Route::post('verification-notification')->uses([EmailVerificationController::class, 'send'])
-                ->name('verification.send');
-        });
+                Route::post('verification-notification')->uses([EmailVerificationController::class, 'send'])
+                    ->name('verification.send');
+            });
+        }
     });
 });
diff --git a/tests/Feature/LoginControllerTest.php b/tests/Feature/LoginControllerTest.php