Bug fixes and disable authentication in default route.

francis94c · Apr 9, 2020 · b895a8d · b895a8d
1 parent aeebeb1
commit b895a8d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/libraries/REST.php b/libraries/REST.php
@@ -193,7 +193,9 @@ function __construct(?array $params=null)
     //}
 
     // Authenticate
-    $this->authenticate();
+    if ($this->ci->uri->total_segments() > 0) {
+      $this->authenticate();
+    }
 
     // Generic Rate Limiter.
     if ($this->limit_api && !$this->checked_rate_limit &&
@@ -295,11 +297,13 @@ private function bearer_auth(string $auth, int $flags):void
   {
     $authorization = $this->get_authorization_header();
     $shouldProceed = $this->auth_proceed(false, $flags);
-    if ($authorization == null || substr_count($authorization, ' ') != 1 && !$shouldProceed) {
+    if ($authorization == null || substr_count($authorization, ' ') != 1) {
+      if ($shouldProceed) return;
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth, 'Bad Request'); // Exits.
     }
     $token = explode(" ", $authorization);
-    if ($token[0] != $auth && !$shouldProceed) {
+    if ($token[0] != $auth) {
+      if ($shouldProceed) return;
       $this->handle_response(RESTResponse::BAD_REQUEST, $auth, 'Bad Request'); // Exits.
     }
     $this->token = $token[1];