3.3/develop

classes/Controller/Demo/Oauth.php

@@ -0,0 +1,133 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Base demo class for OAuth provider modules.
+ *
+ * Depends on the [demo module](https://github.com/shadowhand/demo).
+ *
+ * @package    Kohana/OAuth
+ * @category   Demo
+ * @author     Kohana Team
+ * @copyright  (c) 2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.1.3
+ */
+abstract class Controller_Demo_OAuth extends Controller_Demo {
+
+	/**
+	 * @var  object  OAuth_Provider
+	 */
+	protected $provider;
+
+	/**
+	 * @var  object  OAuth_Consumer
+	 */
+	protected $consumer;
+
+	/**
+	 * @var  object  OAuth_Token
+	 */
+	protected $token;
+
+	public function before()
+	{
+		parent::before();
+
+		// Load the cookie session
+		$this->session = Session::instance('cookie');
+
+		// Get the name of the demo from the class name
+		$provider = strtolower($this->api);
+
+		// Load the provider
+		$this->provider = OAuth_Provider::factory($provider);
+
+		// Load provider configuration
+		$config = Kohana::$config->load('oauth')->$provider;
+
+		// Load the consumer for this provider
+		$this->consumer = OAuth_Consumer::factory($config);
+
+		if ($token = $this->session->get($this->key('access')))
+		{
+			// Make the access token available
+			$this->token = $token;
+		}
+	}
+
+	public function key($name)
+	{
+		return "demo_{$this->provider->name}_{$name}";
+	}
+
+	public function demo_login()
+	{
+		// Attempt to complete signin
+		if ($verifier = Arr::get($_REQUEST, 'oauth_verifier'))
+		{
+			if ( ! $token = $this->session->get($this->key('request')) OR $token->token !== Arr::get($_REQUEST, 'oauth_token'))
+			{
+				// Token is invalid
+				$this->session->delete($this->key('request'));
+
+				// Restart the login process
+				$this->request->redirect($this->request->uri());
+			}
+
+			// Store the verifier in the token
+			$token->verifier($verifier);
+
+			// Exchange the request token for an access token
+			$token = $this->provider->access_token($this->consumer, $token);
+
+			// Store the access token
+			$this->session->set($this->key('access'), $token);
+
+			// Request token is no longer needed
+			$this->session->delete($this->key('request'));
+
+			// Refresh the page to prevent errors
+			$this->request->redirect($this->request->uri());
+		}
+
+		if ($this->token)
+		{
+			// Login succesful
+			$this->content = Debug::vars('Access token granted:', $this->token);
+		}
+		else
+		{
+			// We will need a callback URL for the user to return to
+			$callback = $this->request->url(NULL, TRUE);
+
+			// Add the callback URL to the consumer
+			$this->consumer->callback($callback);
+
+			// Get a request token for the consumer
+			$token = $this->provider->request_token($this->consumer);
+
+			// Get the login URL from the provider
+			$url = $this->provider->authorize_url($token);
+
+			// Store the token
+			$this->session->set($this->key('request'), $token);
+
+			// Redirect to the twitter login page
+			$this->content = HTML::anchor($url, "Login to {$this->api}");
+		}
+	}
+
+	public function demo_logout()
+	{
+		if (Arr::get($_GET, 'confirm'))
+		{
+			// Delete the access token
+			$this->session->delete($this->key('request'), $this->key('access'));
+
+			// Redirect to the demo list
+			$this->request->redirect($this->request->uri(array('action' => FALSE, 'id' => FALSE)));
+		}
+
+		$this->content = HTML::anchor("{$this->request->uri()}?confirm=yes", "Logout of {$this->api}");
+	}
+
+} // End Demo

classes/Controller/Demo/Oauth2.php

@@ -0,0 +1,112 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Base demo class for OAuth provider modules.
+ *
+ * Depends on the [demo module](https://github.com/shadowhand/demo).
+ *
+ * @package    Kohana/OAuth2
+ * @category   Demo
+ * @author     Kohana Team
+ * @copyright  (c) 2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.1.3
+ */
+abstract class Controller_Demo_OAuth2 extends Controller_Demo {
+
+	/**
+	 * @var  object  OAuth2_Provider
+	 */
+	protected $provider;
+
+	/**
+	 * @var  object  OAuth2_Client
+	 */
+	protected $client;
+
+	/**
+	 * @var  object  OAuth2_Token
+	 */
+	protected $token;
+
+	public function before()
+	{
+		parent::before();
+
+		// Load the cookie session
+		$this->session = Session::instance('cookie');
+
+		// Get the name of the demo from the class name
+		$provider = strtolower($this->api);
+
+		// Load the provider
+		$this->provider = OAuth2_Provider::factory($provider);
+
+		// Load provider configuration
+		$config = Kohana::$config->load('oauth')->$provider;
+
+		// Load the client for this provider
+		$this->client = OAuth2_Client::factory($config);
+
+		if ($token = $this->session->get($this->key('access')))
+		{
+			// Make the access token available
+			$this->token = $token;
+		}
+	}
+
+	public function key($name)
+	{
+		return "demo_{$this->provider->name}_{$name}";
+	}
+
+	public function demo_login()
+	{
+		// Attempt to complete signin
+		if ($code = Arr::get($_REQUEST, 'code'))
+		{
+			// Exchange the authorization code for an access token
+			$token = $this->provider->access_token($this->client, $code);
+
+			// Store the access token
+			$this->session->set($this->key('access'), $token);
+
+			// Refresh the page to prevent errors
+			$this->request->redirect($this->request->uri());
+		}
+
+		if ($this->token)
+		{
+			// Login succesful
+			$this->content = Debug::vars('Access token granted:', $this->token);
+		}
+		else
+		{
+			// We will need a callback URL for the user to return to
+			$callback = $this->request->url(NULL, TRUE);
+
+			// Add the callback URL to the consumer
+			$this->client->callback($callback);
+
+			// Get the login URL from the provider
+			$url = $this->provider->authorize_url($this->client);
+
+			// Redirect to the twitter login page
+			$this->content = HTML::anchor($url, "Login to {$this->api}");
+		}
+	}
+
+	public function demo_logout()
+	{
+		if (Arr::get($_GET, 'confirm'))
+		{
+			// Delete the access token
+			$this->session->delete($this->key('access'));
+
+			// Redirect to the demo list
+			$this->request->redirect($this->request->uri(array('action' => FALSE, 'id' => FALSE)));
+		}
+
+		$this->content = HTML::anchor($this->request->uri().'?confirm=yes', "Logout of {$this->api}");
+	}
+
+} // End Demo

classes/kohana/oauth/consumer.php → classes/Kohana/Oauth/Consumer.php

@@ -39,6 +39,11 @@ public static function factory(array $options = NULL)
 	 */
 	protected $callback;
 
+	/**
+	* @var  string  optional realm for the OAuth request
+	*/
+	protected $realm;
+
 	/**
 	 * Sets the consumer key and secret.
 	 *
@@ -67,6 +72,11 @@ public function __construct(array $options = NULL)
 		{
 			$this->callback = $options['callback'];
 		}
+
+		if (isset($options['realm']))
+		{
+			$this->realm = $options['realm'];
+		}
 	}
 
 	/**

classes/kohana/oauth/provider.php → classes/Kohana/Oauth/Provider.php

@@ -11,6 +11,8 @@
  */
 abstract class Kohana_OAuth_Provider {
 
+	protected $signature = 'PLAINTEXT';
+
 	/**
 	 * Create a new provider.
 	 *
@@ -23,7 +25,7 @@ abstract class Kohana_OAuth_Provider {
 	 */
 	public static function factory($name, array $options = NULL)
 	{
-		$class = 'OAuth_Provider_'.$name;
+		$class = 'OAuth_Provider_'.UTF8::ucfirst($name);
 
 		return new $class($options);
 	}
@@ -126,6 +128,7 @@ public function request_token(OAuth_Consumer $consumer, array $params = NULL)
 	{
 		// Create a new GET request for a request token with the required parameters
 		$request = OAuth_Request::factory('token', 'GET', $this->url_request_token(), array(
+			'realm'              => $consumer->realm,
 			'oauth_consumer_key' => $consumer->key,
 			'oauth_callback'     => $consumer->callback,
 		));
@@ -188,6 +191,7 @@ public function access_token(OAuth_Consumer $consumer, OAuth_Token_Request $toke
 	{
 		// Create a new GET request for a request token with the required parameters
 		$request = OAuth_Request::factory('access', 'GET', $this->url_access_token(), array(
+			'realm'              => $consumer->realm,
 			'oauth_consumer_key' => $consumer->key,
 			'oauth_token'        => $token->token,
 			'oauth_verifier'     => $token->verifier,

classes/Kohana/Oauth/Provider/Flickr.php

@@ -0,0 +1,39 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * OAuth Flickr Provider
+ *
+ * Documents for implementing Flickr OAuth can be found at
+ * <http://www.flickr.com/services/api/auth.oauth.html>.
+ *
+ * [!!] This class does not implement the Flickr API. It is only an
+ * implementation of standard OAuth with Flickr as the service provider.
+ *
+ * @package    Kohana/OAuth
+ * @category   Provider
+ * @author     Kohana Team
+ * @copyright  (c) 2011 Kohana Team
+ * @license    http://kohanaframework.org/license
+ * @since      3.1.0
+ */
+class Kohana_OAuth_Provider_Flickr extends OAuth_Provider {
+
+	public $name = 'flickr';
+
+	protected $signature = 'HMAC-SHA1';
+
+	public function url_request_token()
+	{
+		return 'http://www.flickr.com/services/oauth/request_token';
+	}
+
+	public function url_authorize()
+	{
+		return 'http://www.flickr.com/services/oauth/authorize';
+	}
+
+	public function url_access_token()
+	{
+		return 'http://www.flickr.com/services/oauth/access_token';
+	}
+
+} // End OAuth_Provider_Flickr