nextcloud / server

lib/private/Profile/ProfileManager.php

Indentation +387 added lines, -387 removed lines

@@ -38,391 +38,391 @@
  * @psalm-import-type CoreProfileFields from ResponseDefinitions
  */
 class ProfileManager implements IProfileManager {
-	/** @var ILinkAction[] */
-	private array $actions = [];
-
-	/** @var null|ILinkAction[] */
-	private ?array $sortedActions = null;
-	/** @var CappedMemoryCache<ProfileConfig> */
-	private CappedMemoryCache $configCache;
-
-	private const CORE_APP_ID = 'core';
-
-	/**
-	 * Array of account property actions
-	 */
-	private const ACCOUNT_PROPERTY_ACTIONS = [
-		EmailAction::class,
-		PhoneAction::class,
-		WebsiteAction::class,
-		TwitterAction::class,
-		FediverseAction::class,
-	];
-
-	/**
-	 * Array of account properties displayed on the profile
-	 */
-	private const PROFILE_PROPERTIES = [
-		IAccountManager::PROPERTY_ADDRESS,
-		IAccountManager::PROPERTY_AVATAR,
-		IAccountManager::PROPERTY_BIOGRAPHY,
-		IAccountManager::PROPERTY_DISPLAYNAME,
-		IAccountManager::PROPERTY_HEADLINE,
-		IAccountManager::PROPERTY_ORGANISATION,
-		IAccountManager::PROPERTY_ROLE,
-		IAccountManager::PROPERTY_PRONOUNS,
-	];
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IAppManager $appManager,
-		private IConfig $config,
-		private ProfileConfigMapper $configMapper,
-		private ContainerInterface $container,
-		private KnownUserService $knownUserService,
-		private IFactory $l10nFactory,
-		private LoggerInterface $logger,
-		private Coordinator $coordinator,
-	) {
-		$this->configCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * If no user is passed as an argument return whether profile is enabled globally in `config.php`
-	 */
-	public function isProfileEnabled(?IUser $user = null): bool {
-		$profileEnabledGlobally = $this->config->getSystemValueBool('profile.enabled', true);
-
-		if (empty($user) || !$profileEnabledGlobally) {
-			return $profileEnabledGlobally;
-		}
-
-		$account = $this->accountManager->getAccount($user);
-		return (bool)filter_var(
-			$account->getProperty(IAccountManager::PROPERTY_PROFILE_ENABLED)->getValue(),
-			FILTER_VALIDATE_BOOLEAN,
-			FILTER_NULL_ON_FAILURE,
-		);
-	}
-
-	/**
-	 * Register an action for the user
-	 */
-	private function registerAction(ILinkAction $action, IUser $targetUser, ?IUser $visitingUser): void {
-		$action->preload($targetUser);
-
-		if ($action->getTarget() === null) {
-			// Actions without a target are not registered
-			return;
-		}
-
-		if ($action->getAppId() !== self::CORE_APP_ID) {
-			if (!$this->appManager->isEnabledForUser($action->getAppId(), $targetUser)) {
-				$this->logger->notice('App: ' . $action->getAppId() . ' cannot register actions as it is not enabled for the target user: ' . $targetUser->getUID());
-				return;
-			}
-			if (!$this->appManager->isEnabledForUser($action->getAppId(), $visitingUser)) {
-				$this->logger->notice('App: ' . $action->getAppId() . ' cannot register actions as it is not enabled for the visiting user: ' . ($visitingUser ? $visitingUser->getUID() : '(user not connected)'));
-				return;
-			}
-		}
-
-		if (in_array($action->getId(), self::PROFILE_PROPERTIES, true)) {
-			$this->logger->error('Cannot register action with ID: ' . $action->getId() . ', as it is used by a core account property.');
-			return;
-		}
-
-		if (isset($this->actions[$action->getId()])) {
-			$this->logger->error('Cannot register duplicate action: ' . $action->getId());
-			return;
-		}
-
-		// Add action to associative array of actions
-		$this->actions[$action->getId()] = $action;
-	}
-
-	/**
-	 * Return an array of registered profile actions for the user
-	 *
-	 * @return ILinkAction[]
-	 */
-	private function getActions(IUser $targetUser, ?IUser $visitingUser): array {
-		// If actions are already registered and sorted, return them
-		if ($this->sortedActions !== null) {
-			return $this->sortedActions;
-		}
-
-		foreach (self::ACCOUNT_PROPERTY_ACTIONS as $actionClass) {
-			/** @var ILinkAction $action */
-			$action = $this->container->get($actionClass);
-			$this->registerAction($action, $targetUser, $visitingUser);
-		}
-
-		$context = $this->coordinator->getRegistrationContext();
-
-		if ($context !== null) {
-			foreach ($context->getProfileLinkActions() as $registration) {
-				/** @var ILinkAction $action */
-				$action = $this->container->get($registration->getService());
-				$this->registerAction($action, $targetUser, $visitingUser);
-			}
-		}
-
-		$actionsClone = $this->actions;
-		// Sort associative array into indexed array in ascending order of priority
-		usort($actionsClone, function (ILinkAction $a, ILinkAction $b) {
-			return $a->getPriority() === $b->getPriority() ? 0 : ($a->getPriority() < $b->getPriority() ? -1 : 1);
-		});
-
-		$this->sortedActions = $actionsClone;
-		return $this->sortedActions;
-	}
-
-	/**
-	 * Return whether the profile parameter of the target user
-	 * is visible to the visiting user
-	 */
-	public function isProfileFieldVisible(string $profileField, IUser $targetUser, ?IUser $visitingUser): bool {
-		try {
-			$account = $this->accountManager->getAccount($targetUser);
-			$scope = $account->getProperty($profileField)->getScope();
-		} catch (PropertyDoesNotExistException $e) {
-			// Allow the exception as not all profile parameters are account properties
-		}
-
-		$visibility = $this->getProfileConfig($targetUser, $visitingUser)[$profileField]['visibility'];
-		// Handle profile visibility and account property scope
-
-		if ($visibility === self::VISIBILITY_SHOW_USERS_ONLY) {
-			if (empty($scope)) {
-				return $visitingUser !== null;
-			}
-
-			return match ($scope) {
-				IAccountManager::SCOPE_PRIVATE => $visitingUser !== null && $this->knownUserService->isKnownToUser($targetUser->getUID(), $visitingUser->getUID()),
-				IAccountManager::SCOPE_LOCAL,
-				IAccountManager::SCOPE_FEDERATED,
-				IAccountManager::SCOPE_PUBLISHED => $visitingUser !== null,
-				default => false,
-			};
-		}
-
-		if ($visibility === self::VISIBILITY_SHOW) {
-			if (empty($scope)) {
-				return true;
-			}
-
-			return match ($scope) {
-				IAccountManager::SCOPE_PRIVATE => $visitingUser !== null && $this->knownUserService->isKnownToUser($targetUser->getUID(), $visitingUser->getUID()),
-				IAccountManager::SCOPE_LOCAL,
-				IAccountManager::SCOPE_FEDERATED,
-				IAccountManager::SCOPE_PUBLISHED => true,
-				default => false,
-			};
-		}
-
-		return false;
-	}
-
-	/**
-	 * Return the profile parameters of the target user that are visible to the visiting user
-	 * in an associative array
-	 * @psalm-return CoreProfileFields
-	 */
-	public function getProfileFields(IUser $targetUser, ?IUser $visitingUser): array {
-		$account = $this->accountManager->getAccount($targetUser);
-
-		// Initialize associative array of profile parameters
-		$profileParameters = [
-			'userId' => $account->getUser()->getUID(),
-		];
-
-		// Add account properties
-		foreach (self::PROFILE_PROPERTIES as $property) {
-			switch ($property) {
-				case IAccountManager::PROPERTY_ADDRESS:
-				case IAccountManager::PROPERTY_BIOGRAPHY:
-				case IAccountManager::PROPERTY_DISPLAYNAME:
-				case IAccountManager::PROPERTY_HEADLINE:
-				case IAccountManager::PROPERTY_ORGANISATION:
-				case IAccountManager::PROPERTY_ROLE:
-				case IAccountManager::PROPERTY_PRONOUNS:
-					$profileParameters[$property] =
-						$this->isProfileFieldVisible($property, $targetUser, $visitingUser)
-						// Explicitly set to null when value is empty string
-						? ($account->getProperty($property)->getValue() ?: null)
-						: null;
-					break;
-				case IAccountManager::PROPERTY_AVATAR:
-					// Add avatar visibility
-					$profileParameters['isUserAvatarVisible'] = $this->isProfileFieldVisible($property, $targetUser, $visitingUser);
-					break;
-			}
-		}
-
-		// Add actions
-		$profileParameters['actions'] = array_map(
-			function (ILinkAction $action) {
-				return [
-					'id' => $action->getId(),
-					'icon' => $action->getIcon(),
-					'title' => $action->getTitle(),
-					'target' => $action->getTarget(),
-				];
-			},
-			// This is needed to reindex the array after filtering
-			array_values(
-				array_filter(
-					$this->getActions($targetUser, $visitingUser),
-					function (ILinkAction $action) use ($targetUser, $visitingUser) {
-						return $this->isProfileFieldVisible($action->getId(), $targetUser, $visitingUser);
-					}
-				),
-			)
-		);
-
-		return $profileParameters;
-	}
-
-	/**
-	 * Return the filtered profile config containing only
-	 * the properties to be stored on the database
-	 */
-	private function filterNotStoredProfileConfig(array $profileConfig): array {
-		$dbParamConfigProperties = [
-			'visibility',
-		];
-
-		foreach ($profileConfig as $paramId => $paramConfig) {
-			$profileConfig[$paramId] = array_intersect_key($paramConfig, array_flip($dbParamConfigProperties));
-		}
-
-		return $profileConfig;
-	}
-
-	/**
-	 * Return the default profile config
-	 */
-	private function getDefaultProfileConfig(IUser $targetUser, ?IUser $visitingUser): array {
-		// Construct the default config for actions
-		$actionsConfig = [];
-		foreach ($this->getActions($targetUser, $visitingUser) as $action) {
-			$actionsConfig[$action->getId()] = ['visibility' => self::DEFAULT_VISIBILITY];
-		}
-
-		// Construct the default config for account properties
-		$propertiesConfig = [];
-		foreach (self::DEFAULT_PROPERTY_VISIBILITY as $property => $visibility) {
-			$propertiesConfig[$property] = ['visibility' => $visibility];
-		}
-
-		return array_merge($actionsConfig, $propertiesConfig);
-	}
-
-	/**
-	 * Return the profile config of the target user,
-	 * if a config does not already exist a default config is created and returned
-	 */
-	public function getProfileConfig(IUser $targetUser, ?IUser $visitingUser): array {
-		$defaultProfileConfig = $this->getDefaultProfileConfig($targetUser, $visitingUser);
-		try {
-			if (($config = $this->configCache[$targetUser->getUID()]) === null) {
-				$config = $this->configMapper->get($targetUser->getUID());
-				$this->configCache[$targetUser->getUID()] = $config;
-			}
-			// Merge defaults with the existing config in case the defaults are missing
-			$config->setConfigArray(array_merge(
-				$defaultProfileConfig,
-				$this->filterNotStoredProfileConfig($config->getConfigArray()),
-			));
-			$this->configMapper->update($config);
-			$configArray = $config->getConfigArray();
-		} catch (DoesNotExistException $e) {
-			// Create a new default config if it does not exist
-			$config = new ProfileConfig();
-			$config->setUserId($targetUser->getUID());
-			$config->setConfigArray($defaultProfileConfig);
-			$this->configMapper->insert($config);
-			$configArray = $config->getConfigArray();
-		}
-
-		return $configArray;
-	}
-
-	/**
-	 * Return the profile config of the target user with additional medatata,
-	 * if a config does not already exist a default config is created and returned
-	 */
-	public function getProfileConfigWithMetadata(IUser $targetUser, ?IUser $visitingUser): array {
-		$configArray = $this->getProfileConfig($targetUser, $visitingUser);
-
-		$actionsMetadata = [];
-		foreach ($this->getActions($targetUser, $visitingUser) as $action) {
-			$actionsMetadata[$action->getId()] = [
-				'appId' => $action->getAppId(),
-				'displayId' => $action->getDisplayId(),
-			];
-		}
-
-		// Add metadata for account property actions which are always configurable
-		foreach (self::ACCOUNT_PROPERTY_ACTIONS as $actionClass) {
-			/** @var ILinkAction $action */
-			$action = $this->container->get($actionClass);
-			if (!isset($actionsMetadata[$action->getId()])) {
-				$actionsMetadata[$action->getId()] = [
-					'appId' => $action->getAppId(),
-					'displayId' => $action->getDisplayId(),
-				];
-			}
-		}
-
-		$propertiesMetadata = [
-			IAccountManager::PROPERTY_ADDRESS => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Address'),
-			],
-			IAccountManager::PROPERTY_AVATAR => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Profile picture'),
-			],
-			IAccountManager::PROPERTY_BIOGRAPHY => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('About'),
-			],
-			IAccountManager::PROPERTY_DISPLAYNAME => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Display name'),
-			],
-			IAccountManager::PROPERTY_HEADLINE => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Headline'),
-			],
-			IAccountManager::PROPERTY_ORGANISATION => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Organisation'),
-			],
-			IAccountManager::PROPERTY_ROLE => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Role'),
-			],
-			IAccountManager::PROPERTY_PRONOUNS => [
-				'appId' => self::CORE_APP_ID,
-				'displayId' => $this->l10nFactory->get('lib')->t('Pronouns'),
-			],
-		];
-
-		$paramMetadata = array_merge($actionsMetadata, $propertiesMetadata);
-		$configArray = array_intersect_key($configArray, $paramMetadata);
-
-		foreach ($configArray as $paramId => $paramConfig) {
-			if (isset($paramMetadata[$paramId])) {
-				$configArray[$paramId] = array_merge(
-					$paramConfig,
-					$paramMetadata[$paramId],
-				);
-			}
-		}
-
-		return $configArray;
-	}
+    /** @var ILinkAction[] */
+    private array $actions = [];
+
+    /** @var null|ILinkAction[] */
+    private ?array $sortedActions = null;
+    /** @var CappedMemoryCache<ProfileConfig> */
+    private CappedMemoryCache $configCache;
+
+    private const CORE_APP_ID = 'core';
+
+    /**
+     * Array of account property actions
+     */
+    private const ACCOUNT_PROPERTY_ACTIONS = [
+        EmailAction::class,
+        PhoneAction::class,
+        WebsiteAction::class,
+        TwitterAction::class,
+        FediverseAction::class,
+    ];
+
+    /**
+     * Array of account properties displayed on the profile
+     */
+    private const PROFILE_PROPERTIES = [
+        IAccountManager::PROPERTY_ADDRESS,
+        IAccountManager::PROPERTY_AVATAR,
+        IAccountManager::PROPERTY_BIOGRAPHY,
+        IAccountManager::PROPERTY_DISPLAYNAME,
+        IAccountManager::PROPERTY_HEADLINE,
+        IAccountManager::PROPERTY_ORGANISATION,
+        IAccountManager::PROPERTY_ROLE,
+        IAccountManager::PROPERTY_PRONOUNS,
+    ];
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IAppManager $appManager,
+        private IConfig $config,
+        private ProfileConfigMapper $configMapper,
+        private ContainerInterface $container,
+        private KnownUserService $knownUserService,
+        private IFactory $l10nFactory,
+        private LoggerInterface $logger,
+        private Coordinator $coordinator,
+    ) {
+        $this->configCache = new CappedMemoryCache();
+    }
+
+    /**
+     * If no user is passed as an argument return whether profile is enabled globally in `config.php`
+     */
+    public function isProfileEnabled(?IUser $user = null): bool {
+        $profileEnabledGlobally = $this->config->getSystemValueBool('profile.enabled', true);
+
+        if (empty($user) || !$profileEnabledGlobally) {
+            return $profileEnabledGlobally;
+        }
+
+        $account = $this->accountManager->getAccount($user);
+        return (bool)filter_var(
+            $account->getProperty(IAccountManager::PROPERTY_PROFILE_ENABLED)->getValue(),
+            FILTER_VALIDATE_BOOLEAN,
+            FILTER_NULL_ON_FAILURE,
+        );
+    }
+
+    /**
+     * Register an action for the user
+     */
+    private function registerAction(ILinkAction $action, IUser $targetUser, ?IUser $visitingUser): void {
+        $action->preload($targetUser);
+
+        if ($action->getTarget() === null) {
+            // Actions without a target are not registered
+            return;
+        }
+
+        if ($action->getAppId() !== self::CORE_APP_ID) {
+            if (!$this->appManager->isEnabledForUser($action->getAppId(), $targetUser)) {
+                $this->logger->notice('App: ' . $action->getAppId() . ' cannot register actions as it is not enabled for the target user: ' . $targetUser->getUID());
+                return;
+            }
+            if (!$this->appManager->isEnabledForUser($action->getAppId(), $visitingUser)) {
+                $this->logger->notice('App: ' . $action->getAppId() . ' cannot register actions as it is not enabled for the visiting user: ' . ($visitingUser ? $visitingUser->getUID() : '(user not connected)'));
+                return;
+            }
+        }
+
+        if (in_array($action->getId(), self::PROFILE_PROPERTIES, true)) {
+            $this->logger->error('Cannot register action with ID: ' . $action->getId() . ', as it is used by a core account property.');
+            return;
+        }
+
+        if (isset($this->actions[$action->getId()])) {
+            $this->logger->error('Cannot register duplicate action: ' . $action->getId());
+            return;
+        }
+
+        // Add action to associative array of actions
+        $this->actions[$action->getId()] = $action;
+    }
+
+    /**
+     * Return an array of registered profile actions for the user
+     *
+     * @return ILinkAction[]
+     */
+    private function getActions(IUser $targetUser, ?IUser $visitingUser): array {
+        // If actions are already registered and sorted, return them
+        if ($this->sortedActions !== null) {
+            return $this->sortedActions;
+        }
+
+        foreach (self::ACCOUNT_PROPERTY_ACTIONS as $actionClass) {
+            /** @var ILinkAction $action */
+            $action = $this->container->get($actionClass);
+            $this->registerAction($action, $targetUser, $visitingUser);
+        }
+
+        $context = $this->coordinator->getRegistrationContext();
+
+        if ($context !== null) {
+            foreach ($context->getProfileLinkActions() as $registration) {
+                /** @var ILinkAction $action */
+                $action = $this->container->get($registration->getService());
+                $this->registerAction($action, $targetUser, $visitingUser);
+            }
+        }
+
+        $actionsClone = $this->actions;
+        // Sort associative array into indexed array in ascending order of priority
+        usort($actionsClone, function (ILinkAction $a, ILinkAction $b) {
+            return $a->getPriority() === $b->getPriority() ? 0 : ($a->getPriority() < $b->getPriority() ? -1 : 1);
+        });
+
+        $this->sortedActions = $actionsClone;
+        return $this->sortedActions;
+    }
+
+    /**
+     * Return whether the profile parameter of the target user
+     * is visible to the visiting user
+     */
+    public function isProfileFieldVisible(string $profileField, IUser $targetUser, ?IUser $visitingUser): bool {
+        try {
+            $account = $this->accountManager->getAccount($targetUser);
+            $scope = $account->getProperty($profileField)->getScope();
+        } catch (PropertyDoesNotExistException $e) {
+            // Allow the exception as not all profile parameters are account properties
+        }
+
+        $visibility = $this->getProfileConfig($targetUser, $visitingUser)[$profileField]['visibility'];
+        // Handle profile visibility and account property scope
+
+        if ($visibility === self::VISIBILITY_SHOW_USERS_ONLY) {
+            if (empty($scope)) {
+                return $visitingUser !== null;
+            }
+
+            return match ($scope) {
+                IAccountManager::SCOPE_PRIVATE => $visitingUser !== null && $this->knownUserService->isKnownToUser($targetUser->getUID(), $visitingUser->getUID()),
+                IAccountManager::SCOPE_LOCAL,
+                IAccountManager::SCOPE_FEDERATED,
+                IAccountManager::SCOPE_PUBLISHED => $visitingUser !== null,
+                default => false,
+            };
+        }
+
+        if ($visibility === self::VISIBILITY_SHOW) {
+            if (empty($scope)) {
+                return true;
+            }
+
+            return match ($scope) {
+                IAccountManager::SCOPE_PRIVATE => $visitingUser !== null && $this->knownUserService->isKnownToUser($targetUser->getUID(), $visitingUser->getUID()),
+                IAccountManager::SCOPE_LOCAL,
+                IAccountManager::SCOPE_FEDERATED,
+                IAccountManager::SCOPE_PUBLISHED => true,
+                default => false,
+            };
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the profile parameters of the target user that are visible to the visiting user
+     * in an associative array
+     * @psalm-return CoreProfileFields
+     */
+    public function getProfileFields(IUser $targetUser, ?IUser $visitingUser): array {
+        $account = $this->accountManager->getAccount($targetUser);
+
+        // Initialize associative array of profile parameters
+        $profileParameters = [
+            'userId' => $account->getUser()->getUID(),
+        ];
+
+        // Add account properties
+        foreach (self::PROFILE_PROPERTIES as $property) {
+            switch ($property) {
+                case IAccountManager::PROPERTY_ADDRESS:
+                case IAccountManager::PROPERTY_BIOGRAPHY:
+                case IAccountManager::PROPERTY_DISPLAYNAME:
+                case IAccountManager::PROPERTY_HEADLINE:
+                case IAccountManager::PROPERTY_ORGANISATION:
+                case IAccountManager::PROPERTY_ROLE:
+                case IAccountManager::PROPERTY_PRONOUNS:
+                    $profileParameters[$property] =
+                        $this->isProfileFieldVisible($property, $targetUser, $visitingUser)
+                        // Explicitly set to null when value is empty string
+                        ? ($account->getProperty($property)->getValue() ?: null)
+                        : null;
+                    break;
+                case IAccountManager::PROPERTY_AVATAR:
+                    // Add avatar visibility
+                    $profileParameters['isUserAvatarVisible'] = $this->isProfileFieldVisible($property, $targetUser, $visitingUser);
+                    break;
+            }
+        }
+
+        // Add actions
+        $profileParameters['actions'] = array_map(
+            function (ILinkAction $action) {
+                return [
+                    'id' => $action->getId(),
+                    'icon' => $action->getIcon(),
+                    'title' => $action->getTitle(),
+                    'target' => $action->getTarget(),
+                ];
+            },
+            // This is needed to reindex the array after filtering
+            array_values(
+                array_filter(
+                    $this->getActions($targetUser, $visitingUser),
+                    function (ILinkAction $action) use ($targetUser, $visitingUser) {
+                        return $this->isProfileFieldVisible($action->getId(), $targetUser, $visitingUser);
+                    }
+                ),
+            )
+        );
+
+        return $profileParameters;
+    }
+
+    /**
+     * Return the filtered profile config containing only
+     * the properties to be stored on the database
+     */
+    private function filterNotStoredProfileConfig(array $profileConfig): array {
+        $dbParamConfigProperties = [
+            'visibility',
+        ];
+
+        foreach ($profileConfig as $paramId => $paramConfig) {
+            $profileConfig[$paramId] = array_intersect_key($paramConfig, array_flip($dbParamConfigProperties));
+        }
+
+        return $profileConfig;
+    }
+
+    /**
+     * Return the default profile config
+     */
+    private function getDefaultProfileConfig(IUser $targetUser, ?IUser $visitingUser): array {
+        // Construct the default config for actions
+        $actionsConfig = [];
+        foreach ($this->getActions($targetUser, $visitingUser) as $action) {
+            $actionsConfig[$action->getId()] = ['visibility' => self::DEFAULT_VISIBILITY];
+        }
+
+        // Construct the default config for account properties
+        $propertiesConfig = [];
+        foreach (self::DEFAULT_PROPERTY_VISIBILITY as $property => $visibility) {
+            $propertiesConfig[$property] = ['visibility' => $visibility];
+        }
+
+        return array_merge($actionsConfig, $propertiesConfig);
+    }
+
+    /**
+     * Return the profile config of the target user,
+     * if a config does not already exist a default config is created and returned
+     */
+    public function getProfileConfig(IUser $targetUser, ?IUser $visitingUser): array {
+        $defaultProfileConfig = $this->getDefaultProfileConfig($targetUser, $visitingUser);
+        try {
+            if (($config = $this->configCache[$targetUser->getUID()]) === null) {
+                $config = $this->configMapper->get($targetUser->getUID());
+                $this->configCache[$targetUser->getUID()] = $config;
+            }
+            // Merge defaults with the existing config in case the defaults are missing
+            $config->setConfigArray(array_merge(
+                $defaultProfileConfig,
+                $this->filterNotStoredProfileConfig($config->getConfigArray()),
+            ));
+            $this->configMapper->update($config);
+            $configArray = $config->getConfigArray();
+        } catch (DoesNotExistException $e) {
+            // Create a new default config if it does not exist
+            $config = new ProfileConfig();
+            $config->setUserId($targetUser->getUID());
+            $config->setConfigArray($defaultProfileConfig);
+            $this->configMapper->insert($config);
+            $configArray = $config->getConfigArray();
+        }
+
+        return $configArray;
+    }
+
+    /**
+     * Return the profile config of the target user with additional medatata,
+     * if a config does not already exist a default config is created and returned
+     */
+    public function getProfileConfigWithMetadata(IUser $targetUser, ?IUser $visitingUser): array {
+        $configArray = $this->getProfileConfig($targetUser, $visitingUser);
+
+        $actionsMetadata = [];
+        foreach ($this->getActions($targetUser, $visitingUser) as $action) {
+            $actionsMetadata[$action->getId()] = [
+                'appId' => $action->getAppId(),
+                'displayId' => $action->getDisplayId(),
+            ];
+        }
+
+        // Add metadata for account property actions which are always configurable
+        foreach (self::ACCOUNT_PROPERTY_ACTIONS as $actionClass) {
+            /** @var ILinkAction $action */
+            $action = $this->container->get($actionClass);
+            if (!isset($actionsMetadata[$action->getId()])) {
+                $actionsMetadata[$action->getId()] = [
+                    'appId' => $action->getAppId(),
+                    'displayId' => $action->getDisplayId(),
+                ];
+            }
+        }
+
+        $propertiesMetadata = [
+            IAccountManager::PROPERTY_ADDRESS => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Address'),
+            ],
+            IAccountManager::PROPERTY_AVATAR => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Profile picture'),
+            ],
+            IAccountManager::PROPERTY_BIOGRAPHY => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('About'),
+            ],
+            IAccountManager::PROPERTY_DISPLAYNAME => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Display name'),
+            ],
+            IAccountManager::PROPERTY_HEADLINE => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Headline'),
+            ],
+            IAccountManager::PROPERTY_ORGANISATION => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Organisation'),
+            ],
+            IAccountManager::PROPERTY_ROLE => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Role'),
+            ],
+            IAccountManager::PROPERTY_PRONOUNS => [
+                'appId' => self::CORE_APP_ID,
+                'displayId' => $this->l10nFactory->get('lib')->t('Pronouns'),
+            ],
+        ];
+
+        $paramMetadata = array_merge($actionsMetadata, $propertiesMetadata);
+        $configArray = array_intersect_key($configArray, $paramMetadata);
+
+        foreach ($configArray as $paramId => $paramConfig) {
+            if (isset($paramMetadata[$paramId])) {
+                $configArray[$paramId] = array_merge(
+                    $paramConfig,
+                    $paramMetadata[$paramId],
+                );
+            }
+        }
+
+        return $configArray;
+    }
 }

