Merge pull request #170 from warcooft/feat-setting

feat: Apply config settings
datamweb · Sep 11, 2024 · 4d31367 · 4d31367
2 parents 2b1672e + 2af01d0
commit 4d31367
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 93 deletions.
diff --git a/composer.json b/composer.json
@@ -1,73 +1,73 @@
 {
-    "name": "datamweb/shield-oauth",
-    "description": "OAuth for CodeIgniter Shield",
-    "license": "MIT",
-    "type": "library",
-    "keywords": [
-        "codeigniter4",
-        "shield",
-        "oauth",
-        "googleOauth",
-        "githubOauth",
-        "authentication",
-        "authorization"
+  "name": "datamweb/shield-oauth",
+  "description": "OAuth for CodeIgniter Shield",
+  "license": "MIT",
+  "type": "library",
+  "keywords": [
+    "codeigniter4",
+    "shield",
+    "oauth",
+    "googleOauth",
+    "githubOauth",
+    "authentication",
+    "authorization"
+  ],
+  "authors": [
+    {
+      "name": "Pooya Parsa Dadashi",
+      "email": "pooya_parsa_dadashi@yahoo.com",
+      "role": "Developer"
+    }
+  ],
+  "homepage": "https://github.com/datamweb/shield-oauth",
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "require": {
+    "php": "^7.4.3 || ^8.0 || ^8.1 || ^8.2",
+    "ext-curl": "*",
+    "codeigniter4/shield": "^1.0"
+  },
+  "require-dev": {
+    "codeigniter4/devkit": "^1.0",
+    "codeigniter4/framework": "^4.3.5",
+    "codeigniter4/shield": "^1.0",
+    "rector/rector": "1.2.5"
+  },
+  "autoload": {
+    "psr-4": {
+      "Datamweb\\ShieldOAuth\\": "src"
+    },
+    "exclude-from-classmap": [
+      "**/Database/Migrations/**"
+    ]
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests",
+      "Tests\\Support\\": "tests/_support"
+    }
+  },
+  "scripts": {
+    "post-update-cmd": [
+      "bash admin/setup.sh"
     ],
-    "authors": [
-        {
-            "name": "Pooya Parsa Dadashi",
-            "email": "pooya_parsa_dadashi@yahoo.com",
-            "role": "Developer"
-        }
+    "ci": [
+      "Composer\\Config::disableProcessTimeout",
+      "@cs"
     ],
-    "homepage": "https://github.com/datamweb/shield-oauth",
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require": {
-        "php": "^7.4.3 || ^8.0 || ^8.1 || ^8.2",
-        "ext-curl": "*",
-        "codeigniter4/shield": "^1.0"
-    },
-    "require-dev": {
-        "codeigniter4/devkit": "^1.0",
-        "codeigniter4/framework": "^4.3.5",
-        "codeigniter4/shield": "^1.0",
-        "rector/rector": "1.2.5"
-    },
-    "autoload": {
-        "psr-4": {
-            "Datamweb\\ShieldOAuth\\": "src"
-        },
-        "exclude-from-classmap": [
-            "**/Database/Migrations/**"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests",
-            "Tests\\Support\\": "tests/_support"
-        }
-    },
-    "scripts": {
-        "post-update-cmd": [
-            "bash admin/setup.sh"
-        ],
-        "ci": [
-            "Composer\\Config::disableProcessTimeout",
-            "@cs"
-        ],
-        "cs": "php-cs-fixer fix --ansi --verbose --dry-run --diff",
-        "cs-fix": "php-cs-fixer fix --ansi --verbose --diff",
-        "style": "@cs-fix"
-    },
-    "config": {
-        "allow-plugins": {
-            "phpstan/extension-installer": true
-        }
-    },
-    "support": {
-        "forum": "https://github.com/datamweb/shield-oauth/discussions",
-        "source": "https://github.com/datamweb/shield-oauth",
-        "issues": "https://github.com/datamweb/shield-oauth/issues",
-        "docs": "https://www.shield-oauth.codeigniter4.ir"
+    "cs": "php-cs-fixer fix --ansi --verbose --dry-run --diff",
+    "cs-fix": "php-cs-fixer fix --ansi --verbose --diff",
+    "style": "@cs-fix"
+  },
+  "config": {
+    "allow-plugins": {
+      "phpstan/extension-installer": true
     }
+  },
+  "support": {
+    "forum": "https://github.com/datamweb/shield-oauth/discussions",
+    "source": "https://github.com/datamweb/shield-oauth",
+    "issues": "https://github.com/datamweb/shield-oauth/issues",
+    "docs": "https://www.shield-oauth.codeigniter4.ir"
+  }
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,22 +1,23 @@
 includes:
-	- phpstan-baseline.php
+		- phpstan-baseline.php
 parameters:
-	tmpDir: build/phpstan
-	level: 6
-	paths:
-		- src/
-	bootstrapFiles:
-		- vendor/codeigniter4/framework/system/Test/bootstrap.php
-	excludePaths:
-		- app/Views/*
-	ignoreErrors:
-	universalObjectCratesClasses:
-		- CodeIgniter\Entity
-		- CodeIgniter\Entity\Entity
-		- Faker\Generator
-	scanDirectories:
-		- vendor/codeigniter4/framework/system/Helpers
-	dynamicConstantNames:
-		- APP_NAMESPACE
-		- CI_DEBUG
-		- ENVIRONMENT
+		tmpDir: build/phpstan
+		level: 6
+		paths:
+				- src/
+		bootstrapFiles:
+				- vendor/codeigniter4/framework/system/Test/bootstrap.php
+		excludePaths:
+				- app/Views/*
+		ignoreErrors:
+		universalObjectCratesClasses:
+				- CodeIgniter\Entity
+				- CodeIgniter\Entity\Entity
+				- Faker\Generator
+		scanDirectories:
+				- vendor/codeigniter4/framework/system/Helpers
+				- vendor/codeigniter4/settings/src/Helpers
+		dynamicConstantNames:
+				- APP_NAMESPACE
+				- CI_DEBUG
+				- ENVIRONMENT
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]));
             }
 
@@ -143,7 +143,7 @@ private function checkAntiForgery(string $state): bool
     private function checkExistenceUser(array $find = []): bool
     {
         $users = model('ShieldOAuthModel');
-        // $find = ['email' => $this->userInfo()->email];
+
         $findUser = $users->findByCredentials($find);
 
         $this->userExist = $findUser;
@@ -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;