From 0bd684e8fe2475c313ea4b67b6e516c7f4d98a55 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: Mon, 9 Sep 2024 13:51:33 +0900
Subject: [PATCH] Automation init...2

---
 app/Controllers/BaseController.php   |  2 +-
 app/Controllers/CommonController.php | 15 +++++++++++----
 app/Traits/AuthTrait.php             |  5 ++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 8b435da..76e2ec8 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -41,7 +41,7 @@ abstract class BaseController extends Controller
      * Be sure to declare properties for any property fetch you initialized.
      * The creation of dynamic property is deprecated in PHP 8.2.
      */
-    // protected $session;
+    protected $session;
 
     /**
      * @return void
diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
index a6dd281..0d6bb37 100644
--- a/app/Controllers/CommonController.php
+++ b/app/Controllers/CommonController.php
@@ -3,16 +3,23 @@
 namespace App\Controllers;
 
 use App\Controllers\BaseController;
-use App\Trait\AuthTrait;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
+use App\Traits\AuthTrait;
 
 abstract class CommonController extends BaseController
 {
     use AuthTrait;
     private $_datas = [];
-
-    protected function __construct()
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
-        $this->_datas['session'] = $this->login_check();
+        // Do Not Edit This Line
+        parent::initController($request, $response, $logger);
+        // Preload any models, libraries, etc, here.
+        // E.g.: $this->session = \Config\Services::session();
+        $this->session = $this->login_check();
     }
 
     final public function __get($name): array|null
diff --git a/app/Traits/AuthTrait.php b/app/Traits/AuthTrait.php
index 3faed92..dbad88f 100644
--- a/app/Traits/AuthTrait.php
+++ b/app/Traits/AuthTrait.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace App\Trait;
+namespace App\Traits;
 
 trait AuthTrait
 {
     public function login_check(): array
     {
         //사용자 기본 Role 지정
-        $session = [];
         $session[SESSION['NAMES']['ISLOGIN']] = false;
         $session['currentRoles'] = [DEFAULTS["ROLE"]];
-        if ($this->_session->get(SESSION['NAMES']['ISLOGIN'])) {
+        if (\Config\Services::session()->get(SESSION['NAMES']['ISLOGIN'])) {
             $session[SESSION['NAMES']['ISLOGIN']] = true;
             $session['auth'] = $this->_session->get(SESSION['NAMES']['AUTH']);
             $currentRoles = explode(DEFAULTS['DELIMITER_ROLE'], $session['auth'][AUTH['FIELDS']['ROLE']]);