lib/public/Profile/IProfileManager.php

Indentation +64 added lines, -64 removed lines

@@ -18,75 +18,75 @@
  * @since 28.0.0
  */
 interface IProfileManager {
-	/**
-	 * Visible to users, guests, and public access
-	 *
-	 * @since 28.0.0
-	 */
-	public const VISIBILITY_SHOW = 'show';
+    /**
+     * Visible to users, guests, and public access
+     *
+     * @since 28.0.0
+     */
+    public const VISIBILITY_SHOW = 'show';
 
-	/**
-	 * Visible to users and guests
-	 *
-	 * @since 28.0.0
-	 */
-	public const VISIBILITY_SHOW_USERS_ONLY = 'show_users_only';
+    /**
+     * Visible to users and guests
+     *
+     * @since 28.0.0
+     */
+    public const VISIBILITY_SHOW_USERS_ONLY = 'show_users_only';
 
-	/**
-	 * Visible to nobody
-	 *
-	 * @since 28.0.0
-	 */
-	public const VISIBILITY_HIDE = 'hide';
+    /**
+     * Visible to nobody
+     *
+     * @since 28.0.0
+     */
+    public const VISIBILITY_HIDE = 'hide';
 
-	/**
-	 * Default account property visibility
-	 *
-	 * @since 28.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,
-		IAccountManager::PROPERTY_PRONOUNS => self::VISIBILITY_SHOW,
-	];
+    /**
+     * Default account property visibility
+     *
+     * @since 28.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,
+        IAccountManager::PROPERTY_PRONOUNS => self::VISIBILITY_SHOW,
+    ];
 
-	/**
-	 * Default visibility
-	 *
-	 * @since 28.0.0
-	 */
-	public const DEFAULT_VISIBILITY = self::VISIBILITY_SHOW_USERS_ONLY;
+    /**
+     * Default visibility
+     *
+     * @since 28.0.0
+     */
+    public const DEFAULT_VISIBILITY = self::VISIBILITY_SHOW_USERS_ONLY;
 
-	/**
-	 * If no user is passed as an argument return whether profile is enabled globally in `config.php`
-	 *
-	 * @since 28.0.0
-	 */
-	public function isProfileEnabled(?IUser $user = null): bool;
+    /**
+     * If no user is passed as an argument return whether profile is enabled globally in `config.php`
+     *
+     * @since 28.0.0
+     */
+    public function isProfileEnabled(?IUser $user = null): bool;
 
-	/**
-	 * Return whether the profile parameter of the target user
-	 * is visible to the visiting user
-	 *
-	 * @since 28.0.0
-	 */
-	public function isProfileFieldVisible(string $profileField, IUser $targetUser, ?IUser $visitingUser): bool;
+    /**
+     * Return whether the profile parameter of the target user
+     * is visible to the visiting user
+     *
+     * @since 28.0.0
+     */
+    public function isProfileFieldVisible(string $profileField, IUser $targetUser, ?IUser $visitingUser): bool;
 
-	/**
-	 * Return the profile parameters of the target user that are visible to the visiting user
-	 * in an associative array
-	 *
-	 * @psalm-return CoreProfileFields
-	 * @since 28.0.0
-	 */
-	public function getProfileFields(IUser $targetUser, ?IUser $visitingUser): array;
+    /**
+     * Return the profile parameters of the target user that are visible to the visiting user
+     * in an associative array
+     *
+     * @psalm-return CoreProfileFields
+     * @since 28.0.0
+     */
+    public function getProfileFields(IUser $targetUser, ?IUser $visitingUser): array;
 }

