Merge pull request #12920 from nextcloud/oauth2/migrations

OAuth2: Move to migrations

4 files changed, 100 insertions, 100 deletions

diff --git a/apps/oauth2/appinfo/database.xml b/apps/oauth2/appinfo/database.xml
deleted file mode 100644
index db32e0cf97d..00000000000
--- a/apps/oauth2/appinfo/database.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/database.xsd">
-	<name>*dbname*</name>
-	<create>true</create>
-	<overwrite>false</overwrite>
-	<charset>utf8</charset>
-	<table>
-		<name>*dbprefix*oauth2_clients</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<autoincrement>true</autoincrement>
-				<unsigned>true</unsigned>
-				<primary>true</primary>
-			</field>
-			<field>
-				<name>name</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>redirect_uri</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>2000</length>
-			</field>
-			<field>
-				<name>client_identifier</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>secret</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<index>
-				<name>oauth2_client_id_idx</name>
-				<unique>false</unique>
-				<field>
-					<name>client_identifier</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	<table>
-		<name>*dbprefix*oauth2_access_tokens</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<autoincrement>true</autoincrement>
-				<unsigned>true</unsigned>
-				<primary>true</primary>
-			</field>
-			<field>
-				<name>token_id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-			</field>
-			<field>
-				<name>client_id</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-			</field>
-			<field>
-				<name>hashed_code</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>encrypted_token</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>786</length>
-			</field>
-			<index>
-				<name>oauth2_access_hash_idx</name>
-				<unique>true</unique>
-				<field>
-					<name>hashed_code</name>
-				</field>
-			</index>
-			<index>
-				<name>oauth2_access_client_id_idx</name>
-				<unique>false</unique>
-				<field>
-					<name>client_id</name>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/oauth2/composer/composer/autoload_classmap.php b/apps/oauth2/composer/composer/autoload_classmap.php
index c933a1bf21e..2773810bd01 100644
--- a/apps/oauth2/composer/composer/autoload_classmap.php
+++ b/apps/oauth2/composer/composer/autoload_classmap.php
@@ -16,5 +16,6 @@ return array(
     'OCA\\OAuth2\\Exceptions\\AccessTokenNotFoundException' => $baseDir . '/../lib/Exceptions/AccessTokenNotFoundException.php',
     'OCA\\OAuth2\\Exceptions\\ClientNotFoundException' => $baseDir . '/../lib/Exceptions/ClientNotFoundException.php',
     'OCA\\OAuth2\\Migration\\SetTokenExpiration' => $baseDir . '/../lib/Migration/SetTokenExpiration.php',
+    'OCA\\OAuth2\\Migration\\Version010401Date20181207190718' => $baseDir . '/../lib/Migration/Version010401Date20181207190718.php',
     'OCA\\OAuth2\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
 );
diff --git a/apps/oauth2/composer/composer/autoload_static.php b/apps/oauth2/composer/composer/autoload_static.php
index aaac9e4f6d8..c4401a0a21c 100644
--- a/apps/oauth2/composer/composer/autoload_static.php
+++ b/apps/oauth2/composer/composer/autoload_static.php
@@ -31,6 +31,7 @@ class ComposerStaticInitOAuth2
         'OCA\\OAuth2\\Exceptions\\AccessTokenNotFoundException' => __DIR__ . '/..' . '/../lib/Exceptions/AccessTokenNotFoundException.php',
         'OCA\\OAuth2\\Exceptions\\ClientNotFoundException' => __DIR__ . '/..' . '/../lib/Exceptions/ClientNotFoundException.php',
         'OCA\\OAuth2\\Migration\\SetTokenExpiration' => __DIR__ . '/..' . '/../lib/Migration/SetTokenExpiration.php',
+        'OCA\\OAuth2\\Migration\\Version010401Date20181207190718' => __DIR__ . '/..' . '/../lib/Migration/Version010401Date20181207190718.php',
         'OCA\\OAuth2\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
     );
 
diff --git a/apps/oauth2/lib/Migration/Version010401Date20181207190718.php b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php
new file mode 100644
index 00000000000..14d925d3b6f
--- /dev/null
+++ b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php
@@ -0,0 +1,98 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright Copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\OAuth2\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+class Version010401Date20181207190718 extends SimpleMigrationStep {
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		if (!$schema->hasTable('oauth2_clients')) {
+			$table = $schema->createTable('oauth2_clients');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('name', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('redirect_uri', 'string', [
+				'notnull' => true,
+				'length' => 2000,
+			]);
+			$table->addColumn('client_identifier', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('secret', 'string', [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
+		}
+
+		if (!$schema->hasTable('oauth2_access_tokens')) {
+			$table = $schema->createTable('oauth2_access_tokens');
+			$table->addColumn('id', 'integer', [
+				'autoincrement' => true,
+				'notnull' => true,
+				'unsigned' => true,
+			]);
+			$table->addColumn('token_id', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('client_id', 'integer', [
+				'notnull' => true,
+			]);
+			$table->addColumn('hashed_code', 'string', [
+				'notnull' => true,
+				'length' => 128,
+			]);
+			$table->addColumn('encrypted_token', 'string', [
+				'notnull' => true,
+				'length' => 786,
+			]);
+			$table->setPrimaryKey(['id']);
+			$table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
+			$table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
+		}
+		return $schema;
+	}
+}