Permalink
Browse files

MDL-39203 repository: Fixed authentication errors with Dropbox

Conflicts:

	lib/oauthlib.php
	repository/dropbox/lib.php
  • Loading branch information...
1 parent f8505b3 commit 6fd6c844ecf7a595c0fad0184ac91a1ad18082b4 @FMCorz FMCorz committed Apr 18, 2013
Showing with 3 additions and 1 deletion.
  1. +2 −0 lib/oauthlib.php
  2. +1 −1 repository/dropbox/lib.php
View
@@ -248,6 +248,8 @@ public function get_access_token($token, $secret, $verifier='') {
$this->sign_secret = $this->consumer_secret.'&'.$secret;
$params = $this->prepare_oauth_parameters($this->access_token_api, array('oauth_token'=>$token, 'oauth_verifier'=>$verifier), 'POST');
$this->setup_oauth_http_header($params);
+ // Should never send the callback in this request.
+ unset($params['oauth_callback']);
$content = $this->http->post($this->access_token_api, $params);
$keys = $this->parse_result($content);
$this->set_access_token($keys['oauth_token'], $keys['oauth_token_secret']);
@@ -66,7 +66,7 @@ public function __construct($repositoryid, $context = SYSCONTEXTID, $options = a
'oauth_consumer_key'=>$this->dropbox_key,
'oauth_consumer_secret'=>$this->dropbox_secret,
'oauth_callback' => $this->callback->out(false),
- 'api_root' => 'https://www.dropbox.com/1/oauth',
+ 'api_root' => 'https://api.dropbox.com/1/oauth'
);
$this->dropbox = new dropbox($args);

0 comments on commit 6fd6c84

Please sign in to comment.