From e103de99df6cadf07dccfffac17269c151959f9c Mon Sep 17 00:00:00 2001
From: ilhamwara <ilhamwara@gmail.com>
Date: Thu, 3 Jul 2025 10:13:53 +0700
Subject: [PATCH] update

---
 .../Controllers/Management/UserController.php | 25 +++++++++----------
 routes/modules/modules.php                    |  2 +-
 routes/web.php                                |  7 ------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php
index cdecf10..10229cb 100644
--- a/app/Http/Controllers/Management/UserController.php
+++ b/app/Http/Controllers/Management/UserController.php
@@ -210,15 +210,14 @@ class UserController extends Controller
             return response()->json(['success' => false,'message' => 'Data Tidak Temukan','type' => 'error']);
         }
 
-        $keyId = decode_id($id);
-        $user = User::find($keyId);
+        $id = decode_id($id);
+        $user = User::find($id);
         if (!$user) {
             return response()->json(['success' => false,'message' => 'Data Tidak Temukan','type' => 'error']);
         } else {
 
-            // if ($user->username && $user->password) {
-                // Auth::logout();
-                if (Auth::loginUsingId($keyId)) {
+            if ($user->username && $user->password) {
+                if (Auth::loginUsingId($id)) {
                     $session = [
                         'username'                  => $user->username,
                         'name'                      => $user->name,
@@ -236,18 +235,18 @@ class UserController extends Controller
                         'group_name'                => @$user->group->name,
                     ];
                     // $this->repository->updateById($user->user_id,['last_login' => Carbon::now(), 'is_online' => session_id()]);
-                    // session($session);
-                    session()->put($session);
-                    session()->save();
+                    session($session);
                     // logActivity($request, __('strings.backend.logs.login_success',['name' => $user->username]));
 
-                    return response()->json(['status' => true,'message' => 'Selamat datang kembali','type' => 'success','data' => session()->only(array_keys($session))]);
-                }else{
+                    return response()->json(['status' => true,'message' => 'Selamat datang kembali','type' => 'success']);
+                }
+                else {
+
                     return response()->json(['status' => false,'message' => 'Maaf Terjadi Kesalahan','type' => 'error']);
                 }
-            // } else {
-            //     return response()->json(['status' => false,'message' => 'Maaf Terjadi Kesalahan','type' => 'error']);
-            // }
+            } else {
+                return response()->json(['status' => false,'message' => 'Maaf Terjadi Kesalahan','type' => 'error']);
+            }
         }
     }
 }
diff --git a/routes/modules/modules.php b/routes/modules/modules.php
index abacd5e..a35f659 100644
--- a/routes/modules/modules.php
+++ b/routes/modules/modules.php
@@ -137,7 +137,7 @@ Route::name('management.')->prefix('management')->group(function () {
         Route::get('grid',[UserController::class,'grid'])->name('grid');
         Route::get('update/{id?}',[UserController::class,'update'])->name('update');
         Route::get('delete/{id?}',[UserController::class,'delete'])->name('delete');
-        // Route::get('forcelogin/{id?}',[UserController::class,'forcelogin'])->name('forcelogin');
+        Route::get('forcelogin/{id?}',[UserController::class,'forcelogin'])->name('forcelogin');
     });
 
     Route::name('user_sekolah.')->prefix('user_sekolah')->group(function () {
diff --git a/routes/web.php b/routes/web.php
index 3d7daa6..01d9baf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,7 +6,6 @@ use App\Http\Controllers\Auth\CustomLoginController;
 use App\Http\Controllers\Auth\CustomRegisterController;
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\AjaxController;
-use App\Http\Controllers\Management\UserController;
 
 /*
 |--------------------------------------------------------------------------
@@ -30,12 +29,6 @@ Route::get('sekolahNpsn',[AjaxController::class,'sekolahNpsn'])->name('sekolahNp
 Route::get('hash/{hash}', function ($hash) {
     return Hash::make($hash);
 });
-
-Route::name('management.')->prefix('management')->group(function () {
-    Route::name('user.')->prefix('user')->group(function () {
-        Route::get('forcelogin/{id?}',[UserController::class,'forcelogin'])->name('forcelogin');
-    });
-});
 Route::middleware(Session::class)->name('modules.')->group(function () {
 
     include_route_files(__DIR__ . '/modules');