francis94c / ci-rest

phpunit/BasicAuthTest.php

Spacing +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@ 
    * @covers JWT::__construct
    */
   public static function setUpBeforeClass(): void {
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
     self::$ci->load->database('mysqli://root@localhost/test_db');
     self::$ci->load->helper("url");
-    $queries = explode("#@@@", file_get_contents(FCPATH . 'application/splints/' . self::PACKAGE . '/phpunit/database.sql'));
+    $queries = explode("#@@@", file_get_contents(FCPATH.'application/splints/'.self::PACKAGE.'/phpunit/database.sql'));
     self::assertTrue(count($queries) > 0);
     self::$ci->load->database();
     foreach ($queries as $query) {
@@ -41,7 +41,7 @@ 
     // However, for the purpose of this test, we are going to Hack Code CodeIgniter
     // with a Splint Config variable to allow us load config files from where
     // ever we want. This happens below.
-    self::$ci->load->add_package_path(APPPATH . 'splints/' . self::PACKAGE . "/phpunit/");
+    self::$ci->load->add_package_path(APPPATH.'splints/'.self::PACKAGE."/phpunit/");
     //self::$ci->config->set_item('st_config_path_prefix', '../splints/' . self::PACKAGE . "/phpunit/config/");
   }
   /**
@@ -58,7 +58,7 @@ 
     $_SERVER['PHP_AUTH_PW'] = "012345678901234567890";
     self::$ci->config->set_item('expected_uri', 'basic/auth');
     self::$ci->config->set_item('expected_auth', RESTAuth::BASIC);
-    $this->expectExceptionMessage('Error ' . RESTResponse::UN_AUTHORIZED . ' in ' . RESTAuth::BASIC);
+    $this->expectExceptionMessage('Error '.RESTResponse::UN_AUTHORIZED.' in '.RESTAuth::BASIC);
     self::$ci->load->splint(self::PACKAGE, '+REST', null, 'basic_rest_2');
   }
   /**

phpunit/APIKeyAuthAuthTest.php

Spacing +2 added lines, -2 removed lines

@@ -22,10 +22,10 @@
    * @covers JWT::__construct
    */
   public static function setUpBeforeClass(): void {
-    self::$ci =& get_instance();
+    self::$ci = & get_instance();
     self::$ci->load->database('mysqli://root@localhost/test_db');
     self::$ci->load->helper("url");
-    $queries = explode("#@@@", file_get_contents(FCPATH . 'application/splints/' . self::PACKAGE . '/phpunit/database.sql'));
+    $queries = explode("#@@@", file_get_contents(FCPATH.'application/splints/'.self::PACKAGE.'/phpunit/database.sql'));
     self::assertTrue(count($queries) > 0);
     self::$ci->load->database();
     foreach ($queries as $query) {

phpunit/config/rest.php

Spacing +6 added lines, -6 removed lines

@@ -11,19 +11,19 @@ 
 
 $config['auth_callbacks'] = [
 
-  RESTAuth::CUSTOM('X-APP-ID')    => function (&$context, $value):bool {
+  RESTAuth::CUSTOM('X-APP-ID')    => function(&$context, $value):bool {
     return true;
   },
 
-  RESTAuth::CUSTOM('X-DEVICE-ID') => function (&$context, $value):bool {
+  RESTAuth::CUSTOM('X-DEVICE-ID') => function(&$context, $value):bool {
     return true;
   },
 
-  RESTAuth::BEARER                => function (&$context, $token):bool {
+  RESTAuth::BEARER                => function(&$context, $token):bool {
     return true;
   },
 
-  RESTAuth::OAUTH2                => function (&$context, $token):bool {
+  RESTAuth::OAUTH2                => function(&$context, $token):bool {
     return true;
   }
 
@@ -38,8 +38,8 @@ 
   },
 
   RESTResponse::UN_AUTHORIZED      => function(&$auth):void {
-    $ci =& get_instance();
-    Assert::assertTrue(uri_string() == $ci->config->item('expected_uri')&& $auth == $ci->config->item('expected_auth'));
+    $ci = & get_instance();
+    Assert::assertTrue(uri_string() == $ci->config->item('expected_uri') && $auth == $ci->config->item('expected_auth'));
   },
 
   RESTResponse::NOT_ACCEPTABLE     => function(&$auth):void {

helpers/rest_helper.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 declare(strict_types=1);
 
 if (!function_exists('response')) {
-  function response($data=null, int $code=null):RESTResponse
+  function response($data = null, int $code = null):RESTResponse
   {
     return new RESTResponse($data, $code);
   }

libraries/RESTResponse.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
    * @var bool
    */
   protected $json;
-  function __construct($data=null, int $code=null)
+  function __construct($data = null, int $code = null)
   {
     $this->data = $data;
     $this->code = $code;
@@ -61,7 +61,7 @@ 
    * @date  2019-11-11
    * @param boolean    $exit [description]
    */
-  public function send(bool $exit=false):void
+  public function send(bool $exit = false):void
   {
     http_response_code($this->code ?? 200);
 

Braces +9 added lines, -3 removed lines

@@ -65,11 +65,17 @@
   {
     http_response_code($this->code ?? 200);
 
-    if ($this->json) header('Content-Type: application/json');
+    if ($this->json) {
+     header('Content-Type: application/json');
+    }
 
-    if ($this->data !== null) echo !$this->json ? $this->data : json_encode($this->data, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    if ($this->data !== null) {
+     echo !$this->json ? $this->data : json_encode($this->data, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
 
-    if ($exit) exit(EXIT_SUCCESS);
+    if ($exit) {
+     exit(EXIT_SUCCESS);
+    }
   }
 }
 ?>

models/RESTModel.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
    * @param  string $apiKey [description]
    * @return array          [description]
    */
-  public function getAPIKeyData(string $apiKey):?object {
+  public function getAPIKeyData(string $apiKey): ?object {
     // Preliminary Check.
     if ($this->api_key_table == null || $this->api_key_column == null) return null;
     // Query.
@@ -119,7 +119,7 @@ 
    * @param  string $group  [description]
    * @return [type]         [description]
    */
-  public function getLimitData(string $client, string $group):?array {
+  public function getLimitData(string $client, string $group): ?array {
     $sql = 'SELECT count, start, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) AS reset_epoch FROM rest_api_rate_limit WHERE client = ? AND _group = ?';
     $query = $this->db->query($sql, [$client, $group]);
     if (!is_scalar($query) && $query->num_rows() > 0) return $query->result_array()[0];

Braces +12 added lines, -4 removed lines

@@ -81,10 +81,14 @@ 
       $this->db->or_where($this->users_username_column, $username);
     }
     $query = $this->db->get();
-    if ($query->num_rows() == 0) return false;
+    if ($query->num_rows() == 0) {
+     return false;
+    }
     // Authenticate.
     if (password_verify($password, $query->result()[0]->{$this->users_password_column})) {
-      if ($this->users_id_column != null) $context->userId = $query->result()[0]->{$this->users_id_column};
+      if ($this->users_id_column != null) {
+       $context->userId = $query->result()[0]->{$this->users_id_column};
+      }
       return true;
     }
     return false;
@@ -97,7 +101,9 @@ 
    */
   public function getAPIKeyData(string $apiKey):?object {
     // Preliminary Check.
-    if ($this->api_key_table == null || $this->api_key_column == null) return null;
+    if ($this->api_key_table == null || $this->api_key_column == null) {
+     return null;
+    }
     // Query.
     $this->db->from($this->api_key_table);
     $this->db->where($this->api_key_column, $apiKey);
@@ -122,7 +128,9 @@ 
   public function getLimitData(string $client, string $group):?array {
     $sql = 'SELECT count, start, (`start` + INTERVAL (1 - TIMESTAMPDIFF(HOUR, UTC_TIMESTAMP(), NOW())) HOUR) AS reset_epoch FROM rest_api_rate_limit WHERE client = ? AND _group = ?';
     $query = $this->db->query($sql, [$client, $group]);
-    if (!is_scalar($query) && $query->num_rows() > 0) return $query->result_array()[0];
+    if (!is_scalar($query) && $query->num_rows() > 0) {
+     return $query->result_array()[0];
+    }
     return null;
   }
   /**

libraries/RESTAuth.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
    * [BasicAuth description]
    * @var string
    */
-  const BASIC   = "Basic";
+  const BASIC = "Basic";
 
   /**
    * [API_KEY description]
@@ -30,13 +30,13 @@ 
    * [OAUTH2 description]
    * @var string
    */
-  const OAUTH2  = "OAUTH2";
+  const OAUTH2 = "OAUTH2";
 
   /**
    * [IP description]
    * @var string
    */
-  const IP      = "IP";
+  const IP = "IP";
   /**
    * [CUSTOM description]
    * @param  string $header [description]

libraries/REST.php

Braces +42 added lines, -13 removed lines

@@ -141,7 +141,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);
@@ -214,9 +216,14 @@ 
   {
     $auths = null;
     $auths = $this->config['auth'] ?? null;
-    if ($auths) $auths = is_array($auths) ? $auths : [$auths];
+    if ($auths) {
+     $auths = is_array($auths) ? $auths : [$auths];
+    }
 
-    if (!$auths) return; // No authentication(s) to carry out.
+    if (!$auths) {
+     return;
+    }
+    // No authentication(s) to carry out.
 
     /**
      * $this->process_auth() terminates the script if authentication fails
@@ -227,7 +234,9 @@ 
      */
 
     foreach ($auths as $key => $auth) {
-      if ($this->authPreempted) break;
+      if ($this->authPreempted) {
+       break;
+      }
       if (is_numeric($key)) {
         $this->process_auth($auth, self::AUTH_GRAVITY);
       } else {
@@ -264,7 +273,9 @@ 
    */
   private function auth_proceed(bool $success, int $flags):bool
   {
-    if ($flags & self::AUTH_GRAVITY) return $success;
+    if ($flags & self::AUTH_GRAVITY) {
+     return $success;
+    }
     if ($success) {
       if ($flags & self::AUTH_FINAL) {
         $this->authPreempted = true;
@@ -298,12 +309,16 @@ 
     $authorization = $this->get_authorization_header();
     $shouldProceed = $this->auth_proceed(false, $flags);
     if ($authorization == null || substr_count($authorization, ' ') != 1) {
-      if ($shouldProceed) return;
+      if ($shouldProceed) {
+       return;
+      }
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth, 'Bad Request'); // Exits.
     }
     $token = explode(" ", $authorization);
     if ($token[0] != $auth) {
-      if ($shouldProceed) return;
+      if ($shouldProceed) {
+       return;
+      }
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth, 'Bad Request'); // Exits.
     }
     $this->token = $token[1];
@@ -327,15 +342,23 @@ 
   {
     $username = $_SERVER['PHP_AUTH_USER'] ?? null;
     $password = $_SERVER['PHP_AUTH_PW'] ?? null;
-    if (!$this->auth_proceed(!$username || !$password, $flags)) $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC); // Exits.
-    if (!$this->auth_proceed($this->rest_model->basicAuth($this, $username, $password), $flags)) $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC); // Exits.
+    if (!$this->auth_proceed(!$username || !$password, $flags)) {
+     $this->handle_response(RESTResponse::BAD_REQUEST, RESTAuth::BASIC);
+    }
+    // Exits.
+    if (!$this->auth_proceed($this->rest_model->basicAuth($this, $username, $password), $flags)) {
+     $this->handle_response(RESTResponse::UN_AUTHORIZED, RESTAuth::BASIC);
+    }
+    // Exits.
   }
   /**
    * [api_key_auth description]
    */
   private function api_key_auth(int $flags=self::AUTH_GRAVITY):void
   {
-    if (uri_string() == '')  return;
+    if (uri_string() == '') {
+     return;
+    }
     $shouldProceed = $this->auth_proceed(false, $flags);
 
     if (!$this->ci->input->get_request_header($this->apiKeyHeader, true) && !$shouldProceed) {
@@ -353,7 +376,9 @@ 
 
     $this->apiKey = $apiKey;
 
-    if (!$this->auth_proceed(true, $flags)) return;
+    if (!$this->auth_proceed(true, $flags)) {
+     return;
+    }
 
     // ==== API KEY Auth Passed ==== //
 
@@ -414,7 +439,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());
@@ -494,7 +521,9 @@ 
     if (isset($this->config['response_callbacks'][$code])) {
       $this->config['response_callbacks'][$code]($auth, $errorReason);
     }
-    if (ENVIRONMENT != 'testing') exit($code);
+    if (ENVIRONMENT != 'testing') {
+     exit($code);
+    }
     throw new Exception("Error $code in $auth", $code);
   }
 }

Spacing +12 added lines, -12 removed lines

@@ -137,16 +137,16 @@ 
    * @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;
 
     // Load Config If Exists.
     //$this->ci->config->load('rest', true, true);
-    if (is_file(APPPATH . 'config/rest.php')) {
-      include APPPATH . 'config/rest.php';
+    if (is_file(APPPATH.'config/rest.php')) {
+      include APPPATH.'config/rest.php';
     } else {
       $config = [];
     }
@@ -164,7 +164,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;
 
     $this->rest_model->init([
       'users_table'           => $config['basic_auth']['users_table'] ?? null,
@@ -266,14 +266,14 @@ 
    */
   private function auth_proceed(bool $success, int $flags):bool
   {
-    if ($flags & self::AUTH_GRAVITY) return $success;
+    if ($flags&self::AUTH_GRAVITY) return $success;
     if ($success) {
-      if ($flags & self::AUTH_FINAL) {
+      if ($flags&self::AUTH_FINAL) {
         $this->authPreempted = true;
         return true;
       }
     } else {
-      return $flags & self::AUTH_PASSIVE ? true : false;
+      return $flags&self::AUTH_PASSIVE ? true : false;
     }
   }
 
@@ -335,7 +335,7 @@ 
   /**
    * [api_key_auth description]
    */
-  private function api_key_auth(int $flags=self::AUTH_GRAVITY):void
+  private function api_key_auth(int $flags = self::AUTH_GRAVITY):void
   {
     if (uri_string() == '')  return;
     $shouldProceed = $this->auth_proceed(false, $flags);
@@ -382,7 +382,7 @@ 
     }
     // Should we acyually Limit?
     if ($this->per_hour > 0) {
-      $client = hash('md5', $this->ci->input->ip_address() . "%" . $apiKey);
+      $client = hash('md5', $this->ci->input->ip_address()."%".$apiKey);
       $limitData = $this->rest_model->getLimitData($client, '_api_keyed_user');
       if ($limitData == null) {
         $limitData = [];
@@ -466,7 +466,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"]);
@@ -489,7 +489,7 @@ 
    * [handle_response description]
    * @param int $code [description]
    */
-  private function handle_response(int $code, $auth=null, ?string $errorReason=null):void
+  private function handle_response(int $code, $auth = null, ?string $errorReason = null):void
   {
     http_response_code($code);
     header("Content-Type: application/json");