Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13991894
D16763.id40371.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D16763.id40371.diff
View Options
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
@@ -18,11 +18,14 @@
$grant_type = $request->getStr('grant_type');
$code = $request->getStr('code');
$redirect_uri = $request->getStr('redirect_uri');
- $client_phid = $request->getStr('client_id');
- $client_secret = $request->getStr('client_secret');
$response = new PhabricatorOAuthResponse();
$server = new PhabricatorOAuthServer();
+ $client_phid = isset($_SERVER['PHP_AUTH_USER']) ?
+ $_SERVER['PHP_AUTH_USER'] : $request->getStr('client_id');
+ $client_secret = isset($_SERVER['PHP_AUTH_PW']) ?
+ $_SERVER['PHP_AUTH_PW'] : $request->getStr('client_secret');
+
if ($grant_type != 'authorization_code') {
$response->setError('unsupported_grant_type');
$response->setErrorDescription(
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Oct 23, 1:15 PM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6744271
Default Alt Text
D16763.id40371.diff (1 KB)
Attached To
Mode
D16763: oauthserver: get client ID/secret from HTTP auth
Attached
Detach File
Event Timeline
Log In to Comment