feat: apply config setting

datamweb · Sep 10, 2024 · 8f25ed3 · 8f25ed3
1 parent 2b1672e
commit 8f25ed3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Controllers/OAuthController.php b/src/Controllers/OAuthController.php
@@ -32,7 +32,7 @@ public function redirectOAuth(string $oauthName): RedirectResponse
             return redirect()->to(config('Auth')->loginRedirect());
         }
 
-        if (config('ShieldOAuthConfig')->oauthConfigs[$oauthName]['allow_login'] === false) {
+        if (setting('ShieldOAuthConfig.oauthConfigs')[$oauthName]['allow_login'] === false) {
             $errorText = 'ShieldOAuthLang.' . ucfirst($oauthName) . '.not_allow';
 
             return redirect()->to(config('Auth')->logoutRedirect())->with('error', lang($errorText));
@@ -93,7 +93,7 @@ public function callBack(): RedirectResponse
             $userid = $this->syncingUserInfo($find, $updateFields);
         } else {
             // Check config setting first to see if it can register automatically or not
-            if (config('ShieldOAuthConfig')->oauthConfigs[$oauthName]['allow_register'] === false) {
+            if (setting('ShieldOAuthConfig.oauthConfigs')[$oauthName]['allow_register'] === false) {
                 return redirect()->to(config('Auth')->logoutRedirect())->with('error', lang('ShieldOAuthLang.Callback.account_not_found', [$userInfo->email]));
             }
 
@@ -164,10 +164,10 @@ private function syncingUserInfo(array $find = [], array $updateFields = []): in
         $users = model('ShieldOAuthModel');
         $user  = $users->findByCredentials($find);
 
-        $syncingUserInfo = config('ShieldOAuthConfig')->syncingUserInfo;
-        if ($syncingUserInfo === true) {
+        if (setting('ShieldOAuthConfig.syncingUserInfo') === true) {
             $user->fill($updateFields);
         }
+
         $users->save($user);
 
         return $user->id;