From 543c181ec5c0b41a6e54bc59bfc1501fa53e8052 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 7 Jun 2017 13:51:05 +0200 Subject: Move twofactor_backupcodes to migrations Signed-off-by: Joas Schilling --- .../lib/Migration/CopyEntriesFromOldTable.php | 108 --------------------- .../Migration/Version1002Date20170607104347.php | 72 ++++++++++++++ .../Migration/Version1002Date20170607113030.php | 107 ++++++++++++++++++++ 3 files changed, 179 insertions(+), 108 deletions(-) delete mode 100644 apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php create mode 100644 apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607104347.php create mode 100644 apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php (limited to 'apps/twofactor_backupcodes/lib/Migration') diff --git a/apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php b/apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php deleted file mode 100644 index 6d65a7d0c14..00000000000 --- a/apps/twofactor_backupcodes/lib/Migration/CopyEntriesFromOldTable.php +++ /dev/null @@ -1,108 +0,0 @@ - - * - * @author Joas Schilling - * - * @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 . - * - */ - -namespace OCA\TwoFactorBackupCodes\Migration; - -use OCP\DB\QueryBuilder\IQueryBuilder; -use OCP\IConfig; -use OCP\IDBConnection; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; - -class CopyEntriesFromOldTable implements IRepairStep { - - /** @var IDBConnection */ - protected $connection; - - /** @var IConfig */ - protected $config; - - /** - * @param IDBConnection $connection - * @param IConfig $config - */ - public function __construct(IDBConnection $connection, IConfig $config) { - $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 - */ - public function run(IOutput $output) { - $version = $this->config->getAppValue('twofactor_backupcodes', 'installed_version', '0.0.0'); - if (version_compare($version, '1.1.1', '>=')) { - return; - } - - if (!$this->connection->tableExists('twofactor_backup_codes')) { - // Legacy table does not exist - return; - } - - $insert = $this->connection->getQueryBuilder(); - $insert->insert('twofactor_backupcodes') - ->values([ - // Inserting with id might fail: 'id' => $insert->createParameter('id'), - 'user_id' => $insert->createParameter('user_id'), - 'code' => $insert->createParameter('code'), - 'used' => $insert->createParameter('used'), - ]); - - $query = $this->connection->getQueryBuilder(); - $query->select('*') - ->from('twofactor_backup_codes') - ->orderBy('id', 'ASC'); - $result = $query->execute(); - - $output->startProgress(); - while ($row = $result->fetch()) { - $output->advance(); - - $insert - // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) - ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) - ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) - ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) - ->execute(); - } - $output->finishProgress(); - - $this->connection->dropTable('twofactor_backup_codes'); - } -} 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 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ + +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/Version1002Date20170607113030.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php new file mode 100644 index 00000000000..1feae578965 --- /dev/null +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php @@ -0,0 +1,107 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ + +namespace OCA\TwoFactorBackupCodes\Migration; + +use Doctrine\DBAL\Schema\Schema; +use OCP\DB\QueryBuilder\IQueryBuilder; +use OCP\IDBConnection; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version1002Date20170607113030 extends SimpleMigrationStep { + + /** @var IDBConnection */ + protected $connection; + + /** + * @param IDBConnection $connection + */ + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `Schema` + * @param array $options + * @since 13.0.0 + */ + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var Schema $schema */ + $schema = $schemaClosure(); + $prefix = $options['tablePrefix']; + + if (!$schema->hasTable($prefix . 'twofactor_backup_codes')) { + // Legacy table does not exist + return; + } + + $insert = $this->connection->getQueryBuilder(); + $insert->insert('twofactor_backupcodes') + ->values([ + // Inserting with id might fail: 'id' => $insert->createParameter('id'), + 'user_id' => $insert->createParameter('user_id'), + 'code' => $insert->createParameter('code'), + 'used' => $insert->createParameter('used'), + ]); + + $query = $this->connection->getQueryBuilder(); + $query->select('*') + ->from('twofactor_backup_codes') + ->orderBy('id', 'ASC'); + $result = $query->execute(); + + $output->startProgress(); + while ($row = $result->fetch()) { + $output->advance(); + + $insert + // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT) + ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR) + ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR) + ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT) + ->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']; + + if ($schema->hasTable($prefix . 'twofactor_backup_codes')) { + $schema->dropTable($prefix . 'twofactor_backup_codes'); + return $schema; + } + return null; + } +} -- cgit v1.2.3