3 files changed, 117 insertions, 43 deletions
diff --git a/Zotlabs/Module/Oauth2test.php b/Zotlabs/Module/Oauth2test.php
deleted file mode 100644
index 14aa6137a..000000000
--- a/Zotlabs/Module/Oauth2test.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Zotlabs\Module;
-
-class Oauth2test extends \Zotlabs\Web\Controller {
-
-	function get() {
-
-		$o .= replace_macros(get_markup_template('oauth2test.tpl'), array(
-			'$baseurl' => z_root(),
-			'$endpoints' => array(
-				array(
-					'oauth2test',
-					array(
-						array(
-							'action', 'create_db'
-						)
-					),
-					'oauth2test_create_db',
-					'Create the OAuth2 database tables'
-				)
-			)
-		));
-
-		return $o;
-	}
-
-	function post() {
-		
-		logger(json_encode($_POST), LOGGER_DEBUG);
-		
-		switch ($_POST['action']) {
-			case 'create_db':
-				logger('Creating database tables...', LOGGER_DEBUG);
-				break;
-
-			default:
-				break;
-		}
-		
-	}
-
-}
diff --git a/Zotlabs/Module/Oauth2testvehicle.php b/Zotlabs/Module/Oauth2testvehicle.php
new file mode 100644
index 000000000..2a2590928
--- /dev/null
+++ b/Zotlabs/Module/Oauth2testvehicle.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Zotlabs\Module;
+
+class OAuth2TestVehicle extends \Zotlabs\Web\Controller {
+
+	function get() {
+
+		$o .= replace_macros(get_markup_template('oauth2testvehicle.tpl'), array(
+			'$baseurl' => z_root(),
+			/*
+			endpoints => array(
+			  array(
+				  'path_to_endpoint',
+				  array(
+					  array('field_name_1', 'value'),
+					  array('field_name_2', 'value'),
+					  ...
+					  ),
+				  'submit_button_name',
+				  'Description of API action'
+			  )
+			)
+			 */
+			'$endpoints' => array(
+				array(
+					'oauth2testvehicle',
+					array(
+						array(
+							'action', 'create_db'
+						)
+					),
+					'oauth2test_create_db',
+					'Create the OAuth2 database tables'
+				),
+				array(
+					'oauth2testvehicle',
+					array(
+						array(
+							'action', 'delete_db'
+						)
+					),
+					'oauth2test_delete_db',
+					'Delete the OAuth2 database tables'
+				)
+			)
+		));
+
+		return $o;
+	}
+
+	function post() {
+
+		logger(json_encode($_POST), LOGGER_DEBUG);
+
+		switch ($_POST['action']) {
+			
+			case 'delete_db':
+				$status = true;
+				// Use the \OAuth2\Storage\Pdo class to create the OAuth2 tables
+				// by passing it the database connection 
+				$pdo = \DBA::$dba->db;
+				$storage = new \Zotlabs\Storage\ZotOauth2Pdo($pdo);
+				logger('Deleting existing database tables...', LOGGER_DEBUG);
+				foreach ($storage->getConfig() as $key => $table) {
+					logger('Deleting table ' . dbesc($table), LOGGER_DEBUG);
+					$r = q("DROP TABLE IF EXISTS %s;", dbesc($table));
+					if (!$r) {
+						logger('Errors encountered deleting database table ' . $table . '.', LOGGER_DEBUG);
+						$status = false;
+					}
+				}
+				if (!$status) {
+					notice('Errors encountered deleting database tables.' . EOL);
+				} else {
+					info('Database tables deleted successfully.' . EOL);
+				}
+
+				break;
+				
+			case 'create_db':
+				$status = true;
+				logger('Creating database tables...', LOGGER_DEBUG);
+				@include('.htconfig.php');
+				$pdo = \DBA::$dba->db;
+				$storage = new \Zotlabs\Storage\ZotOauth2Pdo($pdo);
+				foreach (explode(';', $storage->getBuildSql($db_data)) as $statement) {
+					try {
+						$result = $pdo->exec($statement);
+					} catch (\PDOException $e) {
+						$status = false;
+						logger('Error executing database statement: ' . $statement, LOGGER_DEBUG);
+					}
+				}
+
+				if (!$status) {
+					notice('Errors encountered creating database tables.' . EOL);
+				} else {
+					info('Database tables created successfully.' . EOL);
+				}
+
+			default:
+				break;
+		}
+	}
+
+}
diff --git a/Zotlabs/Storage/ZotOauth2Pdo.php b/Zotlabs/Storage/ZotOauth2Pdo.php
new file mode 100644
index 000000000..b2c3ce228
--- /dev/null
+++ b/Zotlabs/Storage/ZotOauth2Pdo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Zotlabs\Storage;
+
+class ZotOauth2Pdo extends \OAuth2\Storage\Pdo {
+	public function getConfig()
+    {
+		return $this->config;
+    }
+}