merge 1

Signed-off-by: miguel456 <me@nogueira.codes>

app/Http/Controllers/Auth/LoginController.php

@@ -26,8 +26,11 @@ use App\Services\AccountSuspensionService;
 use App\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
 use App\Facades\IP;
+use Illuminate\Support\Str;
 use Laravel\Socialite\Facades\Socialite;
 
 class LoginController extends Controller
@@ -76,6 +79,14 @@ class LoginController extends Controller
             $isLocked = $service->isLocked($user);
 
             if ($isBanned || $isLocked) {
+
+                Log::alert('Restricted user attempting to login.', [
+                    'ip' => $request->ip(),
+                    'email' => $user->email,
+                    'isBanned' => $isBanned,
+                    'isLocked' => $isLocked
+                ]);
+
                 return false;
             } else {
                 return $this->originalAttemptLogin($request);
@@ -94,17 +105,11 @@ class LoginController extends Controller
                     'prev' => $user->originalIP,
                     'new' => $request->ip()
                 ]);
-                $user->originalIP = $request->ip();
+                $user->currentIp = $request->ip();
                 $user->save();
             }
         }
     }
 
-    public function discordRedirect() {
-        return Socialite::driver('discord')->redirect();
-    }
 
-    public function discordCallback() {
-        // TODO;
-    }
 }