Merge pull request #436 from nextcloud/fix/env/oauth

Ignore the oauth token path in login with the environment variables

1 files changed, 6 insertions, 0 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index 11aa7e8f..43db79eb 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -80,6 +80,12 @@ switch($config->getAppValue('user_saml', 'type')) {
 }
 
 if ($type === 'environment-variable') {
+	// We should ignore oauth2 token endpoint (oauth can send the credentials as basic auth which will fail with apache auth)
+	$uri = $request->getRequestUri();
+	if (substr($uri, -24) === '/apps/oauth/api/v1/token') {
+		return;
+	}
+
 	OC_User::handleApacheAuth();
 }