build/integration/features/bootstrap/Provisioning.php

Indentation +1000 added lines, -1000 removed lines

@@ -13,1004 +13,1004 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Provisioning {
-	use BasicStructure;
-
-	/** @var array */
-	private $createdUsers = [];
-
-	/** @var array */
-	private $createdRemoteUsers = [];
-
-	/** @var array */
-	private $createdRemoteGroups = [];
-
-	/** @var array */
-	private $createdGroups = [];
-
-	/**
-	 * @Given /^user "([^"]*)" exists$/
-	 * @param string $user
-	 */
-	public function assureUserExists($user) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheUser($user);
-			$this->currentUser = $previous_user;
-		}
-		$this->userExists($user);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" with displayname "((?:[^"]|\\")*)" exists$/
-	 * @param string $user
-	 */
-	public function assureUserWithDisplaynameExists($user, $displayname) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheUser($user, $displayname);
-			$this->currentUser = $previous_user;
-		}
-		$this->userExists($user);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" does not exist$/
-	 * @param string $user
-	 */
-	public function userDoesNotExist($user) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-			return;
-		}
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheUser($user);
-		$this->currentUser = $previous_user;
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-		}
-	}
-
-	public function creatingTheUser($user, $displayname = '') {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-
-		$options['form_params'] = [
-			'userid' => $user,
-			'password' => '123456'
-		];
-		if ($displayname !== '') {
-			$options['form_params']['displayName'] = $displayname;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-		if ($this->currentServer === 'LOCAL') {
-			$this->createdUsers[$user] = $user;
-		} elseif ($this->currentServer === 'REMOTE') {
-			$this->createdRemoteUsers[$user] = $user;
-		}
-
-		//Quick hack to login once with the current user
-		$options2 = [
-			'auth' => [$user, '123456'],
-		];
-		$options2['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$url = $fullUrl . '/' . $user;
-		$client->get($url, $options2);
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function userHasSetting($user, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
-			if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
-				$expectedValues = explode(';', $setting[1]);
-				foreach ($expectedValues as $expected) {
-					Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: ' . $setting[0]);
-				}
-			} elseif (isset($value[0])) {
-				Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: ' . $setting[0]);
-			} else {
-				Assert::assertEquals('', $setting[1], 'Data wrong for field: ' . $setting[0]);
-			}
-		}
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has the following profile data$/
-	 */
-	public function userHasProfileData(string $user, ?TableNode $settings): void {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/profile/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-			'Accept' => 'application/json',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$body = $response->getBody()->getContents();
-		$data = json_decode($body, true);
-		$data = $data['ocs']['data'];
-		foreach ($settings->getRows() as $setting) {
-			Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: ' . $setting[0]);
-			if ($setting[1] === 'NULL') {
-				Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
-			} else {
-				Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
-			}
-		}
-	}
-
-	/**
-	 * @Then /^group "([^"]*)" has$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function groupHasSetting($group, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/details?search=$group";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$groupDetails = simplexml_load_string($response->getBody())->data[0]->groups[0]->element;
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode($groupDetails->{$setting[0]}), 1);
-			if (isset($value[0])) {
-				Assert::assertEqualsCanonicalizing($setting[1], $value[0]);
-			} else {
-				Assert::assertEquals('', $setting[1]);
-			}
-		}
-	}
-
-
-	/**
-	 * @Then /^user "([^"]*)" has editable fields$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $fields
-	 */
-	public function userHasEditableFields($user, $fields) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
-		if ($user !== 'self') {
-			$fullUrl .= '/' . $user;
-		}
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$fieldsArray = json_decode(json_encode(simplexml_load_string($response->getBody())->data->element), 1);
-
-		$expectedFields = $fields->getRows();
-		$expectedFields = $this->simplifyArray($expectedFields);
-		Assert::assertEquals($expectedFields, $fieldsArray);
-	}
-
-	/**
-	 * @Then /^search users by phone for region "([^"]*)" with$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function searchUserByPhone($region, TableNode $searchTable) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/search/by-phone";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$search = [];
-		foreach ($searchTable->getRows() as $row) {
-			if (!isset($search[$row[0]])) {
-				$search[$row[0]] = [];
-			}
-			$search[$row[0]][] = $row[1];
-		}
-
-		$options['form_params'] = [
-			'location' => $region,
-			'search' => $search,
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-	}
-
-	public function createUser($user) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->creatingTheUser($user);
-		$this->userExists($user);
-		$this->currentUser = $previous_user;
-	}
-
-	public function deleteUser($user) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheUser($user);
-		$this->userDoesNotExist($user);
-		$this->currentUser = $previous_user;
-	}
-
-	public function createGroup($group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->creatingTheGroup($group);
-		$this->groupExists($group);
-		$this->currentUser = $previous_user;
-	}
-
-	public function deleteGroup($group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheGroup($group);
-		$this->groupDoesNotExist($group);
-		$this->currentUser = $previous_user;
-	}
-
-	public function userExists($user) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true'
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-	}
-
-	/**
-	 * @Then /^check that user "([^"]*)" belongs to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function checkThatUserBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertContains($group, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	public function userBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-
-		if (array_key_exists($group, $respondedArray)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" belongs to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function assureUserBelongsToGroup($user, $group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		if (!$this->userBelongsToGroup($user, $group)) {
-			$this->addingUserToGroup($user, $group);
-		}
-
-		$this->checkThatUserBelongsToGroup($user, $group);
-		$this->currentUser = $previous_user;
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" does not belong to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userDoesNotBelongToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$groups = [$group];
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-		Assert::assertNotEqualsCanonicalizing($groups, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @When /^creating the group "([^"]*)"$/
-	 * @param string $group
-	 */
-	public function creatingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-
-		$options['form_params'] = [
-			'groupid' => $group,
-		];
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-		if ($this->currentServer === 'LOCAL') {
-			$this->createdGroups[$group] = $group;
-		} elseif ($this->currentServer === 'REMOTE') {
-			$this->createdRemoteGroups[$group] = $group;
-		}
-	}
-
-	/**
-	 * @When /^assure user "([^"]*)" is disabled$/
-	 */
-	public function assureUserIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		// TODO: fix hack
-		$options['form_params'] = [
-			'foo' => 'bar'
-		];
-
-		$this->response = $client->put($fullUrl, $options);
-	}
-
-	/**
-	 * @When /^Deleting the user "([^"]*)"$/
-	 * @param string $user
-	 */
-	public function deletingTheUser($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->delete($fullUrl, $options);
-	}
-
-	/**
-	 * @When /^Deleting the group "([^"]*)"$/
-	 * @param string $group
-	 */
-	public function deletingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->delete($fullUrl, $options);
-
-		if ($this->currentServer === 'LOCAL') {
-			unset($this->createdGroups[$group]);
-		} elseif ($this->currentServer === 'REMOTE') {
-			unset($this->createdRemoteGroups[$group]);
-		}
-	}
-
-	/**
-	 * @Given /^Add user "([^"]*)" to the group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function addUserToGroup($user, $group) {
-		$this->userExists($user);
-		$this->groupExists($group);
-		$this->addingUserToGroup($user, $group);
-	}
-
-	/**
-	 * @When /^User "([^"]*)" is added to the group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function addingUserToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$options['form_params'] = [
-			'groupid' => $group,
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-	}
-
-
-	public function groupExists($group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-	}
-
-	/**
-	 * @Given /^group "([^"]*)" exists$/
-	 * @param string $group
-	 */
-	public function assureGroupExists($group) {
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheGroup($group);
-			$this->currentUser = $previous_user;
-		}
-		$this->groupExists($group);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^group "([^"]*)" does not exist$/
-	 * @param string $group
-	 */
-	public function groupDoesNotExist($group) {
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-			return;
-		}
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheGroup($group);
-		$this->currentUser = $previous_user;
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-		}
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" is subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertContains($user, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^Assure user "([^"]*)" is subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function assureUserIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['form_params'] = [
-			'groupid' => $group
-		];
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$this->response = $client->post($fullUrl, $options);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" is not a subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userIsNotSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertNotContains($user, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Then /^users returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function theUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRows();
-			$usersSimplified = $this->simplifyArray($users);
-			$respondedArray = $this->getArrayOfUsersResponded($this->response);
-			Assert::assertEqualsCanonicalizing($usersSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^phone matches returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function thePhoneUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRowsHash();
-			$listCheckedElements = simplexml_load_string($this->response->getBody())->data;
-			$respondedArray = json_decode(json_encode($listCheckedElements), true);
-			Assert::assertEquals($users, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^detailed users returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function theDetailedUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRows();
-			$usersSimplified = $this->simplifyArray($users);
-			$respondedArray = $this->getArrayOfDetailedUsersResponded($this->response);
-			$respondedArray = array_keys($respondedArray);
-			Assert::assertEquals($usersSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^groups returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theGroupsShouldBe($groupsList) {
-		if ($groupsList instanceof TableNode) {
-			$groups = $groupsList->getRows();
-			$groupsSimplified = $this->simplifyArray($groups);
-			$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^subadmin groups returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theSubadminGroupsShouldBe($groupsList) {
-		if ($groupsList instanceof TableNode) {
-			$groups = $groupsList->getRows();
-			$groupsSimplified = $this->simplifyArray($groups);
-			$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^apps returned are$/
-	 * @param TableNode|null $appList
-	 */
-	public function theAppsShouldBe($appList) {
-		if ($appList instanceof TableNode) {
-			$apps = $appList->getRows();
-			$appsSimplified = $this->simplifyArray($apps);
-			$respondedArray = $this->getArrayOfAppsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($appsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^subadmin users returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theSubadminUsersShouldBe($groupsList) {
-		$this->theSubadminGroupsShouldBe($groupsList);
-	}
-
-	/**
-	 * Parses the xml answer to get the array of users returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfUsersResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of detailed users returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfDetailedUsersResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of groups returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfGroupsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->groups[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of apps returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfAppsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->apps[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of subadmins returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfSubadminsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-
-	/**
-	 * @Given /^app "([^"]*)" is disabled$/
-	 * @param string $app
-	 */
-	public function appIsDisabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=disabled';
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfAppsResponded($this->response);
-		Assert::assertContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" is enabled$/
-	 * @param string $app
-	 */
-	public function appIsEnabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfAppsResponded($this->response);
-		Assert::assertContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" is not enabled$/
-	 *
-	 * Checks that the app is disabled or not installed.
-	 *
-	 * @param string $app
-	 */
-	public function appIsNotEnabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfAppsResponded($this->response);
-		Assert::assertNotContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" is disabled$/
-	 * @param string $user
-	 */
-	public function userIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		// false in xml is empty
-		Assert::assertTrue(empty(simplexml_load_string($this->response->getBody())->data[0]->enabled));
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" is enabled$/
-	 * @param string $user
-	 */
-	public function userIsEnabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		// boolean to string is integer
-		Assert::assertEquals('1', simplexml_load_string($this->response->getBody())->data[0]->enabled);
-	}
-
-	/**
-	 * @Given user :user has a quota of :quota
-	 * @param string $user
-	 * @param string $quota
-	 */
-	public function userHasAQuotaOf($user, $quota) {
-		$body = new TableNode([
-			0 => ['key', 'quota'],
-			1 => ['value', $quota],
-		]);
-
-		// method used from BasicStructure trait
-		$this->sendingToWith('PUT', '/cloud/users/' . $user, $body);
-	}
-
-	/**
-	 * @Given user :user has unlimited quota
-	 * @param string $user
-	 */
-	public function userHasUnlimitedQuota($user) {
-		$this->userHasAQuotaOf($user, 'none');
-	}
-
-	/**
-	 * Returns home path of the given user
-	 *
-	 * @param string $user
-	 */
-	public function getUserHome($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$this->response = $client->get($fullUrl, $options);
-		return simplexml_load_string($this->response->getBody())->data[0]->home;
-	}
-
-	/**
-	 * @BeforeScenario
-	 * @AfterScenario
-	 */
-	public function cleanupUsers() {
-		$previousServer = $this->currentServer;
-		$this->usingServer('LOCAL');
-		foreach ($this->createdUsers as $user) {
-			$this->deleteUser($user);
-		}
-		$this->usingServer('REMOTE');
-		foreach ($this->createdRemoteUsers as $remoteUser) {
-			$this->deleteUser($remoteUser);
-		}
-		$this->usingServer($previousServer);
-	}
-
-	/**
-	 * @BeforeScenario
-	 * @AfterScenario
-	 */
-	public function cleanupGroups() {
-		$previousServer = $this->currentServer;
-		$this->usingServer('LOCAL');
-		foreach ($this->createdGroups as $group) {
-			$this->deleteGroup($group);
-		}
-		$this->usingServer('REMOTE');
-		foreach ($this->createdRemoteGroups as $remoteGroup) {
-			$this->deleteGroup($remoteGroup);
-		}
-		$this->usingServer($previousServer);
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has not$/
-	 */
-	public function userHasNotSetting($user, TableNode $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
-			if (isset($value[0])) {
-				if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
-					$expectedValues = explode(';', $setting[1]);
-					foreach ($expectedValues as $expected) {
-						Assert::assertFalse(in_array($expected, $value, true));
-					}
-				} else {
-					Assert::assertNotEqualsCanonicalizing($setting[1], $value[0]);
-				}
-			} else {
-				Assert::assertNotEquals('', $setting[1]);
-			}
-		}
-	}
+    use BasicStructure;
+
+    /** @var array */
+    private $createdUsers = [];
+
+    /** @var array */
+    private $createdRemoteUsers = [];
+
+    /** @var array */
+    private $createdRemoteGroups = [];
+
+    /** @var array */
+    private $createdGroups = [];
+
+    /**
+     * @Given /^user "([^"]*)" exists$/
+     * @param string $user
+     */
+    public function assureUserExists($user) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheUser($user);
+            $this->currentUser = $previous_user;
+        }
+        $this->userExists($user);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" with displayname "((?:[^"]|\\")*)" exists$/
+     * @param string $user
+     */
+    public function assureUserWithDisplaynameExists($user, $displayname) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheUser($user, $displayname);
+            $this->currentUser = $previous_user;
+        }
+        $this->userExists($user);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" does not exist$/
+     * @param string $user
+     */
+    public function userDoesNotExist($user) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+            return;
+        }
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheUser($user);
+        $this->currentUser = $previous_user;
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+        }
+    }
+
+    public function creatingTheUser($user, $displayname = '') {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+
+        $options['form_params'] = [
+            'userid' => $user,
+            'password' => '123456'
+        ];
+        if ($displayname !== '') {
+            $options['form_params']['displayName'] = $displayname;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+        if ($this->currentServer === 'LOCAL') {
+            $this->createdUsers[$user] = $user;
+        } elseif ($this->currentServer === 'REMOTE') {
+            $this->createdRemoteUsers[$user] = $user;
+        }
+
+        //Quick hack to login once with the current user
+        $options2 = [
+            'auth' => [$user, '123456'],
+        ];
+        $options2['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $url = $fullUrl . '/' . $user;
+        $client->get($url, $options2);
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function userHasSetting($user, $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
+            if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+                $expectedValues = explode(';', $setting[1]);
+                foreach ($expectedValues as $expected) {
+                    Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: ' . $setting[0]);
+                }
+            } elseif (isset($value[0])) {
+                Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: ' . $setting[0]);
+            } else {
+                Assert::assertEquals('', $setting[1], 'Data wrong for field: ' . $setting[0]);
+            }
+        }
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has the following profile data$/
+     */
+    public function userHasProfileData(string $user, ?TableNode $settings): void {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/profile/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+            'Accept' => 'application/json',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $body = $response->getBody()->getContents();
+        $data = json_decode($body, true);
+        $data = $data['ocs']['data'];
+        foreach ($settings->getRows() as $setting) {
+            Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: ' . $setting[0]);
+            if ($setting[1] === 'NULL') {
+                Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+            } else {
+                Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+            }
+        }
+    }
+
+    /**
+     * @Then /^group "([^"]*)" has$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function groupHasSetting($group, $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/details?search=$group";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $groupDetails = simplexml_load_string($response->getBody())->data[0]->groups[0]->element;
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode($groupDetails->{$setting[0]}), 1);
+            if (isset($value[0])) {
+                Assert::assertEqualsCanonicalizing($setting[1], $value[0]);
+            } else {
+                Assert::assertEquals('', $setting[1]);
+            }
+        }
+    }
+
+
+    /**
+     * @Then /^user "([^"]*)" has editable fields$/
+     *
+     * @param string $user
+     * @param TableNode|null $fields
+     */
+    public function userHasEditableFields($user, $fields) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
+        if ($user !== 'self') {
+            $fullUrl .= '/' . $user;
+        }
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $fieldsArray = json_decode(json_encode(simplexml_load_string($response->getBody())->data->element), 1);
+
+        $expectedFields = $fields->getRows();
+        $expectedFields = $this->simplifyArray($expectedFields);
+        Assert::assertEquals($expectedFields, $fieldsArray);
+    }
+
+    /**
+     * @Then /^search users by phone for region "([^"]*)" with$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function searchUserByPhone($region, TableNode $searchTable) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/search/by-phone";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $search = [];
+        foreach ($searchTable->getRows() as $row) {
+            if (!isset($search[$row[0]])) {
+                $search[$row[0]] = [];
+            }
+            $search[$row[0]][] = $row[1];
+        }
+
+        $options['form_params'] = [
+            'location' => $region,
+            'search' => $search,
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+    }
+
+    public function createUser($user) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->creatingTheUser($user);
+        $this->userExists($user);
+        $this->currentUser = $previous_user;
+    }
+
+    public function deleteUser($user) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheUser($user);
+        $this->userDoesNotExist($user);
+        $this->currentUser = $previous_user;
+    }
+
+    public function createGroup($group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->creatingTheGroup($group);
+        $this->groupExists($group);
+        $this->currentUser = $previous_user;
+    }
+
+    public function deleteGroup($group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheGroup($group);
+        $this->groupDoesNotExist($group);
+        $this->currentUser = $previous_user;
+    }
+
+    public function userExists($user) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true'
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+    }
+
+    /**
+     * @Then /^check that user "([^"]*)" belongs to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function checkThatUserBelongsToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertContains($group, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    public function userBelongsToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+
+        if (array_key_exists($group, $respondedArray)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @Given /^user "([^"]*)" belongs to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function assureUserBelongsToGroup($user, $group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+
+        if (!$this->userBelongsToGroup($user, $group)) {
+            $this->addingUserToGroup($user, $group);
+        }
+
+        $this->checkThatUserBelongsToGroup($user, $group);
+        $this->currentUser = $previous_user;
+    }
+
+    /**
+     * @Given /^user "([^"]*)" does not belong to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userDoesNotBelongToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $groups = [$group];
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+        Assert::assertNotEqualsCanonicalizing($groups, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @When /^creating the group "([^"]*)"$/
+     * @param string $group
+     */
+    public function creatingTheGroup($group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+
+        $options['form_params'] = [
+            'groupid' => $group,
+        ];
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+        if ($this->currentServer === 'LOCAL') {
+            $this->createdGroups[$group] = $group;
+        } elseif ($this->currentServer === 'REMOTE') {
+            $this->createdRemoteGroups[$group] = $group;
+        }
+    }
+
+    /**
+     * @When /^assure user "([^"]*)" is disabled$/
+     */
+    public function assureUserIsDisabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        // TODO: fix hack
+        $options['form_params'] = [
+            'foo' => 'bar'
+        ];
+
+        $this->response = $client->put($fullUrl, $options);
+    }
+
+    /**
+     * @When /^Deleting the user "([^"]*)"$/
+     * @param string $user
+     */
+    public function deletingTheUser($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->delete($fullUrl, $options);
+    }
+
+    /**
+     * @When /^Deleting the group "([^"]*)"$/
+     * @param string $group
+     */
+    public function deletingTheGroup($group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->delete($fullUrl, $options);
+
+        if ($this->currentServer === 'LOCAL') {
+            unset($this->createdGroups[$group]);
+        } elseif ($this->currentServer === 'REMOTE') {
+            unset($this->createdRemoteGroups[$group]);
+        }
+    }
+
+    /**
+     * @Given /^Add user "([^"]*)" to the group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function addUserToGroup($user, $group) {
+        $this->userExists($user);
+        $this->groupExists($group);
+        $this->addingUserToGroup($user, $group);
+    }
+
+    /**
+     * @When /^User "([^"]*)" is added to the group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function addingUserToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $options['form_params'] = [
+            'groupid' => $group,
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+    }
+
+
+    public function groupExists($group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+    }
+
+    /**
+     * @Given /^group "([^"]*)" exists$/
+     * @param string $group
+     */
+    public function assureGroupExists($group) {
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheGroup($group);
+            $this->currentUser = $previous_user;
+        }
+        $this->groupExists($group);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^group "([^"]*)" does not exist$/
+     * @param string $group
+     */
+    public function groupDoesNotExist($group) {
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+            return;
+        }
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheGroup($group);
+        $this->currentUser = $previous_user;
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+        }
+    }
+
+    /**
+     * @Given /^user "([^"]*)" is subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userIsSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertContains($user, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^Assure user "([^"]*)" is subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function assureUserIsSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['form_params'] = [
+            'groupid' => $group
+        ];
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $this->response = $client->post($fullUrl, $options);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" is not a subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userIsNotSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertNotContains($user, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Then /^users returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function theUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRows();
+            $usersSimplified = $this->simplifyArray($users);
+            $respondedArray = $this->getArrayOfUsersResponded($this->response);
+            Assert::assertEqualsCanonicalizing($usersSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^phone matches returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function thePhoneUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRowsHash();
+            $listCheckedElements = simplexml_load_string($this->response->getBody())->data;
+            $respondedArray = json_decode(json_encode($listCheckedElements), true);
+            Assert::assertEquals($users, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^detailed users returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function theDetailedUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRows();
+            $usersSimplified = $this->simplifyArray($users);
+            $respondedArray = $this->getArrayOfDetailedUsersResponded($this->response);
+            $respondedArray = array_keys($respondedArray);
+            Assert::assertEquals($usersSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^groups returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theGroupsShouldBe($groupsList) {
+        if ($groupsList instanceof TableNode) {
+            $groups = $groupsList->getRows();
+            $groupsSimplified = $this->simplifyArray($groups);
+            $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^subadmin groups returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theSubadminGroupsShouldBe($groupsList) {
+        if ($groupsList instanceof TableNode) {
+            $groups = $groupsList->getRows();
+            $groupsSimplified = $this->simplifyArray($groups);
+            $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^apps returned are$/
+     * @param TableNode|null $appList
+     */
+    public function theAppsShouldBe($appList) {
+        if ($appList instanceof TableNode) {
+            $apps = $appList->getRows();
+            $appsSimplified = $this->simplifyArray($apps);
+            $respondedArray = $this->getArrayOfAppsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($appsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^subadmin users returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theSubadminUsersShouldBe($groupsList) {
+        $this->theSubadminGroupsShouldBe($groupsList);
+    }
+
+    /**
+     * Parses the xml answer to get the array of users returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfUsersResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of detailed users returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfDetailedUsersResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of groups returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfGroupsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->groups[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of apps returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfAppsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->apps[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of subadmins returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfSubadminsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+
+    /**
+     * @Given /^app "([^"]*)" is disabled$/
+     * @param string $app
+     */
+    public function appIsDisabled($app) {
+        $fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=disabled';
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfAppsResponded($this->response);
+        Assert::assertContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^app "([^"]*)" is enabled$/
+     * @param string $app
+     */
+    public function appIsEnabled($app) {
+        $fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfAppsResponded($this->response);
+        Assert::assertContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^app "([^"]*)" is not enabled$/
+     *
+     * Checks that the app is disabled or not installed.
+     *
+     * @param string $app
+     */
+    public function appIsNotEnabled($app) {
+        $fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfAppsResponded($this->response);
+        Assert::assertNotContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Then /^user "([^"]*)" is disabled$/
+     * @param string $user
+     */
+    public function userIsDisabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        // false in xml is empty
+        Assert::assertTrue(empty(simplexml_load_string($this->response->getBody())->data[0]->enabled));
+    }
+
+    /**
+     * @Then /^user "([^"]*)" is enabled$/
+     * @param string $user
+     */
+    public function userIsEnabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        // boolean to string is integer
+        Assert::assertEquals('1', simplexml_load_string($this->response->getBody())->data[0]->enabled);
+    }
+
+    /**
+     * @Given user :user has a quota of :quota
+     * @param string $user
+     * @param string $quota
+     */
+    public function userHasAQuotaOf($user, $quota) {
+        $body = new TableNode([
+            0 => ['key', 'quota'],
+            1 => ['value', $quota],
+        ]);
+
+        // method used from BasicStructure trait
+        $this->sendingToWith('PUT', '/cloud/users/' . $user, $body);
+    }
+
+    /**
+     * @Given user :user has unlimited quota
+     * @param string $user
+     */
+    public function userHasUnlimitedQuota($user) {
+        $this->userHasAQuotaOf($user, 'none');
+    }
+
+    /**
+     * Returns home path of the given user
+     *
+     * @param string $user
+     */
+    public function getUserHome($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $this->response = $client->get($fullUrl, $options);
+        return simplexml_load_string($this->response->getBody())->data[0]->home;
+    }
+
+    /**
+     * @BeforeScenario
+     * @AfterScenario
+     */
+    public function cleanupUsers() {
+        $previousServer = $this->currentServer;
+        $this->usingServer('LOCAL');
+        foreach ($this->createdUsers as $user) {
+            $this->deleteUser($user);
+        }
+        $this->usingServer('REMOTE');
+        foreach ($this->createdRemoteUsers as $remoteUser) {
+            $this->deleteUser($remoteUser);
+        }
+        $this->usingServer($previousServer);
+    }
+
+    /**
+     * @BeforeScenario
+     * @AfterScenario
+     */
+    public function cleanupGroups() {
+        $previousServer = $this->currentServer;
+        $this->usingServer('LOCAL');
+        foreach ($this->createdGroups as $group) {
+            $this->deleteGroup($group);
+        }
+        $this->usingServer('REMOTE');
+        foreach ($this->createdRemoteGroups as $remoteGroup) {
+            $this->deleteGroup($remoteGroup);
+        }
+        $this->usingServer($previousServer);
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has not$/
+     */
+    public function userHasNotSetting($user, TableNode $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
+            if (isset($value[0])) {
+                if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+                    $expectedValues = explode(';', $setting[1]);
+                    foreach ($expectedValues as $expected) {
+                        Assert::assertFalse(in_array($expected, $value, true));
+                    }
+                } else {
+                    Assert::assertNotEqualsCanonicalizing($setting[1], $value[0]);
+                }
+            } else {
+                Assert::assertNotEquals('', $setting[1]);
+            }
+        }
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 use GuzzleHttp\Message\ResponseInterface;
 use PHPUnit\Framework\Assert;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__.'/../../vendor/autoload.php';
 
 trait Provisioning {
 	use BasicStructure;
@@ -86,7 +86,7 @@ 
 	}
 
 	public function creatingTheUser($user, $displayname = '') {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -118,7 +118,7 @@ 
 		$options2['headers'] = [
 			'OCS-APIREQUEST' => 'true',
 		];
-		$url = $fullUrl . '/' . $user;
+		$url = $fullUrl.'/'.$user;
 		$client->get($url, $options2);
 	}
 
