Merge pull request #6 from vc-bharat/main

Code refactoring for removed the unnecessary if conditions
vcian · Jun 19, 2023 · dd49252 · dd49252
2 parents e8db8b9 + f093e9f
commit dd49252
Showing 1 changed file with 18 additions and 22 deletions.
diff --git a/src/Middleware/IpGatewayMiddleware.php b/src/Middleware/IpGatewayMiddleware.php
@@ -27,38 +27,34 @@ class IpGatewayMiddleware
      */
     public function handle($request, Closure $next)
     {
-        $prohibitRequest = false;
-        if (config('ip-gateway')
-            && config('ip-gateway.enable_package') === true
-        ) {
-            if (config('ip-gateway.enable_blacklist') === true) { // Its check blacklisted ip-addresses from ip-config file.
-                foreach ($request->getClientIps() as $ip) {
-                    if ($this->grantIpAddress($ip)) {
+        try {
+            $prohibitRequest = false;
+            $getClientIps = $request->getClientIps();
+            $enableBlacklist = config('ip-gateway.enable_blacklist') === true;
+            $redirectRoute = config('ip-gateway.redirect_route_to');
+
+            if (config('ip-gateway') && config('ip-gateway.enable_package') === true) {
+                foreach ($getClientIps as $ip) {
+                    if ($enableBlacklist && $this->grantIpAddress($ip)) { // Its check blacklisted ip-addresses from ip-config file.
                         $prohibitRequest = true;
                         Log::warning($ip . ' IP address has tried to access.');
-                    }
-                }
-            }
-
-            if (config('ip-gateway.enable_blacklist') === false) { // Its check whitelisted ip-addresses from ip-config file.
-                foreach ($request->getClientIps() as $ip) {
-                    if (!$this->grantIpAddress($ip)) {
+                    } elseif (!$enableBlacklist && !$this->grantIpAddress($ip)) { // Its check whitelisted ip-addresses from ip-config file.
                         $prohibitRequest = true;
                         Log::warning($ip . ' IP address has tried to access.');
                     }
                 }
             }
-        }
 
-        if ($prohibitRequest === false) {
-            return $next($request);
-        } else {
-            if (config('ip-gateway.redirect_route_to') != '') {
-                return redirect(config('ip-gateway.redirect_route_to'));
-            } else {
-                return redirect('/404');
+            if ($prohibitRequest) {
+                return redirect($redirectRoute != '' ? $redirectRoute : '/404');
             }
+
+            return $next($request);
+
+        } catch (\Exception $ex) {
+            Log::error('Problem occurred while handle an incoming request '.$ex->getMessage());
         }
+
     }
 
     /**