From 514cba6a9de9c43d0e32708c51256149c9d5432a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Wed, 19 Jul 2023 12:42:31 +0900
Subject: [PATCH] servermgrv2 init...

---
 app/Config/Constants.php                     |  2 +-
 app/Controllers/Common/AuthController.php    | 15 ++++++++-------
 app/Libraries/Adapter/Auth/Adapter.php       |  2 +-
 app/Libraries/Adapter/Auth/GoogleAdapter.php |  2 +-
 app/Models/UserSNSModel.php                  |  4 ++--
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index ec91a49..207d2b6 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -144,7 +144,7 @@ define('LOGINS', [
 define('AUTHS', [
   'DEBUG' => getenv('auth.debug') == 'true' ? true : false,
   'ADAPTERS' => getenv('auth.adapters') ? implode(",", getenv('auth.adapters')) : ['Local', 'Google'],
-  'GOOGLE' => [
+  'Google' => [
     'ICON' => '<img src="/images/auth/google_login_button.png"/>',
     'CLIENT_ID' => getenv("auth.google.client.id"),
     'CLIENT_KEY' => getenv("auth.google.client.key"),
diff --git a/app/Controllers/Common/AuthController.php b/app/Controllers/Common/AuthController.php
index 9ac4615..92236e9 100644
--- a/app/Controllers/Common/AuthController.php
+++ b/app/Controllers/Common/AuthController.php
@@ -26,17 +26,18 @@ class AuthController extends BaseController
 
     private function initAdapters()
     {
-        foreach (AUTHS['ADAPTERS'] as $adapter) {
-            $this->getAdapter($adapter);
+        foreach (AUTHS['ADAPTERS'] as $site) {
+            $this->getAdapter($site);
         }
     }
-    private function getAdapter(string $adapter): Adapter
+    private function getAdapter(string $site): Adapter
     {
-        if (!array_key_exists($adapter, $this->_adapters)) {
-            $adapterClass = sprintf("\App\Libraries\Adapter\Auth\%sAdapter", $adapter);
-            $this->_adapters[$adapter] = new $adapterClass($adapter, AUTHS['DEBUG']);
+        $site = ucfirst($site);
+        if (!array_key_exists($site, $this->_adapters)) {
+            $adapterClass = sprintf("\App\Libraries\Adapter\Auth\%sAdapter", $site);
+            $this->_adapters[$site] = new $adapterClass($site, AUTHS['DEBUG']);
         }
-        return $this->_adapters[$adapter];
+        return $this->_adapters[$site];
     }
 
     public function login()
diff --git a/app/Libraries/Adapter/Auth/Adapter.php b/app/Libraries/Adapter/Auth/Adapter.php
index b4fff47..f537796 100644
--- a/app/Libraries/Adapter/Auth/Adapter.php
+++ b/app/Libraries/Adapter/Auth/Adapter.php
@@ -23,7 +23,7 @@ abstract class Adapter
 		if (is_null($this->_site)) {
 			throw new \Exception("Auth Adpater Site명이 정의 되지 않았습니다.");
 		}
-		return strtoupper($this->_site);
+		return ucfirst($this->_site);
 	}
 	abstract public function getAuthButton();
 	abstract public function signin(array $formDatas): UserEntity;
diff --git a/app/Libraries/Adapter/Auth/GoogleAdapter.php b/app/Libraries/Adapter/Auth/GoogleAdapter.php
index 19f65c9..31ad775 100644
--- a/app/Libraries/Adapter/Auth/GoogleAdapter.php
+++ b/app/Libraries/Adapter/Auth/GoogleAdapter.php
@@ -103,7 +103,7 @@ class GoogleAdapter extends Adapter
 				array("site" => $this->getSiteName(), "uid" => $result['id'])
 			)->first();
 			if (is_null($snsEntity)) {
-				$snsEntity = $this->getUserSNSModel()->create($result);
+				$snsEntity = $this->getUserSNSModel()->create($this->getSiteName(), $result);
 			}
 			if (is_null($snsEntity->getUserUID())) {
 				throw new \Exception($this->getSiteName() . "의{$result['email']}:{$result['name']}님은 아직 사용자 지정이 되지 않았습니다.");
diff --git a/app/Models/UserSNSModel.php b/app/Models/UserSNSModel.php
index b39b416..b84f81c 100644
--- a/app/Models/UserSNSModel.php
+++ b/app/Models/UserSNSModel.php
@@ -31,10 +31,10 @@ class UserSNSModel extends CommonModel
     {
         return $this->getEntityByField($this->primaryKey, $uid);
     }
-    public function create(array $datas): UserSNSEntity
+    public function create(string $site, array $datas): UserSNSEntity
     {
         $entity = new UserSNSEntity();
-        $entity->site = $this->getSiteName();
+        $entity->site = $site;
         $entity->id = $datas['id'];
         $entity->name = $datas['name'];
         $entity->email = $datas['email'];