From 947aa2b6b442b5e1ce06c755c3e8ebea677f63e3 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sun, 14 Jul 2013 15:16:34 -0400
Subject: [feature/oauth] Create OAuth service classes

PHPBB3-11673
---
 phpBB/phpbb/auth/provider/oauth/service/base.php | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 phpBB/phpbb/auth/provider/oauth/service/base.php

(limited to 'phpBB/phpbb/auth/provider/oauth/service/base.php')

diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
new file mode 100644
index 0000000000..98a1fa16e4
--- /dev/null
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* @package auth
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Bitly OAuth service
+*
+* @package auth
+*/
+abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_provider_oauth_service_interface
+{
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_auth_scope()
+	{
+		return array();
+	}
+}
-- 
cgit v1.2.1


From 47b998ae486ebe9c0f9df5be4e3d836b31f2c7a3 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 15 Jul 2013 15:21:20 -0400
Subject: [feature/oauth] Define method to perform login actions for a provider

PHPB3-11673
---
 phpBB/phpbb/auth/provider/oauth/service/base.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'phpBB/phpbb/auth/provider/oauth/service/base.php')

diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
index 98a1fa16e4..d59199f987 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/base.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -22,6 +22,21 @@ if (!defined('IN_PHPBB'))
 */
 abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_provider_oauth_service_interface
 {
+	/**
+	* External OAuth service provider
+	*
+	* @var \OAuth\Common\Service\ServiceInterface
+	*/
+	protected $service_provider;
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function get_external_service_provider()
+	{
+		return $this->service_provider;
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
@@ -29,4 +44,12 @@ abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_prov
 	{
 		return array();
 	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
+	{
+		$this->service_provider = $service;
+	}
 }
-- 
cgit v1.2.1


From fe9c97cfb45be2943eebb8ed5cbab51150e828ee Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Tue, 23 Jul 2013 21:16:19 -0400
Subject: [feature/oauth] Fix errors in OAuth

PHPBB3-11673
---
 phpBB/phpbb/auth/provider/oauth/service/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/auth/provider/oauth/service/base.php')

diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
index d59199f987..ccfe57c8e2 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/base.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -50,6 +50,6 @@ abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_prov
 	*/
 	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
 	{
-		$this->service_provider = $service;
+		$this->service_provider = $service_provider;
 	}
 }
-- 
cgit v1.2.1


From abe9f27723fdc979069082dbe6af3c8a0aceace6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Thu, 1 Aug 2013 21:34:50 -0400
Subject: [feature/oauth] Clean up OAuth services

PHPBB3-11673
---
 phpBB/phpbb/auth/provider/oauth/service/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/auth/provider/oauth/service/base.php')

diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
index ccfe57c8e2..1eb49b4265 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/base.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
 }
 
 /**
-* Bitly OAuth service
+* Base OAuth abstract class that all OAuth services should implement
 *
 * @package auth
 */
-- 
cgit v1.2.1