From 24bf333e161332ddd589831228e35ad9eb1e8f18 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 13 Jul 2013 16:51:38 -0400
Subject: [feature/oauth] Use DB for OAuth token storage

PHPBB3-11673
---
 .../db/migration/data/310/auth_provider_oauth.php  | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 phpBB/includes/db/migration/data/310/auth_provider_oauth.php

(limited to 'phpBB/includes/db')

diff --git a/phpBB/includes/db/migration/data/310/auth_provider_oauth.php b/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
new file mode 100644
index 0000000000..6239cf97bc
--- /dev/null
+++ b/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
@@ -0,0 +1,42 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
+{
+	public function effectively_installed()
+	{
+		return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'add_tables'	=> array(
+				$this->table_prefix . 'auth_provider_oauth'	=> array(
+					'COLUMNS' => array(
+						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+						'oauth_provider'	=> array('VCHAR'), // Name of the OAuth provider
+						'oauth_token'		=> array('TEXT_UNI'), // Serialized token
+					),
+					'PRIMARY_KEY' => array('user_id', 'oauth_provider'),
+				),
+			),
+
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'drop_tables'	=> array(
+				$this->table_prefix . 'auth_provider_oauth',
+			),
+		);
+	}
+}
-- 
cgit v1.2.1


From 69e158865560bba4264646faa0799aa6e457c6d0 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sat, 13 Jul 2013 17:59:04 -0400
Subject: [feature/oauth] Store anonymous user by session id

PHPBB3-9734
---
 phpBB/includes/db/migration/data/310/auth_provider_oauth.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'phpBB/includes/db')

diff --git a/phpBB/includes/db/migration/data/310/auth_provider_oauth.php b/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
index 6239cf97bc..92da42ba31 100644
--- a/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
+++ b/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
@@ -21,13 +21,16 @@ class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
 				$this->table_prefix . 'auth_provider_oauth'	=> array(
 					'COLUMNS' => array(
 						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
+						'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
 						'oauth_provider'	=> array('VCHAR'), // Name of the OAuth provider
 						'oauth_token'		=> array('TEXT_UNI'), // Serialized token
 					),
-					'PRIMARY_KEY' => array('user_id', 'oauth_provider'),
+					'KEYS' => array(
+						'user_id'			=> array('INDEX', 'user_id'),
+						'oauth_provider'	=> array('INDEX', 'oauth_provider'),
+					),
 				),
 			),
-
 		);
 	}
 
-- 
cgit v1.2.1


From 00d0e102008767f712145f55348a662f3e6750d6 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Sun, 14 Jul 2013 14:17:54 -0400
Subject: [feature/oauth] Move last file to appropriate location

PHPBB3-11673
---
 .../db/migration/data/310/auth_provider_oauth.php  | 45 ----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 phpBB/includes/db/migration/data/310/auth_provider_oauth.php

(limited to 'phpBB/includes/db')

diff --git a/phpBB/includes/db/migration/data/310/auth_provider_oauth.php b/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
deleted file mode 100644
index 92da42ba31..0000000000
--- a/phpBB/includes/db/migration/data/310/auth_provider_oauth.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
-*
-* @package migration
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
-*
-*/
-
-class phpbb_db_migration_data_310_auth_provider_oauth extends phpbb_db_migration
-{
-	public function effectively_installed()
-	{
-		return $this->db_tools->sql_table_exists($this->table_prefix . 'auth_provider_oauth');
-	}
-
-	public function update_schema()
-	{
-		return array(
-			'add_tables'	=> array(
-				$this->table_prefix . 'auth_provider_oauth'	=> array(
-					'COLUMNS' => array(
-						'user_id'			=> array('UINT', 0), // phpbb_users.user_id
-						'session_id'		=> array('CHAR:32', ''), // phpbb_sessions.session_id used only when user_id not set
-						'oauth_provider'	=> array('VCHAR'), // Name of the OAuth provider
-						'oauth_token'		=> array('TEXT_UNI'), // Serialized token
-					),
-					'KEYS' => array(
-						'user_id'			=> array('INDEX', 'user_id'),
-						'oauth_provider'	=> array('INDEX', 'oauth_provider'),
-					),
-				),
-			),
-		);
-	}
-
-	public function revert_schema()
-	{
-		return array(
-			'drop_tables'	=> array(
-				$this->table_prefix . 'auth_provider_oauth',
-			),
-		);
-	}
-}
-- 
cgit v1.2.1