From 2c5200d9f2d87e199d4f25b5a2fc1c3c26665d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Tue, 10 Jul 2018 19:54:41 +0000
Subject: [PATCH] Merged in bugfix/HOR-4697 (pull request #6548)

HOR-4697

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Dante Loayza <dante.loayza@colosa.com>
---
 framework/src/Maveriks/WebApplication.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index accc6b8f3..fe9632e83 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -114,7 +114,9 @@ class WebApplication
             } else {
                 return self::RUNNING_DEFAULT;
             }
-        } elseif (substr($this->requestUri, 1, 3) === "api" && count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0/<workspace>/<resource>
+        } elseif ($this->requestUri !== "/api/oauth2/token" &&
+            substr($this->requestUri, 1, 3) === "api" &&
+            count(explode("/", $this->requestUri)) >= 4 // url api pattern: /api/1.0/<workspace>/<resource>
         ) {
             return self::RUNNING_API;
         } else {