@@ -129,7 +129,7 @@ 
 	 * @param TableNode|null $settings
 	 */
 	public function userHasSetting($user, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -147,12 +147,12 @@ 
 			if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
 				$expectedValues = explode(';', $setting[1]);
 				foreach ($expectedValues as $expected) {
-					Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: ' . $setting[0]);
+					Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: '.$setting[0]);
 				}
 			} elseif (isset($value[0])) {
-				Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: ' . $setting[0]);
+				Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: '.$setting[0]);
 			} else {
-				Assert::assertEquals('', $setting[1], 'Data wrong for field: ' . $setting[0]);
+				Assert::assertEquals('', $setting[1], 'Data wrong for field: '.$setting[0]);
 			}
 		}
 	}
@@ -161,7 +161,7 @@ 
 	 * @Then /^user "([^"]*)" has the following profile data$/
 	 */
 	public function userHasProfileData(string $user, ?TableNode $settings): void {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/profile/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/profile/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -179,11 +179,11 @@ 
 		$data = json_decode($body, true);
 		$data = $data['ocs']['data'];
 		foreach ($settings->getRows() as $setting) {
-			Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: ' . $setting[0]);
+			Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: '.$setting[0]);
 			if ($setting[1] === 'NULL') {
-				Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+				Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: '.$setting[0]);
 			} else {
-				Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+				Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: '.$setting[0]);
 			}
 		}
 	}
