From e19d7c7508f292f7103979f73fcdb15b3b73ff3b Mon Sep 17 00:00:00 2001 From: hskwon Date: Thu, 17 Jul 2025 17:39:28 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=20swegger=20=EC=A0=95=EC=83=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/ApiController.php | 5 ++--- app/Http/Middleware/ApiKeyMiddleware.php | 4 ++-- app/Http/Middleware/CheckSwaggerAuth.php | 6 +++--- resources/views/layouts/left.blade.php | 6 +++--- routes/api.php | 9 --------- storage/api-docs/api-docs.json | 14 +++++++------- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php index e3ba61d..5feec06 100644 --- a/app/Http/Controllers/Api/ApiController.php +++ b/app/Http/Controllers/Api/ApiController.php @@ -7,7 +7,6 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; use App\Http\Controllers\Controller; -use App\Models\User; /** @@ -132,10 +131,10 @@ public function logout(Request $request) $token = $request->header('X-API-KEY'); // 또는 Authorization 헤더 // 회원 테이블에서 해당 토큰으로 유저 찾기 - $user = User::where('remember_token', $token)->first(); + $user = Member::where('remember_token', $token)->first(); if ($user) { - $user->USER_TOKEN = null; + $user->remember_token = null; $user->save(); } diff --git a/app/Http/Middleware/ApiKeyMiddleware.php b/app/Http/Middleware/ApiKeyMiddleware.php index d53730d..11e2483 100644 --- a/app/Http/Middleware/ApiKeyMiddleware.php +++ b/app/Http/Middleware/ApiKeyMiddleware.php @@ -5,7 +5,7 @@ use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; -use App\Models\User; +use App\Models\Member; class ApiKeyMiddleware { @@ -24,7 +24,7 @@ public function handle(Request $request, Closure $next) // 2. 회원 인증 (remember_token으로) if (!$validApiKey) { - $user = User::where('remember_token', $apiKey)->first(); + $user = Member::where('remember_token', $apiKey)->first(); if ($user) { $validApiKey = true; diff --git a/app/Http/Middleware/CheckSwaggerAuth.php b/app/Http/Middleware/CheckSwaggerAuth.php index 686a8a1..3dfcd2b 100644 --- a/app/Http/Middleware/CheckSwaggerAuth.php +++ b/app/Http/Middleware/CheckSwaggerAuth.php @@ -11,7 +11,7 @@ class CheckSwaggerAuth { public function handle(Request $request, Closure $next) { - $token = Session::get('USER_TOKEN'); + $token = Session::get('user_token'); if (!$token) { // 원래 URL 저장 후 로그인 페이지로 이동 @@ -22,8 +22,8 @@ public function handle(Request $request, Closure $next) $user = Member::where('remember_token', $token)->first(); if (!$user) { - Session::forget('USER_TOKEN'); - Session::forget('USER_ID'); + Session::forget('user_token'); + Session::forget('user_id'); Session::put('redirect_to', $request->fullUrl()); return redirect()->route('login'); diff --git a/resources/views/layouts/left.blade.php b/resources/views/layouts/left.blade.php index a088d56..42a8e8d 100644 --- a/resources/views/layouts/left.blade.php +++ b/resources/views/layouts/left.blade.php @@ -1,4 +1,4 @@ - -

VentureRND : {{strtoupper(env('app.name', 'DEV'))}}

+

KD-SAM : {{strtoupper(env('app.name', 'DEV'))}}

 @@ -22,7 +22,7 @@
diff --git a/routes/api.php b/routes/api.php index 4b5769d..04411ce 100644 --- a/routes/api.php +++ b/routes/api.php @@ -2,20 +2,11 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; -use Illuminate\Support\Facades\Auth; use App\Http\Controllers\Api\CommonController; use App\Http\Controllers\Api\ApiController; use App\Http\Controllers\Api\MemberController; -use App\Http\Controllers\Api\BoardController; use App\Http\Controllers\Api\AdminApiController; -use App\Http\Controllers\Api\CompanyController; -use App\Http\Controllers\Api\PlanController; -use App\Http\Controllers\Api\MeetingController; -use App\Http\Controllers\Api\WorkReportController; -use App\Http\Controllers\Api\WorkListController; -use App\Http\Controllers\Api\ScheduleController; use App\Http\Controllers\Api\FileController; -use App\Http\Controllers\Api\InsuranceContractController; # 회원관련 diff --git a/storage/api-docs/api-docs.json b/storage/api-docs/api-docs.json index bf220a8..07b99b1 100644 --- a/storage/api-docs/api-docs.json +++ b/storage/api-docs/api-docs.json @@ -50,17 +50,17 @@ "application/json": { "schema": { "required": [ - "USER_ID", - "USER_PWD" + "user_id", + "user_pwd" ], "properties": { - "USER_ID": { + "user_id": { "type": "string", - "example": "admin" + "example": "test" }, - "USER_PWD": { + "user_pwd": { "type": "string", - "example": "1234" + "example": "testpass" } }, "type": "object" @@ -78,7 +78,7 @@ "message": { "type": "string" }, - "USER_TOKEN": { + "user_token": { "type": "string" } },