archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into phutil_tag

Browse Source 
(Sync.)
This commit is contained in:
epriestley
2013-02-07 08:08:01 -08:00
parent f864d9e611 3ce3f5d368
commit 11bb8db970
80 changed files with 2727 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
View File

@@ -15,7 +15,7 @@ extends PhabricatorAuthController {
$current_user = $request->getUser();
$server = new PhabricatorOAuthServer();
$client_phid = $request->getStr('client_id');
$scope = $request->getStr('scope');
$scope = $request->getStr('scope', array());
$redirect_uri = $request->getStr('redirect_uri');
$state = $request->getStr('state');
$response_type = $request->getStr('response_type');
@@ -63,10 +63,8 @@ extends PhabricatorAuthController {
return $response;
}
$uri = $redirect_uri;
$access_token_uri = $uri;
} else {
$uri = new PhutilURI($client->getRedirectURI());
$access_token_uri = null;
}
// we've now validated this request enough overall such that we
// can safely redirect to the client with the response
@@ -121,7 +119,7 @@ extends PhabricatorAuthController {
if ($return_auth_code) {
// step 1 -- generate authorization code
$auth_code =
$server->generateAuthorizationCode($access_token_uri);
$server->generateAuthorizationCode($uri);
// step 2 return it
$content = array(