@@ -195,7 +195,7 @@ 
 	 * @param TableNode|null $settings
 	 */
 	public function groupHasSetting($group, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/details?search=$group";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/groups/details?search=$group";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -227,9 +227,9 @@ 
 	 * @param TableNode|null $fields
 	 */
 	public function userHasEditableFields($user, $fields) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/user/fields";
 		if ($user !== 'self') {
-			$fullUrl .= '/' . $user;
+			$fullUrl .= '/'.$user;
 		}
 		$client = new Client();
 		$options = [];
@@ -257,7 +257,7 @@ 
 	 * @param TableNode|null $settings
 	 */
 	public function searchUserByPhone($region, TableNode $searchTable) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/search/by-phone";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/search/by-phone";
 		$client = new Client();
 		$options = [];
 		$options['auth'] = $this->adminUser;
@@ -314,7 +314,7 @@ 
 	}
 
 	public function userExists($user) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v2.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		$options['auth'] = $this->adminUser;
@@ -331,7 +331,7 @@ 
 	 * @param string $group
 	 */
 	public function checkThatUserBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+		$fullUrl = $this->baseUrl."v2.php/cloud/users/$user/groups";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -349,7 +349,7 @@ 
 	}
 
 	public function userBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+		$fullUrl = $this->baseUrl."v2.php/cloud/users/$user/groups";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -392,7 +392,7 @@ 
 	 * @param string $group
 	 */
 	public function userDoesNotBelongToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+		$fullUrl = $this->baseUrl."v2.php/cloud/users/$user/groups";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -414,7 +414,7 @@ 
 	 * @param string $group
 	 */
 	public function creatingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/groups";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -440,7 +440,7 @@ 
 	 * @When /^assure user "([^"]*)" is disabled$/
 	 */
 	public function assureUserIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user/disable";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -462,7 +462,7 @@ 
 	 * @param string $user
 	 */
 	public function deletingTheUser($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -480,7 +480,7 @@ 
 	 * @param string $group
 	 */
 	public function deletingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/groups/$group";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -516,7 +516,7 @@ 
 	 * @param string $group
 	 */
 	public function addingUserToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/groups";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user/groups";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -535,7 +535,7 @@ 
 
 
 	public function groupExists($group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
+		$fullUrl = $this->baseUrl."v2.php/cloud/groups/$group";
 		$client = new Client();
 		$options = [];
 		$options['auth'] = $this->adminUser;
@@ -593,7 +593,7 @@ 
 	 * @param string $group
 	 */
 	public function userIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+		$fullUrl = $this->baseUrl."v2.php/cloud/groups/$group/subadmins";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -616,7 +616,7 @@ 
 	 * @param string $group
 	 */
 	public function assureUserIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user/subadmins";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -638,7 +638,7 @@ 
 	 * @param string $group
 	 */
 	public function userIsNotSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+		$fullUrl = $this->baseUrl."v2.php/cloud/groups/$group/subadmins";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -808,7 +808,7 @@ 
 	 * @param string $app
 	 */
 	public function appIsDisabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=disabled';
+		$fullUrl = $this->baseUrl.'v2.php/cloud/apps?filter=disabled';
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -829,7 +829,7 @@ 
 	 * @param string $app
 	 */
 	public function appIsEnabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
+		$fullUrl = $this->baseUrl.'v2.php/cloud/apps?filter=enabled';
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -853,7 +853,7 @@ 
 	 * @param string $app
 	 */
 	public function appIsNotEnabled($app) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=enabled';
+		$fullUrl = $this->baseUrl.'v2.php/cloud/apps?filter=enabled';
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -874,7 +874,7 @@ 
 	 * @param string $user
 	 */
 	public function userIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -894,7 +894,7 @@ 
 	 * @param string $user
 	 */
 	public function userIsEnabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -921,7 +921,7 @@ 
 		]);
 
 		// method used from BasicStructure trait
