fix(ci): Use commands to setup accounts

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

.github/workflows/integration-test.yml

@@ -64,22 +64,6 @@ jobs:
           git submodule update --init
           php occ maintenance:install --verbose --admin-user admin --admin-pass admin
 
-      - name: Prepare config (will be encrypted by migration)
-        working-directory: server/
-        env:
-          DROPBOX_CONFIG: ${{ secrets.DROPBOX_CONFIG }}
-          OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }}
-          OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }}
-        run: |
-          echo $DROPBOX_CONFIG > config.json
-          sudo apt install jq sqlite3
-          sqlite3 data/owncloud.db "INSERT INTO oc_preferences  ( userid, appid, configkey, configvalue, type) VALUES ('admin', 'integration_dropbox', 'account_id', $(cat config.json | jq '.config.account_id'), 1);"
-          sqlite3 data/owncloud.db "INSERT INTO oc_preferences  ( userid, appid, configkey, configvalue, type) VALUES ('admin', 'integration_dropbox', 'token', $(cat config.json | jq '.config.token'), 1);"
-          sqlite3 data/owncloud.db "INSERT INTO oc_preferences  ( userid, appid, configkey, configvalue, type) VALUES ('admin', 'integration_dropbox', 'refresh_token', $(cat config.json | jq '.config.refresh_token'), 1);"
-          sqlite3 data/owncloud.db "INSERT INTO oc_preferences  ( userid, appid, configkey, configvalue, type) VALUES ('admin', 'integration_dropbox', 'importing_dropbox', '1', 1);"
-          sqlite3 data/owncloud.db "INSERT INTO oc_appconfig  ( appid, configkey, configvalue, type) VALUES ('integration_dropbox', 'client_id', '$OAUTH_CLIENT_ID', 4);"
-          sqlite3 data/owncloud.db "INSERT INTO oc_appconfig  ( appid, configkey, configvalue, type) VALUES ('integration_dropbox', 'client_secret', '$OAUTH_CLIENT_SECRET', 4);"
-
       - name: Checkout app
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -104,7 +88,14 @@ jobs:
 
       - name: Run import
         working-directory: server/
+        env:
+          DROPBOX_CONFIG: ${{ secrets.DROPBOX_CONFIG }}
+          OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }}
+          OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }}
         run: |
+          echo $DROPBOX_CONFIG > config.json
+          php occ integration_dropbox:setup $OAUTH_CLIENT_ID $OAUTH_CLIENT_SECRET
+          php occ integration_dropbox:setup-user admin "$(cat config.json | jq '.config.account_id' | sed 's/["'\'']//g')" "$(cat config.json | jq '.config.refresh_token' | sed 's/["'\'']//g')"
           php occ integration_dropbox:start-import admin
           for run in {1..10}; do date; echo "run $run starting"; php cron.php; ls -lh data/admin/files/Dropbox\ import/ ; echo "run $run done"; done
           date

appinfo/info.xml

@@ -24,6 +24,8 @@
     </dependencies>
     <commands>
         <command>OCA\Dropbox\Command\StartImport</command>
+        <command>OCA\Dropbox\Command\Setup</command>
+        <command>OCA\Dropbox\Command\SetupUser</command>
     </commands>
     <settings>
         <admin>OCA\Dropbox\Settings\Admin</admin>

lib/Command/Setup.php

@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Dropbox\Command;
+
+use OCA\Dropbox\Service\SecretService;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Setup extends Command {
+	public function __construct(
+		private SecretService $secretService,
+	) {
+		parent::__construct();
+	}
+
+	/**
+	 * Configure the command
+	 *
+	 * @return void
+	 */
+	protected function configure() {
+		$this->setName('integration_dropbox:setup')
+			->addArgument('client_id', InputArgument::REQUIRED)
+			->addArgument('client_secret', InputArgument::REQUIRED)
+			->setDescription('Setup the client credentials');
+	}
+
+	/**
+	 * Execute the command
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		try {
+			$this->secretService->setEncryptedAppValue('client_id', $input->getArgument('client_id'));
+			$this->secretService->setEncryptedAppValue('client_secret', $input->getArgument('client_secret'));
+		} catch (\Exception $ex) {
+			$output->writeln('<error>Failed to setup client credentials</error>');
+			$output->writeln($ex->getMessage());
+			return 1;
+		}
+
+		return 0;
+	}
+}

lib/Command/SetupUser.php

@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Dropbox\Command;
+
+use OCA\Dropbox\AppInfo\Application;
+use OCA\Dropbox\Service\SecretService;
+use OCP\Config\IUserConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class SetupUser extends Command {
+	public function __construct(
+		private SecretService $secretService,
+		private IUserConfig $userConfig,
+	) {
+		parent::__construct();
+	}
+
+	/**
+	 * Configure the command
+	 *
+	 * @return void
+	 */
+	protected function configure() {
+		$this->setName('integration_dropbox:setup-user')
+			->addArgument('userId', InputArgument::REQUIRED)
+			->addArgument('accountId', InputArgument::REQUIRED)
+			->addArgument('refresh_token', InputArgument::REQUIRED)
+			->setDescription('Setup the client credentials');
+	}
+
+	/**
+	 * Execute the command
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @return int
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		try {
+			$this->userConfig->setValueString($input->getArgument('userId'), Application::APP_ID, 'account_id', $input->getArgument('accountId'), lazy: true);
+			$this->secretService->setEncryptedUserValue($input->getArgument('userId'), 'refresh_token', $input->getArgument('refresh_token'));
+			$this->secretService->setEncryptedUserValue($input->getArgument('userId'), 'token', 'abc');
+		} catch (\Exception $ex) {
+			$output->writeln('<error>Failed to setup client credentials</error>');
+			$output->writeln($ex->getMessage());
+			return 1;
+		}
+
+		return 0;
+	}
+}