added option for originating client ip, minor refactoring

Author: Soban Mahmod

src/iphandler/DefaultIPHandler.php renamed to src/iphandler/DefaultIPSelector.php

@@ -3,13 +3,13 @@
 namespace ipinfo\ipinfolaravel\iphandler;
 
 /**
- * Default implementation of the IPHandlerInterface. Selects default ip from request.
+ * Implementation of the IPHandlerInterface used as default option. Retrieve IP from request.
  */
-class DefaultIPHandler implements IPHandlerInterface
+class DefaultIPSelector implements IPHandlerInterface
 {
 
     /**
-     * Selectes default IP address from request.
+     * Selects default IP address from request.
      * @param \Illuminate\Http\Request $request
      * @return string IP address.
      */

src/iphandler/IPHandlerInterface.php

@@ -3,11 +3,11 @@
 namespace ipinfo\ipinfolaravel\iphandler;
 
 /**
- * Interface for handling the mechanism for IP retrieval.
+ * Interface for handling the mechanism of IP retrieval.
  */
 interface IPHandlerInterface
 {
-    
+
     /**
      * Get IP address.
      * @param \Illuminate\Http\Request $request

src/iphandler/OriginatingIPSelector.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace ipinfo\ipinfolaravel\iphandler;
+
+/**
+ * Selects originating client IP from the request.
+ */
+class OriginatingIPSelector implements IPHandlerInterface
+{
+
+    /**
+     * Selects originating client IP from request.
+     * @param \Illuminate\Http\Request $request
+     * @return string IP address.
+     */
+    public function getIP($request)
+    {
+        $xForwardedFor = $request->headers->get('x-forwarded-for');
+        if (empty($xForwardedFor)) {
+            $ip = $request->ip();
+        } else {
+            $ips = explode(',', $xForwardedFor);
+            // trim as officially the space comes after each comma separator
+            $ip = trim($ips[0]);
+        }
+        return $ip;
+    }
+}

src/ipinfolaravel.php

@@ -5,7 +5,7 @@
 use Closure;
 use ipinfo\ipinfo\IPinfo as IPinfoClient;
 use ipinfo\ipinfolaravel\DefaultCache;
-use ipinfo\ipinfolaravel\iphandler\DefaultIPHandler;
+use ipinfo\ipinfolaravel\iphandler\DefaultIPSelector;
 
 class ipinfolaravel
 {
@@ -77,7 +77,7 @@ public function configure()
         $this->access_token = config('services.ipinfo.access_token', null);
         $this->filter = config('services.ipinfo.filter', [$this, 'defaultFilter']);
         $this->no_except = config('services.ipinfo.no_except', false);
-        $this->ip_selector =  config('services.ipinfo.ip_selector', new DefaultIPHandler());
+        $this->ip_selector =  config('services.ipinfo.ip_selector', new DefaultIPSelector());
 
         if ($custom_countries = config('services.ipinfo.countries_file', null)) {
             $this->settings['countries_file'] = $custom_countries;