diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index 92300320e1..b5399fbd77 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -5,7 +5,7 @@ A two-factor auth backup codes provider agpl Christoph Wurst - 1.2.0 + 1.2.1 TwoFactorBackupCodes other @@ -28,4 +28,9 @@ OCA\TwoFactorBackupCodes\Migration\CopyEntriesFromOldTable + + + OCA\TwoFactorBackupCodes\Settings\Personal + OCA\TwoFactorBackupCodes\Settings\PersonalSection + diff --git a/apps/twofactor_backupcodes/lib/AppInfo/Application.php b/apps/twofactor_backupcodes/lib/AppInfo/Application.php index ad92c0b147..050473f7ef 100644 --- a/apps/twofactor_backupcodes/lib/AppInfo/Application.php +++ b/apps/twofactor_backupcodes/lib/AppInfo/Application.php @@ -37,7 +37,6 @@ class Application extends App { */ public function register() { $this->registerHooksAndEvents(); - $this->registerPersonalPage(); } /** @@ -52,11 +51,4 @@ class Application extends App { $mapper = $this->getContainer()->query(BackupCodeMapper::class); $mapper->deleteCodesByUserId($params['uid']); } - - /** - * Register personal settings for notifications and emails - */ - public function registerPersonalPage() { - \OCP\App::registerPersonal($this->getContainer()->getAppName(), 'settings/personal'); - } } diff --git a/apps/twofactor_backupcodes/lib/Settings/Personal.php b/apps/twofactor_backupcodes/lib/Settings/Personal.php new file mode 100644 index 0000000000..0edd86fb14 --- /dev/null +++ b/apps/twofactor_backupcodes/lib/Settings/Personal.php @@ -0,0 +1,82 @@ + + * + * @author Arthur Schiwon + * + * @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\Settings; + + +use OCA\TwoFactorBackupCodes\AppInfo\Application; +use OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider; +use OCP\AppFramework\Http\TemplateResponse; +use OCP\IUserSession; +use OCP\Settings\ISettings; + +class Personal implements ISettings { + + /** @var Application */ + private $app; + /** @var BackupCodesProvider */ + private $provider; + /** @var IUserSession */ + private $userSession; + + public function __construct(Application $app, BackupCodesProvider $provider, IUserSession $userSession) { + $this->app = $app; + $this->provider = $provider; + $this->userSession = $userSession; + } + + /** + * @return TemplateResponse returns the instance with all parameters set, ready to be rendered + * @since 9.1 + */ + public function getForm() { + $templateOwner = 'settings'; + $templateName = 'settings/empty'; + if ($this->provider->isActive($this->userSession->getUser())) { + $templateOwner = $this->app->getContainer()->getAppName(); + $templateName = 'personal'; + } + + return new TemplateResponse($templateOwner, $templateName, [], ''); + } + + /** + * @return string the section ID, e.g. 'sharing' + * @since 9.1 + */ + public function getSection() { + return 'twofactor'; + } + + /** + * @return int whether the form should be rather on the top or bottom of + * the admin section. The forms are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. + * + * E.g.: 70 + * @since 9.1 + */ + public function getPriority() { + return 85; + } +} diff --git a/apps/twofactor_backupcodes/lib/Settings/PersonalSection.php b/apps/twofactor_backupcodes/lib/Settings/PersonalSection.php new file mode 100644 index 0000000000..eb023306c3 --- /dev/null +++ b/apps/twofactor_backupcodes/lib/Settings/PersonalSection.php @@ -0,0 +1,98 @@ + + * + * @author Arthur Schiwon + * + * @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\Settings; + + +use OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider; +use OCP\IL10N; +use OCP\IURLGenerator; +use OCP\IUserSession; +use OCP\Settings\IIconSection; + +class PersonalSection implements IIconSection { + + /** @var IURLGenerator */ + private $urlGenerator; + /** @var IL10N */ + private $l; + /** @var BackupCodesProvider */ + private $provider; + /** @var IUserSession */ + private $userSession; + + public function __construct(IURLGenerator $urlGenerator, IL10N $l, BackupCodesProvider $provider, IUserSession $userSession) { + $this->urlGenerator = $urlGenerator; + $this->l = $l; + $this->provider = $provider; + $this->userSession = $userSession; + } + + /** + * returns the relative path to an 16*16 icon describing the section. + * e.g. '/core/img/places/files.svg' + * + * @returns string + * @since 12 + */ + public function getIcon() { + return $this->urlGenerator->imagePath('settings', 'password.svg'); + } + + /** + * returns the ID of the section. It is supposed to be a lower case string, + * e.g. 'ldap' + * + * @returns string + * @since 9.1 + */ + public function getID() { + if (!$this->provider->isActive($this->userSession->getUser())) { + return null; + } + return 'twofactor'; + } + + /** + * returns the translated name as it should be displayed, e.g. 'LDAP / AD + * integration'. Use the L10N service to translate it. + * + * @return string + * @since 9.1 + */ + public function getName() { + return $this->l->t('Second factor auth'); + } + + /** + * @return int whether the form should be rather on the top or bottom of + * the settings navigation. The sections are arranged in ascending order of + * the priority values. It is required to return a value between 0 and 99. + * + * E.g.: 70 + * @since 9.1 + */ + public function getPriority() { + return 8; + } +} diff --git a/apps/twofactor_backupcodes/settings/personal.php b/apps/twofactor_backupcodes/settings/personal.php deleted file mode 100644 index 48c84a3355..0000000000 --- a/apps/twofactor_backupcodes/settings/personal.php +++ /dev/null @@ -1,19 +0,0 @@ -query(BackupCodesProvider::class); -$user = OC::$server->getUserSession()->getUser(); - -if ($provider->isActive($user)) { - $tmpl = new Template('twofactor_backupcodes', 'personal'); - return $tmpl->fetchPage(); -} else { - return ""; -} - -// @codeCoverageIgnoreEnd diff --git a/settings/templates/settings/empty.php b/settings/templates/settings/empty.php index e7e728f87b..0ed8a873d3 100644 --- a/settings/templates/settings/empty.php +++ b/settings/templates/settings/empty.php @@ -21,6 +21,5 @@ * */ + # used for Personal/Additional settings as fallback for legacy settings ?> - -