francis94c / ci-rest

libraries/REST.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     if ($uri_auths != null || is_array($uri_auths)) {
       foreach ($uri_auths as $uri => $auth_array) {
         // Convert wildcards to RegEx.
-  			$uri = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $uri);
+     $uri = str_replace(array(':any', ':num'), array('[^/]+', '[0-9]+'), $uri);
         if (preg_match('#^'.$uri.'$#', uri_string())) {
           // Assign Authentication Steps.
           if (is_array($auth_array)) {

Spacing +7 added lines, -7 removed lines

@@ -111,9 +111,9 @@ 
    * @param array|null $params Initialization parameters from the Slint system.
    *                           There's no use for this arg yet.
    */
-  function __construct(?array $params=null)
+  function __construct(?array $params = null)
   {
-    $this->ci =& get_instance();
+    $this->ci = & get_instance();
 
     if ($this->ci->input->is_cli_request()) return;
 
@@ -131,7 +131,7 @@ 
 
     // Load Model.
     $this->ci->load->splint(self::PACKAGE, '*RESTModel', 'rest_model');
-    $this->rest_model =& $this->ci->rest_model;
+    $this->rest_model = & $this->ci->rest_model;
 
     $config = [
       'users_table'           => $this->ci->config->item('rest')['basic_auth']['users_table'] ?? null,
@@ -257,7 +257,7 @@ 
   /**
    * [bearer_auth description]
    */
-  private function bearer_auth($auth=RESTAuth::BEARER):void {
+  private function bearer_auth($auth = RESTAuth::BEARER):void {
     $authorization = $this->get_authorization_header();
     if ($authorization == null || substr_count($authorization, " ") != 1) {
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth); // Exits.
@@ -317,7 +317,7 @@ 
       }
       // Should we acyually Limit?
       if ($this->per_hour > 0) {
-        $client = hash('md5', $this->ci->input->ip_address() . "%" . $apiKey[$this->api_key_column]);
+        $client = hash('md5', $this->ci->input->ip_address()."%".$apiKey[$this->api_key_column]);
         $limitData = $this->rest_model->getLimitData($client, '_api_keyed_user');
         if ($limitData == null) {
           $limitData = [];
@@ -401,7 +401,7 @@ 
    * [get_authorization_header description]
    * @return [type] [description]
    */
-  private function get_authorization_header():?string
+  private function get_authorization_header(): ?string
   {
     if (isset($_SERVER['Authorization'])) {
       return trim($_SERVER["Authorization"]);
@@ -424,7 +424,7 @@ 
    * [handle_response description]
    * @param int $code [description]
    */
-  private function handle_response(int $code, $auth=null):void
+  private function handle_response(int $code, $auth = null):void
   {
     http_response_code($code);
     header("Content-Type: application/json");

Braces +27 added lines, -8 removed lines

@@ -115,7 +115,9 @@ 
   {
     $this->ci =& get_instance();
 
-    if ($this->ci->input->is_cli_request()) return;
+    if ($this->ci->input->is_cli_request()) {
+     return;
+    }
 
     // Load Config If Exists.
     $this->ci->config->load('rest', true, true);
@@ -217,7 +219,10 @@ 
     }
 
     //$auths = $this->ci->config->item('rest')['uri_auth'][uri_string()] ?? null;
-    if ($auths == null) return; // No authentication(s) to carry out.
+    if ($auths == null) {
+     return;
+    }
+    // No authentication(s) to carry out.
 
     // $this->process_auth() terminates the script if authentication fails
     // It will call the callable in the rest.php config file under
@@ -229,7 +234,9 @@ 
       //return;
     //}
 
-    foreach ($auths as $auth) $this->process_auth($auth);
+    foreach ($auths as $auth) {
+     $this->process_auth($auth);
+    }
   }
   /**
    * [process_auth description]
@@ -283,15 +290,23 @@ 
   private function basic_auth():void {
     $username = $_SERVER['PHP_AUTH_USER'] ?? null;
     $password = $_SERVER['PHP_AUTH_PW'] ?? null;
-    if (!$username || !$password) $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC); // Exits.
-    if (!$this->rest_model->basicAuth($this, $username, $password)) $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC); // Exits.
+    if (!$username || !$password) {
+     $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC);
+    }
+    // Exits.
+    if (!$this->rest_model->basicAuth($this, $username, $password)) {
+     $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC);
+    }
+    // Exits.
   }
   /**
    * [api_key_auth description]
    */
   private function api_key_auth():void
   {
-    if (uri_string() == '')  return;
+    if (uri_string() == '') {
+     return;
+    }
 
     if (!$this->ci->input->get_request_header($this->apiKeyHeader, true)) {
     // if (!isset($_SERVER['HTTP_' . str_replace("-", "_", $this->apiKeyHeader)])) {
@@ -351,7 +366,9 @@ 
     // Trunctate Rate Limit Data.
     $this->rest_model->truncateRatelimitData();
     // Check Whitelist.
-    if (in_array($this->ci->input->ip_address(), $this->whitelist)) return;
+    if (in_array($this->ci->input->ip_address(), $this->whitelist)) {
+     return;
+    }
     // Should we acyually Limit?
     if ($this->ip_per_hour > 0) {
       $client = hash('md5', $this->ci->input->ip_address());
@@ -431,7 +448,9 @@ 
     if (isset($this->ci->config->item('rest')['response_callbacks'][$code])) {
       $this->ci->config->item('rest')['response_callbacks'][$code]($auth);
     }
-    if (ENVIRONMENT != 'testing') exit($code);
+    if (ENVIRONMENT != 'testing') {
+     exit($code);
+    }
     throw new Exception("Error $code in $auth", $code);
   }
 }