-		$this->sendingToWith('PUT', '/cloud/users/' . $user, $body);
+		$this->sendingToWith('PUT', '/cloud/users/'.$user, $body);
 	}
 
 	/**
@@ -938,7 +938,7 @@ 
 	 * @param string $user
 	 */
 	public function getUserHome($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		$options['auth'] = $this->adminUser;
@@ -984,7 +984,7 @@ 
 	 * @Then /^user "([^"]*)" has not$/
 	 */
 	public function userHasNotSetting($user, TableNode $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl."v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {

core/Controller/ProfileApiController.php

Indentation +107 added lines, -107 removed lines

@@ -35,111 +35,111 @@
  * @psalm-import-type CoreProfileData from ResponseDefinitions
  */
 class ProfileApiController extends OCSController {
-	public function __construct(
-		IRequest $request,
-		private IConfig $config,
-		private ITimeFactory $timeFactory,
-		private ProfileConfigMapper $configMapper,
-		private ProfileManager $profileManager,
-		private IUserManager $userManager,
-		private IUserSession $userSession,
-		private IManager $shareManager,
-	) {
-		parent::__construct('core', $request);
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Update the visibility of a parameter
-	 *
-	 * @param string $targetUserId ID of the user
-	 * @param string $paramId ID of the parameter
-	 * @param string $visibility New visibility
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSBadRequestException Updating visibility is not possible
-	 * @throws OCSForbiddenException Not allowed to edit other users visibility
-	 * @throws OCSNotFoundException Account not found
-	 *
-	 * 200: Visibility updated successfully
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	#[UserRateLimit(limit: 40, period: 600)]
-	#[ApiRoute(verb: 'PUT', url: '/{targetUserId}', root: '/profile')]
-	public function setVisibility(string $targetUserId, string $paramId, string $visibility): DataResponse {
-		$requestingUser = $this->userSession->getUser();
-		if ($requestingUser->getUID() !== $targetUserId) {
-			throw new OCSForbiddenException('People can only edit their own visibility settings');
-		}
-
-		$targetUser = $this->userManager->get($targetUserId);
-		if (!$targetUser instanceof IUser) {
-			throw new OCSNotFoundException('Account does not exist');
-		}
-
-		// Ensure that a profile config is created in the database
-		$this->profileManager->getProfileConfig($targetUser, $targetUser);
-		$config = $this->configMapper->get($targetUserId);
-
-		if (!in_array($paramId, array_keys($config->getVisibilityMap()), true)) {
-			throw new OCSBadRequestException('Account does not have a profile parameter with ID: ' . $paramId);
-		}
-
-		$config->setVisibility($paramId, $visibility);
-		$this->configMapper->update($config);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Get profile fields for another user
-	 *
-	 * @param string $targetUserId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, CoreProfileData, array{}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, null, array{}>
-	 *
-	 * 200: Profile data returned successfully
-	 * 400: Profile is disabled
-	 * 404: Account not found or disabled
-	 */
-	#[NoAdminRequired]
-	#[ApiRoute(verb: 'GET', url: '/{targetUserId}', root: '/profile')]
-	#[BruteForceProtection(action: 'user')]
-	#[UserRateLimit(limit: 30, period: 120)]
-	public function getProfileFields(string $targetUserId): DataResponse {
-		$targetUser = $this->userManager->get($targetUserId);
-		if (!$targetUser instanceof IUser) {
-			$response = new DataResponse(null, Http::STATUS_NOT_FOUND);
-			$response->throttle();
-			return $response;
-		}
-		if (!$targetUser->isEnabled()) {
-			return new DataResponse(null, Http::STATUS_NOT_FOUND);
-		}
-
-		if (!$this->profileManager->isProfileEnabled($targetUser)) {
-			return new DataResponse(null, Http::STATUS_BAD_REQUEST);
-		}
-
-		$requestingUser = $this->userSession->getUser();
-		if ($targetUser !== $requestingUser) {
-			if (!$this->shareManager->currentUserCanEnumerateTargetUser($requestingUser, $targetUser)) {
-				return new DataResponse(null, Http::STATUS_NOT_FOUND);
-			}
-		}
-
-		$profileFields = $this->profileManager->getProfileFields($targetUser, $requestingUser);
-
-		// Extend the profile information with timezone of the user
-		$timezoneStringTarget = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
-		try {
-			$timezoneTarget = new \DateTimeZone($timezoneStringTarget);
-		} catch (\Throwable) {
-			$timezoneTarget = new \DateTimeZone('UTC');
-		}
-		$profileFields['timezone'] = $timezoneTarget->getName(); // E.g. Europe/Berlin
-		$profileFields['timezoneOffset'] = $timezoneTarget->getOffset($this->timeFactory->now()); // In seconds E.g. 7200
-
-		return new DataResponse($profileFields);
-	}
+    public function __construct(
+        IRequest $request,
+        private IConfig $config,
+        private ITimeFactory $timeFactory,
+        private ProfileConfigMapper $configMapper,
+        private ProfileManager $profileManager,
+        private IUserManager $userManager,
+        private IUserSession $userSession,
+        private IManager $shareManager,
+    ) {
+        parent::__construct('core', $request);
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Update the visibility of a parameter
+     *
+     * @param string $targetUserId ID of the user
+     * @param string $paramId ID of the parameter
+     * @param string $visibility New visibility
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSBadRequestException Updating visibility is not possible
+     * @throws OCSForbiddenException Not allowed to edit other users visibility
+     * @throws OCSNotFoundException Account not found
+     *
+     * 200: Visibility updated successfully
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    #[UserRateLimit(limit: 40, period: 600)]
+    #[ApiRoute(verb: 'PUT', url: '/{targetUserId}', root: '/profile')]
+    public function setVisibility(string $targetUserId, string $paramId, string $visibility): DataResponse {
+        $requestingUser = $this->userSession->getUser();
+        if ($requestingUser->getUID() !== $targetUserId) {
+            throw new OCSForbiddenException('People can only edit their own visibility settings');
+        }
+
+        $targetUser = $this->userManager->get($targetUserId);
+        if (!$targetUser instanceof IUser) {
+            throw new OCSNotFoundException('Account does not exist');
+        }
+
+        // Ensure that a profile config is created in the database
+        $this->profileManager->getProfileConfig($targetUser, $targetUser);
+        $config = $this->configMapper->get($targetUserId);
+
+        if (!in_array($paramId, array_keys($config->getVisibilityMap()), true)) {
+            throw new OCSBadRequestException('Account does not have a profile parameter with ID: ' . $paramId);
+        }
+
+        $config->setVisibility($paramId, $visibility);
+        $this->configMapper->update($config);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Get profile fields for another user
+     *
+     * @param string $targetUserId ID of the user
+     * @return DataResponse<Http::STATUS_OK, CoreProfileData, array{}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_NOT_FOUND, null, array{}>
+     *
+     * 200: Profile data returned successfully
+     * 400: Profile is disabled
+     * 404: Account not found or disabled
+     */
+    #[NoAdminRequired]
+    #[ApiRoute(verb: 'GET', url: '/{targetUserId}', root: '/profile')]
+    #[BruteForceProtection(action: 'user')]
+    #[UserRateLimit(limit: 30, period: 120)]
+    public function getProfileFields(string $targetUserId): DataResponse {
+        $targetUser = $this->userManager->get($targetUserId);
+        if (!$targetUser instanceof IUser) {
+            $response = new DataResponse(null, Http::STATUS_NOT_FOUND);
+            $response->throttle();
+            return $response;
+        }
+        if (!$targetUser->isEnabled()) {
+            return new DataResponse(null, Http::STATUS_NOT_FOUND);
+        }
+
+        if (!$this->profileManager->isProfileEnabled($targetUser)) {
+            return new DataResponse(null, Http::STATUS_BAD_REQUEST);
+        }
+
+        $requestingUser = $this->userSession->getUser();
+        if ($targetUser !== $requestingUser) {
+            if (!$this->shareManager->currentUserCanEnumerateTargetUser($requestingUser, $targetUser)) {
+                return new DataResponse(null, Http::STATUS_NOT_FOUND);
+            }
+        }
+
+        $profileFields = $this->profileManager->getProfileFields($targetUser, $requestingUser);
+
+        // Extend the profile information with timezone of the user
+        $timezoneStringTarget = $this->config->getUserValue($targetUser->getUID(), 'core', 'timezone') ?: $this->config->getSystemValueString('default_timezone', 'UTC');
+        try {
+            $timezoneTarget = new \DateTimeZone($timezoneStringTarget);
+        } catch (\Throwable) {
+            $timezoneTarget = new \DateTimeZone('UTC');
+        }
+        $profileFields['timezone'] = $timezoneTarget->getName(); // E.g. Europe/Berlin
+        $profileFields['timezoneOffset'] = $timezoneTarget->getOffset($this->timeFactory->now()); // In seconds E.g. 7200
+
+        return new DataResponse($profileFields);
+    }
 }