Merge pull request #123 from AiAe/dev-aiae

Allow re-linking Discord
AiAe · May 28, 2024 · 5661d28 · 5661d28
2 parents ae90bce + b3a5b21
commit 5661d28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/Http/Controllers/Web/AuthController.php b/app/Http/Controllers/Web/AuthController.php
@@ -26,7 +26,8 @@ public function redirectToProvider(Request $request, $driver)
             return $this->sendFailedResponse("{$driver} is not currently supported");
         }
 
-        if (Auth::user() && !empty(Auth::user()->discord_user_id)) {
+        // Allow re-linking Discord
+        if (Auth::user() && $driver !== "discord") {
             return $this->sendFailedResponse(__("You are already logged in!"));
         }
 

diff --git a/resources/views/web/user/edit.blade.php b/resources/views/web/user/edit.blade.php
@@ -29,14 +29,17 @@
                     <div class="col-lg-6">
                         <label class="form-label">{{ __('Linked Discord ID') }}</label>
                         <div class="input-group">
-
                             {{ Form::text('', $loggedUser['discord_user_id'], ['class' => 'form-control', 'readonly' => 'readonly']) }}
                             @if($loggedUser['discord_user_id'] == null)
                                 <div class="input-group-append">
                                     <a href="{{ route('web.auth.oauth', ['driver' => 'discord', 'redirect' => current_route()]) }}"
                                        class="btn btn-discord"
                                        style="border-bottom-left-radius: 0; border-top-left-radius: 0;">{{ __('Connect Discord') }}</a>
                                 </div>
+                                @else
+                                <div class="input-group-append">
+                                    <a href="{{ route('web.auth.oauth', ['driver' => 'discord', 'redirect' => current_route()]) }}" class="btn btn-discord">Re-link Discord</a>
+                                </div>
                             @endif
                         </div>
                         <small>{{ __('If you have linked the wrong Discord account, please contact tournament organizer or site admins!') }}</small>