From e5381814f1f80492a8527534516ea5e1acec221a Mon Sep 17 00:00:00 2001
From: ryzenixx <mael.duret@icloud.com>
Date: Sat, 7 Feb 2026 00:19:39 +0100
Subject: [PATCH] feat(auth): enable forced oauth login with bypass

---
 app/Providers/FortifyServiceProvider.php          | 2 +-
 resources/views/livewire/settings-oauth.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
index 71328f805..580a2d844 100644
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -61,7 +61,7 @@ class FortifyServiceProvider extends ServiceProvider
             $enabled_oauth_providers = OauthSetting::where('enabled', true)->get();
             $users = User::count();
 
-            if ($settings->oauth_auto_redirect && $enabled_oauth_providers->where('provider', $settings->oauth_auto_redirect)->isNotEmpty()) {
+            if (!$request->has('skip_oauth') && $settings->oauth_auto_redirect && $enabled_oauth_providers->where('provider', $settings->oauth_auto_redirect)->isNotEmpty()) {
                 return redirect()->route('auth.redirect', ['provider' => $settings->oauth_auto_redirect]);
             }
 
diff --git a/resources/views/livewire/settings-oauth.blade.php b/resources/views/livewire/settings-oauth.blade.php
index 54b18123b..7526c08de 100644
--- a/resources/views/livewire/settings-oauth.blade.php
+++ b/resources/views/livewire/settings-oauth.blade.php
@@ -14,7 +14,7 @@
             <div class="pb-4 ">Custom authentication (OAuth) configurations.</div>
         </div>
         <div class="mb-5">
-            <x-forms.select label="Forced OAuth Login" id="oauth_auto_redirect" helper="If selected, users will be automatically redirected to this provider when visiting the login page.<br>To bypass this, use <code>/login?skip_oauth=true</code> (not implemented yet, but good practice to know).">
+            <x-forms.select label="Forced OAuth Login" id="oauth_auto_redirect" helper="If selected, users will be automatically redirected to this provider when visiting the login page.<br>To bypass this, use <code>/login?skip_oauth=true</code>.">
                 <option value="">None</option>
                 @foreach ($oauth_settings_map as $oauth_setting)
                     @if ($oauth_setting['enabled'])