francis94c / ci-rest

libraries/RESTResponse.php

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

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/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);
   }
 }