Toggle profile globally

Signed-off-by: Christopher Ng <chrng8@gmail.com>
nextcloud · Dec 10, 2021 · 99f8fe7 · 99f8fe7
1 parent c019e33
commit 99f8fe7
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 105 deletions.
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -56,7 +56,6 @@
 use OCP\Settings\ISettings;
 
 class PersonalInfo implements ISettings {
-	use \OC\Profile\TProfileHelper;
 
 	/** @var IConfig */
 	private $config;
@@ -166,15 +165,17 @@ public function getForm(): TemplateResponse {
 			'twitterScope' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
 			'twitterVerification' => $account->getProperty(IAccountManager::PROPERTY_TWITTER)->getVerified(),
 			'groups' => $this->getGroups($user),
-			'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService()
+			'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
+			'globalProfileEnabled' => $this->profileManager->isProfileEnabled(),
 		] + $messageParameters + $languageParameters + $localeParameters;
 
 		$personalInfoParameters = [
 			'userId' => $uid,
 			'displayNameMap' => $this->getDisplayNameMap($account),
 			'emailMap' => $this->getEmailMap($account),
 			'languageMap' => $this->getLanguageMap($user),
-			'profileEnabled' => $this->isProfileEnabled($account),
+			'globalProfileEnabled' => $this->profileManager->isProfileEnabled(),
+			'profileEnabled' => $this->profileManager->isProfileEnabled($user),
 			'organisationMap' => $this->getOrganisationMap($account),
 			'roleMap' => $this->getRoleMap($account),
 			'headlineMap' => $this->getHeadlineMap($account),

diff --git a/apps/settings/templates/settings/admin/server.php b/apps/settings/templates/settings/admin/server.php
@@ -112,3 +112,5 @@
 		</fieldset>
 	</form>
 </div>
+
+<div class="vue-global-profile-settings"></div>
diff --git a/apps/settings/templates/settings/personal/personal.info.php b/apps/settings/templates/settings/personal/personal.info.php
@@ -238,18 +238,20 @@
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 			</form>
 		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-organisation-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-role-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-headline-section"></div>
-		</div>
-		<div class="personal-settings-setting-box">
-			<div id="vue-biography-section"></div>
-		</div>
+		<?php if ($_['globalProfileEnabled']) : ?>
+			<div class="personal-settings-setting-box">
+				<div id="vue-organisation-section"></div>
+			</div>
+			<div class="personal-settings-setting-box">
+				<div id="vue-role-section"></div>
+			</div>
+			<div class="personal-settings-setting-box">
+				<div id="vue-headline-section"></div>
+			</div>
+			<div class="personal-settings-setting-box">
+				<div id="vue-biography-section"></div>
+			</div>
+		<?php endif; ?>
 	</div>
 
 	<div class="profile-settings-container">

diff --git a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
@@ -27,9 +27,9 @@
 
 namespace OCA\UserStatus\Listener;
 
+use OC\Profile\ProfileManager;
 use OCA\UserStatus\AppInfo\Application;
 use OCA\UserStatus\Service\JSDataService;
-use OCP\Accounts\IAccountManager;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\Event;
@@ -38,10 +38,9 @@
 use OCP\IUserSession;
 
 class BeforeTemplateRenderedListener implements IEventListener {
-	use \OC\Profile\TProfileHelper;
 
-	/** @var IAccountManager */
-	private $accountManager;
+	/** @var ProfileManager */
+	private $profileManager;
 
 	/** @var IUserSession */
 	private $userSession;
@@ -55,18 +54,18 @@ class BeforeTemplateRenderedListener implements IEventListener {
 	/**
 	 * BeforeTemplateRenderedListener constructor.
 	 *
-	 * @param IAccountManager $accountManager
+	 * @param ProfileManager $profileManager
 	 * @param IUserSession $userSession
 	 * @param IInitialStateService $initialState
 	 * @param JSDataService $jsDataService
 	 */
 	public function __construct(
-		IAccountManager $accountManager,
+		ProfileManager $profileManager,
 		IUserSession $userSession,
 		IInitialStateService $initialState,
 		JSDataService $jsDataService
 	) {
-		$this->accountManager = $accountManager;
+		$this->profileManager = $profileManager;
 		$this->userSession = $userSession;
 		$this->initialState = $initialState;
 		$this->jsDataService = $jsDataService;
@@ -80,7 +79,6 @@ public function handle(Event $event): void {
 		if ($user === null) {
 			return;
 		}
-		$account = $this->accountManager->getAccount($user);
 
 		if (!($event instanceof BeforeTemplateRenderedEvent)) {
 			// Unrelated
@@ -95,8 +93,8 @@ public function handle(Event $event): void {
 			return $this->jsDataService;
 		});
 
-		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($account) {
-			return ['profileEnabled' => $this->isProfileEnabled($account)];
+		$this->initialState->provideLazyInitialState(Application::APP_ID, 'profileEnabled', function () use ($user) {
+			return ['profileEnabled' => $this->profileManager->isProfileEnabled($user)];
 		});
 
 		\OCP\Util::addScript('user_status', 'user-status-menu');

diff --git a/config/config.sample.php b/config/config.sample.php
@@ -2009,4 +2009,14 @@
  * Also, it might log sensitive data into a plain text file.
  */
 'ldap_log_file' => '',
+
+
+/**
+ * Globally enable/disable the profile feature
+ *
+ * When globally enabled, users may individually enable/disable their profiles
+ *
+ * Defaults to ``true``
+ */
+'profile.enabled' => true,
 ];
diff --git a/core/Controller/ProfilePageController.php b/core/Controller/ProfilePageController.php
@@ -28,7 +28,6 @@
 
 use OC\KnownUser\KnownUserService;
 use OC\Profile\ProfileManager;
-use OCP\Accounts\IAccountManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
@@ -41,26 +40,16 @@
 use OCP\UserStatus\IManager as IUserStatusManager;
 
 class ProfilePageController extends Controller {
-	use \OC\Profile\TProfileHelper;
 
 	/** @var IInitialState */
 	private $initialStateService;
 
-	/** @var IAccountManager */
-	private $accountManager;
-
 	/** @var ProfileManager */
 	private $profileManager;
 
 	/** @var IShareManager */
 	private $shareManager;
 
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var KnownUserService */
-	private $knownUserService;
-
 	/** @var IUserManager */
 	private $userManager;
 
@@ -74,7 +63,6 @@ public function __construct(
 		$appName,
 		IRequest $request,
 		IInitialState $initialStateService,
-		IAccountManager $accountManager,
 		ProfileManager $profileManager,
 		IShareManager $shareManager,
 		IGroupManager $groupManager,
@@ -85,7 +73,6 @@ public function __construct(
 	) {
 		parent::__construct($appName, $request);
 		$this->initialStateService = $initialStateService;
-		$this->accountManager = $accountManager;
 		$this->profileManager = $profileManager;
 		$this->shareManager = $shareManager;
 		$this->groupManager = $groupManager;

diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php
@@ -32,7 +32,7 @@
 namespace OC\Contacts\ContactsMenu;
 
 use OC\KnownUser\KnownUserService;
-use OCP\Accounts\IAccountManager;
+use OC\Profile\ProfileManager;
 use OCP\Contacts\ContactsMenu\IContactsStore;
 use OCP\Contacts\ContactsMenu\IEntry;
 use OCP\Contacts\IManager;
@@ -44,17 +44,16 @@
 use OCP\L10N\IFactory as IL10NFactory;
 
 class ContactsStore implements IContactsStore {
-	use \OC\Profile\TProfileHelper;
-
-	/** @var IAccountManager */
-	private $accountManager;
 
 	/** @var IManager */
 	private $contactsManager;
 
 	/** @var IConfig */
 	private $config;
 
+	/** @var ProfileManager */
+	private $profileManager;
+
 	/** @var IUserManager */
 	private $userManager;
 
@@ -71,18 +70,18 @@ class ContactsStore implements IContactsStore {
 	private $l10nFactory;
 
 	public function __construct(
-		IAccountManager $accountManager,
 		IManager $contactsManager,
 		IConfig $config,
+		ProfileManager $profileManager,
 		IUserManager $userManager,
 		IURLGenerator $urlGenerator,
 		IGroupManager $groupManager,
 		KnownUserService $knownUserService,
 		IL10NFactory $l10nFactory
 	) {
-		$this->accountManager = $accountManager;
 		$this->contactsManager = $contactsManager;
 		$this->config = $config;
+		$this->profileManager = $profileManager;
 		$this->userManager = $userManager;
 		$this->urlGenerator = $urlGenerator;
 		$this->groupManager = $groupManager;
@@ -335,10 +334,9 @@ private function contactArrayToEntry(array $contact) {
 		// Provide profile parameters for core/src/OC/contactsmenu/contact.handlebars template
 		if (isset($contact['UID']) && isset($contact['FN'])) {
 			$targetUserId = $contact['UID'];
-			$user = $this->userManager->get($targetUserId);
-			if (!empty($user)) {
-				$account = $this->accountManager->getAccount($user);
-				if ($this->isProfileEnabled($account)) {
+			$targetUser = $this->userManager->get($targetUserId);
+			if (!empty($targetUser)) {
+				if ($this->profileManager->isProfileEnabled($targetUser)) {
 					$entry->setProfileTitle($this->l10nFactory->get('lib')->t('View profile'));
 					$entry->setProfileUrl($this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $targetUserId]));
 				}

diff --git a/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php b/lib/private/Contacts/ContactsMenu/Providers/ProfileProvider.php
@@ -24,7 +24,7 @@
 
 namespace OC\Contacts\ContactsMenu\Providers;
 
-use OCP\Accounts\IAccountManager;
+use OC\Profile\ProfileManager;
 use OCP\Contacts\ContactsMenu\IActionFactory;
 use OCP\Contacts\ContactsMenu\IEntry;
 use OCP\Contacts\ContactsMenu\IProvider;
@@ -33,14 +33,13 @@
 use OCP\L10N\IFactory as IL10NFactory;
 
 class ProfileProvider implements IProvider {
-	use \OC\Profile\TProfileHelper;
-
-	/** @var IAccountManager */
-	private $accountManager;
 
 	/** @var IActionFactory */
 	private $actionFactory;
 
+	/** @var ProfileManager */
+	private $profileManager;
+
 	/** @var IL10NFactory */
 	private $l10nFactory;
 
@@ -51,21 +50,21 @@ class ProfileProvider implements IProvider {
 	private $userManager;
 
 	/**
-	 * @param IAccountManager $accountManager
 	 * @param IActionFactory $actionFactory
+	 * @param ProfileManager $profileManager
 	 * @param IL10NFactory $l10nFactory
 	 * @param IURLGenerator $urlGenerator
 	 * @param IUserManager $userManager
 	 */
 	public function __construct(
-		IAccountManager $accountManager,
 		IActionFactory $actionFactory,
+		ProfileManager $profileManager,
 		IL10NFactory $l10nFactory,
 		IURLGenerator $urlGenerator,
 		IUserManager $userManager
 	) {
-		$this->accountManager = $accountManager;
 		$this->actionFactory = $actionFactory;
+		$this->profileManager = $profileManager;
 		$this->l10nFactory = $l10nFactory;
 		$this->urlGenerator = $urlGenerator;
 		$this->userManager = $userManager;
@@ -78,8 +77,7 @@ public function process(IEntry $entry) {
 		$targetUserId = $entry->getProperty('UID');
 		$targetUser = $this->userManager->get($targetUserId);
 		if (!empty($targetUser)) {
-			$account = $this->accountManager->getAccount($targetUser);
-			if ($this->isProfileEnabled($account)) {
+			if ($this->profileManager->isProfileEnabled($targetUser)) {
 				$iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/profile.svg'));
 				$profileActionText = $this->l10nFactory->get('lib')->t('View profile');
 				$profileUrl = $this->urlGenerator->linkToRouteAbsolute('core.ProfilePage.index', ['targetUserId' => $targetUserId]);

diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php
@@ -40,6 +40,7 @@
 use OCP\Accounts\PropertyDoesNotExistException;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\IConfig;
 use OCP\IUser;
 use OCP\L10N\IFactory;
 use OCP\Profile\ILinkAction;
@@ -54,6 +55,9 @@ class ProfileManager {
 	/** @var IAppManager */
 	private $appManager;
 
+	/** @var IConfig */
+	private $config;
+
 	/** @var ProfileConfigMapper */
 	private $configMapper;
 
@@ -106,6 +110,7 @@ class ProfileManager {
 	public function __construct(
 		IAccountManager $accountManager,
 		IAppManager $appManager,
+		IConfig $config,
 		ProfileConfigMapper $configMapper,
 		ContainerInterface $container,
 		KnownUserService $knownUserService,
@@ -115,6 +120,7 @@ public function __construct(
 	) {
 		$this->accountManager = $accountManager;
 		$this->appManager = $appManager;
+		$this->config = $config;
 		$this->configMapper = $configMapper;
 		$this->container = $container;
 		$this->knownUserService = $knownUserService;
@@ -123,6 +129,25 @@ public function __construct(
 		$this->coordinator = $coordinator;
 	}
 
+	/**
+	 * Return whether profile is enabled for the user,
+	 * if no user is passed returns whether profile is enabled globally in `config.php`
+	 */
+	public function isProfileEnabled(?IUser $user = null): ?bool {
+		$globalProfileEnabled = $this->config->getSystemValueBool('profile.enabled', true);
+
+		if ($globalProfileEnabled && !empty($user)) {
+			$account = $this->accountManager->getAccount($user);
+			return filter_var(
+				$account->getProperty(IAccountManager::PROPERTY_PROFILE_ENABLED)->getValue(),
+				FILTER_VALIDATE_BOOLEAN,
+				FILTER_NULL_ON_FAILURE,
+			);
+		}
+
+		return $globalProfileEnabled;
+	}
+
 	/**
 	 * Register an action for the user
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,3 +112,5 @@ @@
     		</fieldset>
     	</form>
     </div>
+    <div class="vue-global-profile-settings"></div>