refactor: Use GlobalScale/IConfig everywhere

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php

@@ -14,6 +14,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\Job;
+use OCP\GlobalScale\IConfig as GlobalScaleConfig;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\IUser;
@@ -39,6 +40,7 @@ public function __construct(
 		private IUserManager $userManager,
 		private IAccountManager $accountManager,
 		private Signer $signer,
+		private GlobalScaleConfig $globalScaleConfig,
 	) {
 		parent::__construct($time);
 
@@ -86,7 +88,7 @@ public function start(IJobList $jobList): void {
 	protected function shouldRemoveBackgroundJob(): bool {
 		// TODO: Remove global scale condition once lookup server is used for non-global scale federation
 		// return $this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'no') !== 'yes'
-		return !$this->config->getSystemValueBool('gs.enabled', false)
+		return !$this->globalScaleConfig->isGlobalScaleEnabled()
 			|| $this->config->getSystemValueBool('has_internet_connection', true) === false
 			|| $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') === ''
 			|| $this->retries >= 5;

apps/lookup_server_connector/lib/UpdateLookupServer.php

@@ -11,6 +11,8 @@
 
 use OCA\LookupServerConnector\BackgroundJobs\RetryJob;
 use OCP\BackgroundJob\IJobList;
+use OCP\Config\IUserConfig;
+use OCP\GlobalScale\IConfig as GlobalScaleConfig;
 use OCP\IConfig;
 use OCP\IUser;
 
@@ -20,26 +22,21 @@
  * @package OCA\LookupServerConnector
  */
 class UpdateLookupServer {
-	/**
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
 	public function __construct(
-		private IJobList $jobList,
-		private IConfig $config,
+		private readonly IJobList $jobList,
+		private readonly IConfig $config,
+		private readonly IUserConfig $userConfig,
+		private readonly GlobalScaleConfig $globalScaleConfig,
 	) {
 	}
 
-	/**
-	 * @param IUser $user
-	 */
 	public function userUpdated(IUser $user): void {
 		if (!$this->shouldUpdateLookupServer()) {
 			return;
 		}
 
 		// Reset retry counter
-		$this->config->deleteUserValue(
+		$this->userConfig->deleteUserConfig(
 			$user->getUID(),
 			'lookup_server_connector',
 			'update_retries'
@@ -48,17 +45,15 @@ public function userUpdated(IUser $user): void {
 	}
 
 	/**
-	 * check if we should update the lookup server, we only do it if
+	 * Check if we should update the lookup server, we only do it if
 	 *
 	 * + we have an internet connection
 	 * + the lookup server update was not disabled by the admin
 	 * + we have a valid lookup server URL
-	 *
-	 * @return bool
 	 */
 	private function shouldUpdateLookupServer(): bool {
 		// TODO: Consider reenable for non-global-scale setups by checking "'files_sharing', 'lookupServerUploadEnabled'" instead of "gs.enabled"
-		return $this->config->getSystemValueBool('gs.enabled', false)
+		return $this->globalScaleConfig->isGlobalScaleEnabled()
 			&& $this->config->getSystemValueBool('has_internet_connection', true)
 			&& $this->config->getSystemValueString('lookup_server', 'https://lookup.nextcloud.com') !== '';
 	}

apps/oauth2/lib/Controller/LoginRedirectorController.php

@@ -30,24 +30,16 @@
 
 #[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 class LoginRedirectorController extends Controller {
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IURLGenerator $urlGenerator
-	 * @param ClientMapper $clientMapper
-	 * @param ISession $session
-	 * @param IL10N $l
-	 */
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private IURLGenerator $urlGenerator,
-		private ClientMapper $clientMapper,
-		private ISession $session,
-		private IL10N $l,
-		private ISecureRandom $random,
-		private IAppConfig $appConfig,
-		private IConfig $config,
+		private readonly IURLGenerator $urlGenerator,
+		private readonly ClientMapper $clientMapper,
+		private readonly ISession $session,
+		private readonly IL10N $l,
+		private readonly ISecureRandom $random,
+		private readonly IAppConfig $appConfig,
+		private readonly IConfig $config,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -62,15 +54,14 @@ public function __construct(
 	 * @return TemplateResponse<Http::STATUS_OK, array{}>|RedirectResponse<Http::STATUS_SEE_OTHER, array{}>
 	 *
 	 * 200: Client not found
-	 * 303: Redirect to login URL
+	 * 303: Redirect to the login URL
 	 */
 	#[PublicPage]
 	#[NoCSRFRequired]
 	#[UseSession]
-	public function authorize($client_id,
-		$state,
-		$response_type,
-		string $redirect_uri = ''): TemplateResponse|RedirectResponse {
+	public function authorize(
+		string $client_id, string $state, string $response_type, string $redirect_uri = '',
+	): TemplateResponse|RedirectResponse {
 		try {
 			$client = $this->clientMapper->getByIdentifier($client_id);
 		} catch (ClientNotFoundException $e) {

apps/oauth2/lib/Controller/OauthApiController.php

@@ -25,6 +25,7 @@
 use OCP\Authentication\Exceptions\ExpiredTokenException;
 use OCP\Authentication\Exceptions\InvalidTokenException;
 use OCP\DB\Exception;
+use OCP\GlobalScale\IConfig as GlobalScaleConfig;
 use OCP\IDBConnection;
 use OCP\IRequest;
 use OCP\Security\Bruteforce\IThrottler;
@@ -40,16 +41,17 @@ class OauthApiController extends Controller {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private ICrypto $crypto,
-		private AccessTokenMapper $accessTokenMapper,
-		private ClientMapper $clientMapper,
-		private TokenProvider $tokenProvider,
-		private ISecureRandom $secureRandom,
-		private ITimeFactory $time,
-		private LoggerInterface $logger,
-		private IThrottler $throttler,
-		private ITimeFactory $timeFactory,
-		private IDBConnection $db,
+		private readonly ICrypto $crypto,
+		private readonly AccessTokenMapper $accessTokenMapper,
+		private readonly ClientMapper $clientMapper,
+		private readonly TokenProvider $tokenProvider,
+		private readonly ISecureRandom $secureRandom,
+		private readonly ITimeFactory $time,
+		private readonly LoggerInterface $logger,
+		private readonly IThrottler $throttler,
+		private readonly ITimeFactory $timeFactory,
+		private readonly IDBConnection $db,
+		private readonly GlobalScaleConfig $globalScaleConfig,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -229,6 +231,11 @@ public function getToken(
 
 		$this->throttler->resetDelay($this->request->getRemoteAddress(), 'login', ['user' => $appToken->getUID()]);
 
+		if ($this->globalScaleConfig->isGlobalScaleEnabled() && $this->globalScaleConfig->isPrimary()) {
+			// Also make sure the access token is available on the secondary instance
+
+		}
+
 		return new JSONResponse(
 			[
 				'access_token' => $newToken,

apps/settings/lib/BackgroundJobs/VerifyUserData.php

@@ -15,6 +15,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\Job;
+use OCP\GlobalScale\IConfig as GlobalScaleConfig;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\IUserManager;
@@ -38,6 +39,7 @@ public function __construct(
 		private LoggerInterface $logger,
 		ITimeFactory $timeFactory,
 		private IConfig $config,
+		private GlobalScaleConfig $globalScaleConfig,
 	) {
 		parent::__construct($timeFactory);
 
@@ -124,7 +126,7 @@ protected function verifyWebsite(array $argument) {
 
 	protected function verifyViaLookupServer(array $argument, string $dataType): bool {
 		// TODO: Consider to enable for non-global-scale setups by checking 'files_sharing', 'lookupServerUploadEnabled'
-		if (!$this->config->getSystemValueBool('gs.enabled', false)
+		if (!$this->globalScaleConfig->isGlobalScaleEnabled()
 			|| empty($this->lookupServerUrl)
 			|| $this->config->getSystemValue('has_internet_connection', true) === false
 		) {

build/psalm-baseline.xml

@@ -2209,11 +2209,6 @@
       <code><![CDATA[setUserValue]]></code>
     </DeprecatedMethod>
   </file>
-  <file src="apps/lookup_server_connector/lib/UpdateLookupServer.php">
-    <DeprecatedMethod>
-      <code><![CDATA[deleteUserValue]]></code>
-    </DeprecatedMethod>
-  </file>
   <file src="apps/oauth2/lib/Controller/LoginRedirectorController.php">
     <DeprecatedMethod>
       <code><![CDATA[generate]]></code>

lib/private/Collaboration/Collaborators/LookupPlugin.php

@@ -12,6 +12,7 @@
 use OCP\Collaboration\Collaborators\ISearchResult;
 use OCP\Collaboration\Collaborators\SearchResultType;
 use OCP\Federation\ICloudIdManager;
+use OCP\GlobalScale\IConfig as GlobalScaleConfig;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\IUserSession;
@@ -23,20 +24,21 @@ class LookupPlugin implements ISearchPlugin {
 	private string $currentUserRemote;
 
 	public function __construct(
-		private IConfig $config,
-		private IClientService $clientService,
+		private readonly IConfig $config,
+		private readonly IClientService $clientService,
 		IUserSession $userSession,
-		private ICloudIdManager $cloudIdManager,
-		private LoggerInterface $logger,
-		private ?TrustedServers $trustedServers,
+		private readonly ICloudIdManager $cloudIdManager,
+		private readonly LoggerInterface $logger,
+		private readonly ?TrustedServers $trustedServers,
+		private readonly GlobalScaleConfig $globalScaleConfig,
 	) {
 		$currentUserCloudId = $userSession->getUser()->getCloudId();
 		$this->currentUserRemote = $cloudIdManager->resolveCloudId($currentUserCloudId)->getRemote();
 	}
 
 	#[\Override]
 	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		$isGlobalScaleEnabled = $this->config->getSystemValueBool('gs.enabled', false);
+		$isGlobalScaleEnabled = $this->globalScaleConfig->isGlobalScaleEnabled();
 		$isLookupServerEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no') === 'yes';
 		$hasInternetConnection = $this->config->getSystemValueBool('has_internet_connection', true);