@@ -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')))
{{ __('auth::translations.sign-in-with-microsoft') }}
diff --git a/routes/auth.php b/routes/auth.php
index 1d49c55..b91d02d 100644
--- 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');
+ });
+ }
});
});
From d51d5ccd0b4047f0c536a6c4d35c4e8edf975974 Mon Sep 17 00:00:00 2001
From: Rhys Lees <43909932+RhysLees@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:55:24 +0100
Subject: [PATCH 2/4] WIP
---
README.md | 3 ++-
resources/views/components/logo.blade.php | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 368f0cb..1b72699 100644
--- 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',
],
/*
diff --git a/resources/views/components/logo.blade.php b/resources/views/components/logo.blade.php
index c1a80dd..6d16bbc 100644
--- 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))
) }})
merge(['class' => 'mx-auto w-[25%]']) }}>
+@else
+  }})
merge(['class' => 'mx-auto w-[25%]']) }}>
@endif
From 3e59c0b2f522fd8a00accd969ea867b4e51ae0a6 Mon Sep 17 00:00:00 2001
From: Rhys Lees <43909932+RhysLees@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:57:21 +0100
Subject: [PATCH 3/4] WIP
---
tests/Feature/LoginControllerTest.php | 26 --------------------------
1 file changed, 26 deletions(-)
delete mode 100644 tests/Feature/LoginControllerTest.php
diff --git a/tests/Feature/LoginControllerTest.php b/tests/Feature/LoginControllerTest.php
deleted file mode 100644
index 9a86e0f..0000000
--- a/tests/Feature/LoginControllerTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-get(route('auth.login'));
- $response->assertOk();
-})->group('auth', 'login', 'test')->only();
-
-it('authorized auth.login', function () {
- authenticatedUser();
- $response = $this->get(route('login'));
- $response->assertRedirect();
-})->group('auth', 'login')->skip();
-
-test('authorized customer.auth.login.store', function () {
- $user = authenticatedUser();
- $route = route('login.store');
-
- $response = $this->post($route, [
- 'email' => $user->email,
- 'password' => 'password',
- ]);
-
- $response->assertRedirect(route('frontend.start.index'));
-})->group('auth', 'login')->skip();
From 14087aec8b60590ea1872994b223a59f82d85ee8 Mon Sep 17 00:00:00 2001
From: Rhys Lees <43909932+RhysLees@users.noreply.github.com>
Date: Mon, 18 Sep 2023 15:26:47 +0100
Subject: [PATCH 4/4] WIP
---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/composer.json b/composer.json
index 32eb8c4..331b9d6 100644
--- 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"