fix(3rd-party apps): do not link to maps/recognize install page if th…

…e appstore isn't enabled Even if the user is admin, they might not have access to the app store. Signed-off-by: Thomas Citharel <[email protected]>
nextcloud · Apr 15, 2024 · 4c2f100 · 4c2f100
1 parent c08710c
commit 4c2f100
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 23 deletions.
diff --git a/js/photos-dashboard.js b/js/photos-dashboard.js
diff --git a/js/photos-dashboard.js.map b/js/photos-dashboard.js.map
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-sidebar.js b/js/photos-sidebar.js
diff --git a/js/photos-sidebar.js.map b/js/photos-sidebar.js.map
diff --git a/js/photos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js b/js/photos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js
diff --git a/...otos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js.map b/...otos-vendors-node_modules_nextcloud_upload_dist_chunks_ConflictPicker-28e9d8de_mjs.js.map
diff --git a/...odules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js b/...odules_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js
diff --git a/...es_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js.map b/...es_nextcloud_upload_node_modules_nextcloud_dialogs_dist_chunks_FilePicker-0-aee94f.js.map
diff --git a/...odules_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js b/...odules_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js
diff --git a/...es_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js.map b/...es_vue-material-design-icons_ArrowLeft_vue-node_modules_nextcloud_upload_di-f407f6.js.map
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -5,6 +5,7 @@
  * @copyright Copyright (c) 2019 John Molakvoæ <[email protected]>
  *
  * @author John Molakvoæ <[email protected]>
+ * @author Thomas Citharel <[email protected]>
  *
  * @license AGPL-3.0-or-later
  *
@@ -113,6 +114,7 @@ public function index(): TemplateResponse {
 		$this->initialState->provideInitialState('recognize', $this->appManager->isEnabledForUser('recognize') === true);
 		$this->initialState->provideInitialState('systemtags', $this->appManager->isEnabledForUser('systemtags') === true);
 		$this->initialState->provideInitialState('showPeopleMenuEntry', $this->config->getAppValue('photos', 'showPeopleMenuEntry', 'true') === 'true');
+		$this->initialState->provideInitialState('appStoreEnabled', $this->config->getSystemValueBool('appstoreenabled', true));
 
 		// Provide user config
 		foreach (array_keys(UserConfigService::DEFAULT_CONFIGS) as $key) {

diff --git a/src/Photos.vue b/src/Photos.vue
@@ -2,6 +2,7 @@
  - @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
  -
  - @author John Molakvoæ <[email protected]>
+ - @author Thomas Citharel <[email protected]>
  -
  - @license AGPL-3.0-or-later
  -
@@ -158,6 +159,7 @@ import videoplaceholder from './assets/video.svg'
 import areTagsInstalled from './services/AreTagsInstalled.js'
 import isMapsInstalled from './services/IsMapsInstalled.js'
 import isRecognizeInstalled from './services/IsRecognizeInstalled.js'
+import isAppStoreEnabled from './services/IsAppStoreEnabled.js'
 import logger from './services/logger.js'
 
 export default {
@@ -193,10 +195,10 @@ export default {
 
 			showLocationMenuEntry: getCurrentUser() === null
 				? false
-				: getCurrentUser().isAdmin || isMapsInstalled,
+				: (getCurrentUser().isAdmin && isAppStoreEnabled) || isMapsInstalled,
 			showPeopleMenuEntry: getCurrentUser() === null
 				? false
-				: (getCurrentUser().isAdmin && loadState('photos', 'showPeopleMenuEntry', true)) || isRecognizeInstalled,
+				: (getCurrentUser().isAdmin && loadState('photos', 'showPeopleMenuEntry', true) && isAppStoreEnabled) || isRecognizeInstalled,
 
 			openedSettings: false,
 		}

diff --git a/src/services/IsAppStoreEnabled.js b/src/services/IsAppStoreEnabled.js
@@ -0,0 +1,26 @@
+/**
+ * @copyright Copyright (c) 2024 Thomas Citharel <[email protected]>
+ *
+ * @author Thomas Citharel <[email protected]>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { loadState } from '@nextcloud/initial-state'
+
+const appStoreEnabled = loadState('photos', 'appStoreEnabled')
+export default appStoreEnabled