Move twofactor_backupcodes to migrations

Signed-off-by: Joas Schilling <coding@schilljs.com>

4 files changed, 103 insertions, 86 deletions

diff --git a/apps/twofactor_backupcodes/appinfo/database.xml b/apps/twofactor_backupcodes/appinfo/database.xml
deleted file mode 100644
index 93b0c1ad563..00000000000
--- a/apps/twofactor_backupcodes/appinfo/database.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<database>
-	<name>*dbname*</name>
-	<create>true</create>
-	<overwrite>false</overwrite>
-	<charset>utf8</charset>
-	<table>
-		<name>*dbprefix*twofactor_backupcodes</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<autoincrement>1</autoincrement>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>user_id</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>code</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>used</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<default>0</default>
-				<length>1</length>
-			</field>
-
-			<index>
-				<name>twofactor_backupcodes_uid</name>
-				<field>
-					<name>user_id</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml
index 7faf2825bed..565bd1ebcce 100644
--- a/apps/twofactor_backupcodes/appinfo/info.xml
+++ b/apps/twofactor_backupcodes/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>A two-factor auth backup codes provider</description>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 	<namespace>TwoFactorBackupCodes</namespace>
 	<category>other</category>
 
@@ -23,12 +23,6 @@
 		</providers>
 	</activity>
 
-	<repair-steps>
-		<post-migration>
-			<step>OCA\TwoFactorBackupCodes\Migration\CopyEntriesFromOldTable</step>
-		</post-migration>
-	</repair-steps>
-
 	<settings>
 		<personal>OCA\TwoFactorBackupCodes\Settings\Personal</personal>
 	</settings>
diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
new file mode 100644
index 00000000000..18d614f0b5b
--- /dev/null
+++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @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\TwoFactorBackupCodes\Migration;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\DBAL\Types\Type;
+use OCP\Migration\SimpleMigrationStep;
+use OCP\Migration\IOutput;
+
+class Version1002Date20170607104347 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @return null|Schema
+	 * @since 13.0.0
+	 */
+	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+		/** @var Schema $schema */
+		$schema = $schemaClosure();
+		$prefix = $options['tablePrefix'];
+
+		if (!$schema->hasTable($prefix . 'twofactor_backupcodes')) {
+			$table = $schema->createTable($prefix . 'twofactor_backupcodes');
+
+			$table->addColumn('id', Type::INTEGER, [
+				'autoincrement' => true,
+				'notnull' => true,
+				'length' => 20,
+			]);
+			$table->addColumn('user_id', Type::STRING, [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('code', Type::STRING, [
+				'notnull' => true,
+				'length' => 64,
+			]);
+			$table->addColumn('used', Type::INTEGER, [
+				'notnull' => true,
+				'length' => 1,
+				'default' => 0,
+			]);
+
+			$table->setPrimaryKey(['id']);
+			$table->addIndex(['user_id'], 'twofactor_backupcodes_uid');
+		}
+
+		return $schema;
+	}
+}
diff --git a/apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php
index 6d65a7d0c14..1feae578965 100644
--- a/apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php
+++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php
@@ -23,54 +23,36 @@
 
 namespace OCA\TwoFactorBackupCodes\Migration;
 
+use Doctrine\DBAL\Schema\Schema;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\IConfig;
 use OCP\IDBConnection;
+use OCP\Migration\SimpleMigrationStep;
 use OCP\Migration\IOutput;
-use OCP\Migration\IRepairStep;
 
-class CopyEntriesFromOldTable implements IRepairStep {
+class Version1002Date20170607113030 extends SimpleMigrationStep {
 
 	/** @var IDBConnection */
 	protected $connection;
 
-	/** @var IConfig */
-	protected $config;
-
 	/**
 	 * @param IDBConnection $connection
-	 * @param IConfig $config
 	 */
-	public function __construct(IDBConnection $connection, IConfig $config) {
+	public function __construct(IDBConnection $connection) {
 		$this->connection = $connection;
-		$this->config = $config;
 	}
 
 	/**
-	 * Returns the step's name
-	 *
-	 * @return string
-	 * @since 9.1.0
-	 */
-	public function getName() {
-		return 'Copy twofactor backup codes from legacy table';
-	}
-
-	/**
-	 * Run repair step.
-	 * Must throw exception on error.
-	 *
-	 * @since 9.1.0
 	 * @param IOutput $output
-	 * @throws \Exception in case of failure
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @since 13.0.0
 	 */
-	public function run(IOutput $output) {
-		$version = $this->config->getAppValue('twofactor_backupcodes', 'installed_version', '0.0.0');
-		if (version_compare($version, '1.1.1', '>=')) {
-			return;
-		}
+	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+		/** @var Schema $schema */
+		$schema = $schemaClosure();
+		$prefix = $options['tablePrefix'];
 
-		if (!$this->connection->tableExists('twofactor_backup_codes')) {
+		if (!$schema->hasTable($prefix . 'twofactor_backup_codes')) {
 			// Legacy table does not exist
 			return;
 		}
@@ -102,7 +84,24 @@ class CopyEntriesFromOldTable implements IRepairStep {
 				->execute();
 		}
 		$output->finishProgress();
+	}
+
+	/**
+	 * @param IOutput $output
+	 * @param \Closure $schemaClosure The `\Closure` returns a `Schema`
+	 * @param array $options
+	 * @return null|Schema
+	 * @since 13.0.0
+	 */
+	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+		/** @var Schema $schema */
+		$schema = $schemaClosure();
+		$prefix = $options['tablePrefix'];
 
-		$this->connection->dropTable('twofactor_backup_codes');
+		if ($schema->hasTable($prefix . 'twofactor_backup_codes')) {
+			$schema->dropTable($prefix . 'twofactor_backup_codes');
+			return $schema;
+		}
+		return null;
 	}
 }