diff --git a/app/Controllers/Auth/AuthController.php b/app/Controllers/Auth/AuthController.php index 1709b35..dd01a14 100644 --- a/app/Controllers/Auth/AuthController.php +++ b/app/Controllers/Auth/AuthController.php @@ -85,7 +85,8 @@ abstract class AuthController extends CommonController $this->init(__FUNCTION__); helper(['form']); //구글 로그인 BUTTON용 - $this->google_url = $this->getSocket()->createAuthUrl(); + // $this->google_url = $this->getSocket()->createAuthUrl(); + $this->google_url = ""; $this->forms = ['attributes' => ['method' => "post",], 'hiddens' => []]; return $this->getResultPageByActon($this->action); } catch (\Exception $e) { diff --git a/app/Services/Auth/GoogleService.php b/app/Services/Auth/GoogleService.php index c0567d2..dbbf153 100644 --- a/app/Services/Auth/GoogleService.php +++ b/app/Services/Auth/GoogleService.php @@ -43,8 +43,7 @@ class GoogleService extends AuthService $this->_mySocket->setToken($access_code); $sns_entity = $this->_mySocket->signup(); // local db 사용와의 연결 확인 - $this->getModel()->where($this->getModel()::PK, $sns_entity->getParent()); - $entity = $this->getEntity(); + $entity = $this->getEntity($sns_entity->getParent()); if (!$entity) { throw new PageNotFoundException("회원[{$sns_entity->getTitle()}]님은 아직 로컬사용자 연결이 이루어지지 않았습니다."); } diff --git a/app/Services/Auth/LocalService.php b/app/Services/Auth/LocalService.php index a91f3cf..852dde1 100644 --- a/app/Services/Auth/LocalService.php +++ b/app/Services/Auth/LocalService.php @@ -31,8 +31,7 @@ class LocalService extends AuthService public function checkUser(array $formDatas): Entity { - $this->getModel()->where("id", $formDatas['id']); - $entity = $this->getEntity(); + $entity = $this->getEntity(['id' => $formDatas['id']]); if (is_null($entity) || !isset($entity->passwd)) { throw new \Exception("사용자ID: {$formDatas['id']}가 존재하지 않습니다."); }