From 77c9ff838a9481eb6b1b0e8d253a8d47b3c09bb5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 30 Jun 2020 21:16:40 +0200
Subject: [PATCH] Move federation to migrations
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/federation/appinfo/database.xml | 68 ---------------
apps/federation/appinfo/info.xml | 2 +-
.../Version1010Date20200630191302.php | 83 +++++++++++++++++++
3 files changed, 84 insertions(+), 69 deletions(-)
delete mode 100644 apps/federation/appinfo/database.xml
create mode 100644 apps/federation/lib/Migration/Version1010Date20200630191302.php
diff --git a/apps/federation/appinfo/database.xml b/apps/federation/appinfo/database.xml
deleted file mode 100644
index 61c3b8ac6d8..00000000000
--- a/apps/federation/appinfo/database.xml
+++ /dev/null
@@ -1,68 +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*trusted_servers</name>
- <declaration>
- <field>
- <name>id</name>
- <type>integer</type>
- <default>0</default>
- <notnull>true</notnull>
- <autoincrement>1</autoincrement>
- <length>4</length>
- </field>
- <field>
- <name>url</name>
- <type>text</type>
- <notnull>true</notnull>
- <length>512</length>
- <comments>Url of trusted server</comments>
- </field>
- <field>
- <name>url_hash</name>
- <type>text</type>
- <default></default>
- <notnull>true</notnull>
- <comments>sha1 hash of the url without the protocol</comments>
- </field>
- <field>
- <name>token</name>
- <type>text</type>
- <length>128</length>
- <comments>token used to exchange the shared secret</comments>
- </field>
- <field>
- <name>shared_secret</name>
- <type>text</type>
- <length>256</length>
- <comments>shared secret used to authenticate</comments>
- </field>
- <field>
- <name>status</name>
- <type>integer</type>
- <length>4</length>
- <notnull>true</notnull>
- <default>2</default>
- <comments>current status of the connection</comments>
- </field>
- <field>
- <name>sync_token</name>
- <type>text</type>
- <length>512</length>
- <comments>cardDav sync token</comments>
- </field>
- <index>
- <name>url_hash</name>
- <unique>true</unique>
- <field>
- <name>url_hash</name>
- <sorting>ascending</sorting>
- </field>
- </index>
- </declaration>
- </table>
-</database>
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index b56b64bf229..fd6cb3e6e50 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -5,7 +5,7 @@
<name>Federation</name>
<summary>Federation allows you to connect with other trusted servers to exchange the user directory.</summary>
<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
- <version>1.10.0</version>
+ <version>1.10.1</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>Federation</namespace>
diff --git a/apps/federation/lib/Migration/Version1010Date20200630191302.php b/apps/federation/lib/Migration/Version1010Date20200630191302.php
new file mode 100644
index 00000000000..13aaedd6c06
--- /dev/null
+++ b/apps/federation/lib/Migration/Version1010Date20200630191302.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * @copyright Copyright (c) 2020 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\Federation\Migration;
+
+use Closure;
+use Doctrine\DBAL\Types\Types;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1010Date20200630191302 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('trusted_servers')) {
+ $table = $schema->createTable('trusted_servers');
+ $table->addColumn('id', Types::INTEGER, [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('url', Types::STRING, [
+ 'notnull' => true,
+ 'length' => 512,
+ ]);
+ $table->addColumn('url_hash', Types::STRING, [
+ 'notnull' => true,
+ 'default' => '',
+ ]);
+ $table->addColumn('token', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 128,
+ ]);
+ $table->addColumn('shared_secret', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 256,
+ ]);
+ $table->addColumn('status', Types::INTEGER, [
+ 'notnull' => true,
+ 'length' => 4,
+ 'default' => 2,
+ ]);
+ $table->addColumn('sync_token', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 512,
+ ]);
+ $table->setPrimaryKey(['id']);
+ $table->addUniqueIndex(['url_hash'], 'url_hash');
+ }
+ return $schema;
+ }
+}
--
GitLab