From c3858bafd4f38b709872e4e40152e9e8b38a808d 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 11:22:23 +0900
Subject: [PATCH] Automation init...2

---
 app/Controllers/Admin/AdminController.php     | 36 -------------------
 app/Controllers/Admin/Home.php                | 11 ------
 app/Controllers/CommonController.php          | 25 +++++++++++++
 .../Mangboard/Admin/UserController.php        |  7 ++--
 app/Traits/AuthTrait.php                      | 21 +++++++++++
 5 files changed, 51 insertions(+), 49 deletions(-)
 delete mode 100644 app/Controllers/Admin/AdminController.php
 delete mode 100644 app/Controllers/Admin/Home.php
 create mode 100644 app/Controllers/CommonController.php
 create mode 100644 app/Traits/AuthTrait.php

diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php
deleted file mode 100644
index 1d4aed6..0000000
--- a/app/Controllers/Admin/AdminController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Controllers\Admin;
-
-use App\Controllers\BaseController;
-
-abstract class AdminController extends BaseController
-{
-    private $_datas = [];
-
-    protected function __construct()
-    {
-        //사용자 기본 Role 지정
-        $this->_datas[SESSION['NAMES']['ISLOGIN']] = false;
-        $this->_datas['currentRoles'] = [DEFAULTS["ROLE"]];
-        if ($this->_session->get(SESSION['NAMES']['ISLOGIN'])) {
-            $this->_datas[SESSION['NAMES']['ISLOGIN']] = true;
-            $this->_datas['auth'] = $this->_session->get(SESSION['NAMES']['AUTH']);
-            $currentRoles = explode(DEFAULTS['DELIMITER_ROLE'], $this->_datas['auth'][AUTH['FIELDS']['ROLE']]);
-            $this->_datas['currentRoles'] = is_array($currentRoles) ? $currentRoles : [DEFAULTS["ROLE"]];
-        }
-    }
-
-    final public function __get($name): array|null
-    {
-        if (!array_key_exists($name, $this->_datas)) {
-            return null;
-        }
-        return $this->_datas;
-    }
-
-    final public function __set($name, $value): void
-    {
-        $this->_datas[$name] = $value;
-    }
-}
diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php
deleted file mode 100644
index 9f5471d..0000000
--- a/app/Controllers/Admin/Home.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Controllers\Admin;
-
-class Home extends AdminController
-{
-    public function index(): string
-    {
-        return view('welcome_message');
-    }
-}
diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
new file mode 100644
index 0000000..ae68c49
--- /dev/null
+++ b/app/Controllers/CommonController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Controllers\BaseController;
+
+abstract class CommonController extends BaseController
+{
+    private $_datas = [];
+
+    protected function __construct() {}
+
+    final public function __get($name): array|null
+    {
+        if (!array_key_exists($name, $this->_datas)) {
+            return null;
+        }
+        return $this->_datas;
+    }
+
+    final public function __set($name, $value): void
+    {
+        $this->_datas[$name] = $value;
+    }
+}
diff --git a/app/Controllers/Mangboard/Admin/UserController.php b/app/Controllers/Mangboard/Admin/UserController.php
index b1cbf4f..e82b487 100644
--- a/app/Controllers/Mangboard/Admin/UserController.php
+++ b/app/Controllers/Mangboard/Admin/UserController.php
@@ -2,13 +2,16 @@
 
 namespace App\Controllers\Mangboard\Admin;
 
-use App\Controllers\Admin\AdminController;
+use App\Controllers\CommonController;
 use App\Models\Mangboard\UserModel;
+use App\Trait\AuthTrait;
 
-class UserController extends AdminController
+class UserController extends CommonController
 {
+    use AuthTrait;
     public function __construct()
     {
+        $this->_datas['session'] = $this->login_check();
         parent::__construct();
     }
 
diff --git a/app/Traits/AuthTrait.php b/app/Traits/AuthTrait.php
new file mode 100644
index 0000000..3faed92
--- /dev/null
+++ b/app/Traits/AuthTrait.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Trait;
+
+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'])) {
+            $session[SESSION['NAMES']['ISLOGIN']] = true;
+            $session['auth'] = $this->_session->get(SESSION['NAMES']['AUTH']);
+            $currentRoles = explode(DEFAULTS['DELIMITER_ROLE'], $session['auth'][AUTH['FIELDS']['ROLE']]);
+            $session['currentRoles'] = is_array($currentRoles) ? $currentRoles : [DEFAULTS["ROLE"]];
+        }
+        return $session;
+    }
+}