From d7223ebf4d209230e761a4a75728b3f2ec794b66 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 7 Dec 2018 20:08:11 +0100 Subject: [PATCH 1/2] OAuth2: Move to migrations Signed-off-by: Roeland Jago Douma --- apps/oauth2/appinfo/database.xml | 100 ------------------ .../Version010401Date20181207190718.php | 98 +++++++++++++++++ 2 files changed, 98 insertions(+), 100 deletions(-) delete mode 100644 apps/oauth2/appinfo/database.xml create mode 100644 apps/oauth2/lib/Migration/Version010401Date20181207190718.php diff --git a/apps/oauth2/appinfo/database.xml b/apps/oauth2/appinfo/database.xml deleted file mode 100644 index db32e0cf97..0000000000 --- a/apps/oauth2/appinfo/database.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - *dbname* - true - false - utf8 - - *dbprefix*oauth2_clients - - - id - integer - true - true - true - true - - - name - text - true - 64 - - - redirect_uri - text - true - 2000 - - - client_identifier - text - true - 64 - - - secret - text - true - 64 - - - oauth2_client_id_idx - false - - client_identifier - - - -
- - *dbprefix*oauth2_access_tokens - - - id - integer - true - true - true - true - - - token_id - integer - true - - - client_id - integer - true - - - hashed_code - text - true - 128 - - - encrypted_token - text - true - 786 - - - oauth2_access_hash_idx - true - - hashed_code - - - - oauth2_access_client_id_idx - false - - client_id - - - -
- diff --git a/apps/oauth2/lib/Migration/Version010401Date20181207190718.php b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php new file mode 100644 index 0000000000..14d925d3b6 --- /dev/null +++ b/apps/oauth2/lib/Migration/Version010401Date20181207190718.php @@ -0,0 +1,98 @@ + + * + * @author Roeland Jago Douma + * + * @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\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; + } +} From 35886b1e5edad7c38f3e5a6ce786d5d426c7d34f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 10 Dec 2018 10:01:19 +0100 Subject: [PATCH 2/2] Bump autoloader Signed-off-by: Roeland Jago Douma --- apps/oauth2/composer/composer/autoload_classmap.php | 1 + apps/oauth2/composer/composer/autoload_static.php | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/oauth2/composer/composer/autoload_classmap.php b/apps/oauth2/composer/composer/autoload_classmap.php index c933a1bf21..2773810bd0 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 aaac9e4f6d..c4401a0a21 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', );