Refactor IP History

app/Http/Kernel.php

@@ -4,6 +4,7 @@ namespace App\Http;
 
 use App\Http\Middleware\Filament;
 use App\Http\Middleware\Locale;
+use App\Http\Middleware\LogUserIp;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -24,7 +25,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
 //        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\BootNexus::class,
-        Locale::class,
+        LogUserIp::class,
     ];
 
     /**
@@ -46,7 +47,6 @@ class Kernel extends HttpKernel
         'api' => [
             'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-//            \App\Http\Middleware\Platform::class,
         ],
         'filament' => [
             \Illuminate\Session\Middleware\StartSession::class,
@@ -73,8 +73,6 @@ class Kernel extends HttpKernel
         'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequestsWithRedis::class,
         'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
-        'permission' => \App\Http\Middleware\Permission::class,
-        'admin' => \App\Http\Middleware\Admin::class,
         'locale' => \App\Http\Middleware\Locale::class,
         'checkUserStatus' => \App\Http\Middleware\CheckUserStatus::class,
     ];

app/Http/Middleware/Admin.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Models\User;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Validation\UnauthorizedException;
-
-class Admin
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        /** @var CheckUserStatus $user */
-        $user = $request->user();
-        if (!$user || !$user->canAccessAdmin()) {
-            do_log("denied!");
-            throw new UnauthorizedException('Unauthorized!');
-        }
-        do_log("allow!");
-        return $next($request);
-    }
-}

app/Http/Middleware/BootNexus.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Repositories\IpLogRepository;
 use Closure;
 use Illuminate\Http\Request;
 use Nexus\Nexus;

app/Http/Middleware/LogUserIp.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Repositories\IpLogRepository;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class LogUserIp
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        $response = $next($request);
+        $user = $request->user();
+        if ($user) {
+            IpLogRepository::saveToCache($user->id);
+        }
+        return $response;
+    }
+}

app/Http/Middleware/Permission.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Models\User;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Validation\UnauthorizedException;
-
-class Permission
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        /** @var CheckUserStatus $user */
-        $user = $request->user();
-        if (!$user || (nexus()->isPlatformAdmin() && !$user->canAccessAdmin())) {
-            do_log("denied!");
-            throw new UnauthorizedException('Unauthorized!');
-        }
-        do_log("allow!");
-        return $next($request);
-    }
-}

app/Http/Middleware/Platform.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Validation\UnauthorizedException;
-
-class Platform
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $platform = nexus()->getPlatform();
-        if (empty($platform)) {
-            throw new \InvalidArgumentException("Require platform header.");
-        }
-        if (!nexus()->isPlatformValid()) {
-            throw new \InvalidArgumentException("Invalid platform: " . $platform);
-        }
-        return $next($request);
-    }
-}