Fix basic auth for OAuth token endpoint

Don't try to login when a client is trying to get a OAuth token.
OAuth needs to support basic auth too, so the login is not valid
inside Nextcloud and the Login exception would ruin it.

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/base.php b/lib/base.php
index 473a3419cb1436d57319f679c1b29937ab8f2732..2e6e2a65d80fc75e2a329734cbac474ca5c0c4bc 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -987,7 +987,13 @@ class OC {
                        } else {
                                // For guests: Load only filesystem and logging
                                OC_App::loadApps(['filesystem', 'logging']);
-                               self::handleLogin($request);
+
+                               // Don't try to login when a client is trying to get a OAuth token.
+                               // OAuth needs to support basic auth too, so the login is not valid
+                               // inside Nextcloud and the Login exception would ruin it.
+                               if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
+                                       self::handleLogin($request);
+                               }
                        }
                }