check for blocked users and prevent them from logging in

Author: warcooft

src/Controllers/OAuthController.php

@@ -22,6 +22,7 @@
 class OAuthController extends BaseController implements ControllersInterface
 {
     private const ACCESS_DENIED = 'access_denied';
+    private ?User $userExist;
 
     public function redirectOAuth(string $oauthName): RedirectResponse
     {
@@ -89,10 +90,7 @@ public function callBack(): RedirectResponse
             $updateFields = $oauthClass->getColumnsName('syncingUserInfo', $userInfo);
 
             $userid = $this->syncingUserInfo($find, $updateFields);
-        }
-
-        // Create new user if credentials not exist or let users register themselves
-        if ($this->checkExistenceUser($find) === false) {
+        } else {
             // Check config setting first to see if it can register automatically or not
             if (config('ShieldOAuthConfig')->oauthConfigs[$oauthName]['allow_register'] === false) {
                 return redirect()->to(config('Auth')->logoutRedirect())->with('error', lang('ShieldOAuthLang.Callback.account_not_found', [$userInfo->email]));
@@ -112,6 +110,10 @@ public function callBack(): RedirectResponse
             $users->addToDefaultGroup($user);
         }
 
+        if ($this->userExist->isBanned()) {
+            return redirect()->to(config('Auth')->logoutRedirect())->with('error', $this->userExist->getBanMessage() ?? lang('Auth.bannedUser'));
+        }
+
         auth()->loginById($userid);
         $this->recordLoginAttempt($oauthName, $userInfo->email);
 
@@ -143,6 +145,8 @@ private function checkExistenceUser(array $find = []): bool
         // $find = ['email' => $this->userInfo()->email];
         $findUser = $users->findByCredentials($find);
 
+        $this->userExist = $findUser;
+
         return $findUser !== null;
     }