fixed several bugs in the OAuth class

william26 · william26 · commit 9badc3ca6d82 · 2014-06-10T12:03:29.000+02:00
diff --git a/src/OAuth_io/OAuth.php b/src/OAuth_io/OAuth.php
@@ -108,22 +108,23 @@ public function auth($provider, $options = array()) {
                 'method' => 'POST',
                 'url' => $this->injector->config['oauthd_url'] . '/auth/access_token',
                 'body' => http_build_query(array(
-                    'code' => $code,
+                    'code' => $options['code'],
                     'key' => $this->injector->config['app_key'],
                     'secret' => $this->injector->config['app_secret']
                 )) ,
                 'headers' => array(
                     'Content-Type' => 'application/x-www-form-urlencoded'
                 )
             ));
-            $credentials = $response->body;
-            if (isset($credentials->provider)) {
-                $this->injector->session['oauthio']['auth'][$credentials->provider] = json_decode(json_encode($credentials) , true);
+            $credentials = json_decode(json_encode($response->body), true);
+
+            if (isset($credentials['provider'])) {
+                $this->injector->session['oauthio']['auth'][$credentials['provider']] = $credentials;
             }
         } else if (isset($options['credentials'])) {
             $credentials = $options['credentials'];
         } else {
-            $credentials = $this->injector->session['oauthio']['auth']['provider'];
+            $credentials = $this->injector->session['oauthio']['auth'][$provider];
         }
         $credentials = $this->refreshCredentials($credentials);
         $request = new Request($credentials);
