aboutsummaryrefslogtreecommitdiffstats
path: root/core/Db
diff options
context:
space:
mode:
Diffstat (limited to 'core/Db')
-rw-r--r--core/Db/LoginFlowV2.php26
-rw-r--r--core/Db/LoginFlowV2Mapper.php41
-rw-r--r--core/Db/ProfileConfig.php76
-rw-r--r--core/Db/ProfileConfigMapper.php24
4 files changed, 30 insertions, 137 deletions
diff --git a/core/Db/LoginFlowV2.php b/core/Db/LoginFlowV2.php
index ddf9a5f6413..1671e5990e0 100644
--- a/core/Db/LoginFlowV2.php
+++ b/core/Db/LoginFlowV2.php
@@ -3,29 +3,13 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Core\Db;
use OCP\AppFramework\Db\Entity;
+use OCP\DB\Types;
/**
* @method int getTimestamp()
@@ -72,8 +56,8 @@ class LoginFlowV2 extends Entity {
protected $appPassword;
public function __construct() {
- $this->addType('timestamp', 'int');
- $this->addType('started', 'int');
+ $this->addType('timestamp', Types::INTEGER);
+ $this->addType('started', Types::INTEGER);
$this->addType('pollToken', 'string');
$this->addType('loginToken', 'string');
$this->addType('publicKey', 'string');
diff --git a/core/Db/LoginFlowV2Mapper.php b/core/Db/LoginFlowV2Mapper.php
index 0e44418e010..32664917cb5 100644
--- a/core/Db/LoginFlowV2Mapper.php
+++ b/core/Db/LoginFlowV2Mapper.php
@@ -3,25 +3,8 @@
declare(strict_types=1);
/**
- * @copyright Copyright (c) 2019, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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/>.
- *
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Core\Db;
@@ -30,15 +13,21 @@ use OCP\AppFramework\Db\QBMapper;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IDBConnection;
+/**
+ * @template-extends QBMapper<LoginFlowV2>
+ */
class LoginFlowV2Mapper extends QBMapper {
private const lifetime = 1200;
- /** @var ITimeFactory */
- private $timeFactory;
-
- public function __construct(IDBConnection $db, ITimeFactory $timeFactory) {
- parent::__construct($db, 'login_flow_v2', LoginFlowV2::class);
- $this->timeFactory = $timeFactory;
+ public function __construct(
+ IDBConnection $db,
+ private ITimeFactory $timeFactory,
+ ) {
+ parent::__construct(
+ $db,
+ 'login_flow_v2',
+ LoginFlowV2::class,
+ );
}
/**
@@ -82,7 +71,7 @@ class LoginFlowV2Mapper extends QBMapper {
$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
);
- $qb->execute();
+ $qb->executeStatement();
}
/**
diff --git a/core/Db/ProfileConfig.php b/core/Db/ProfileConfig.php
index eb50da37a64..226a77b7330 100644
--- a/core/Db/ProfileConfig.php
+++ b/core/Db/ProfileConfig.php
@@ -3,35 +3,17 @@
declare(strict_types=1);
/**
- * @copyright 2021 Christopher Ng <chrng8@gmail.com>
- *
- * @author Christopher Ng <chrng8@gmail.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/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Core\Db;
-use function Safe\json_decode;
-use function Safe\json_encode;
-use \JsonSerializable;
-use OCP\Accounts\IAccountManager;
+use JsonSerializable;
use OCP\AppFramework\Db\Entity;
use OCP\Profile\ParameterDoesNotExistException;
+use function json_decode;
+use function json_encode;
/**
* @method string getUserId()
@@ -40,54 +22,6 @@ use OCP\Profile\ParameterDoesNotExistException;
* @method void setConfig(string $config)
*/
class ProfileConfig extends Entity implements JsonSerializable {
-
- /**
- * Visible to users, guests, and public access
- *
- * @since 23.0.0
- */
- public const VISIBILITY_SHOW = 'show';
-
- /**
- * Visible to users and guests
- *
- * @since 23.0.0
- */
- public const VISIBILITY_SHOW_USERS_ONLY = 'show_users_only';
-
- /**
- * Visible to nobody
- *
- * @since 23.0.0
- */
- public const VISIBILITY_HIDE = 'hide';
-
- /**
- * Default account property visibility
- *
- * @since 23.0.0
- */
- public const DEFAULT_PROPERTY_VISIBILITY = [
- IAccountManager::PROPERTY_ADDRESS => self::VISIBILITY_SHOW_USERS_ONLY,
- IAccountManager::PROPERTY_AVATAR => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_BIOGRAPHY => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_DISPLAYNAME => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_HEADLINE => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_ORGANISATION => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_ROLE => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_EMAIL => self::VISIBILITY_SHOW_USERS_ONLY,
- IAccountManager::PROPERTY_PHONE => self::VISIBILITY_SHOW_USERS_ONLY,
- IAccountManager::PROPERTY_TWITTER => self::VISIBILITY_SHOW,
- IAccountManager::PROPERTY_WEBSITE => self::VISIBILITY_SHOW,
- ];
-
- /**
- * Default visibility
- *
- * @since 23.0.0
- */
- public const DEFAULT_VISIBILITY = self::VISIBILITY_SHOW_USERS_ONLY;
-
/** @var string */
protected $userId;
diff --git a/core/Db/ProfileConfigMapper.php b/core/Db/ProfileConfigMapper.php
index a8b1e35f747..26e3d2da19f 100644
--- a/core/Db/ProfileConfigMapper.php
+++ b/core/Db/ProfileConfigMapper.php
@@ -3,25 +3,8 @@
declare(strict_types=1);
/**
- * @copyright 2021 Christopher Ng <chrng8@gmail.com>
- *
- * @author Christopher Ng <chrng8@gmail.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/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace OC\Core\Db;
@@ -29,6 +12,9 @@ namespace OC\Core\Db;
use OCP\AppFramework\Db\QBMapper;
use OCP\IDBConnection;
+/**
+ * @template-extends QBMapper<ProfileConfig>
+ */
class ProfileConfigMapper extends QBMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'profile_config', ProfileConfig::class);