fix: Use user uid to compare in PhotosPicker

Signed-off-by: Louis Chemineau <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
nextcloud · Sep 26, 2024 · e536555 · e536555
1 parent ae6a6eb
commit e536555
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 19 deletions.
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/...ue-material-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.js b/...ue-material-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.js
diff --git a/...aterial-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.js.map b/...aterial-design-icons_AlertCircle_vue-node_modules_vue-material-design-icons-ea65fb.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/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js b/...rtControllerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js
diff --git a/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map b/...ntrollerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Folders_vue.js b/js/photos-src_views_Folders_vue.js
diff --git a/js/photos-src_views_Folders_vue.js.map b/js/photos-src_views_Folders_vue.js.map
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -105,6 +105,13 @@ public function index(): TemplateResponse {
 		$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
 		$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
 
+		$userFolder = $this->rootFolder->getUserFolder($user->getUid());
+		try {
+			$photosFolder = $userFolder->get($this->userConfig->getUserConfig('photosLocation'));
+		} catch (NotFoundException $e) {
+			$photosFolder = $userFolder->newFolder($this->userConfig->getUserConfig('photosLocation'));
+		}
+
 		$this->initialState->provideInitialState('image-mimes', Application::IMAGE_MIMES);
 		$this->initialState->provideInitialState('video-mimes', Application::VIDEO_MIMES);
 		$this->initialState->provideInitialState('maps', $this->appManager->isEnabledForUser('maps') === true);

diff --git a/lib/Sabre/Album/AlbumRoot.php b/lib/Sabre/Album/AlbumRoot.php
@@ -29,6 +29,7 @@
 use OCA\Photos\Album\AlbumWithFiles;
 use OCA\Photos\Service\UserConfigService;
 use OCP\Files\Folder;
+use OCP\Files\InvalidDirectoryException;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use Sabre\DAV\Exception\Conflict;
@@ -106,6 +107,10 @@ public function createFile($name, $data = null) {
 				throw new Conflict('The destination exists and is not a folder');
 			}
 
+			if ($photosFolder->isShared()) {
+				throw new InvalidDirectoryException('The destination is a received share');
+			}
+
 			// Check for conflict and rename the file accordingly
 			$newName = \basename(\OC_Helper::buildNotExistingFileName($photosLocation, $name));
 

diff --git a/src/components/FilesPicker.vue b/src/components/FilesPicker.vue
@@ -81,7 +81,8 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { NcButton, NcLoadingIcon } from '@nextcloud/vue'
+import { NcButton, NcLoadingIcon, NcNoteCard } from '@nextcloud/vue'
+import { getCurrentUser } from '@nextcloud/auth'
 import { UploadPicker } from '@nextcloud/upload'
 import moment from '@nextcloud/moment'
 
@@ -105,6 +106,7 @@ export default {
 		ImagePlus,
 		NcButton,
 		NcLoadingIcon,
+		NcNoteCard,
 		UploadPicker,
 	},
 
@@ -150,6 +152,7 @@ export default {
 			uploadContext: {
 				route: 'albumpicker',
 			},
+			currentUser: getCurrentUser().uid,
 		}
 	},
 
@@ -263,9 +266,18 @@ export default {
 
 	&__actions {
 		display: flex;
+		flex-direction: column;
 		justify-content: space-between;
 		justify-items: center;
 		padding-top: 16px;
+		flex-grow: 1;
+
+		&__buttons {
+			display: flex;
+			align-items: center;
+			justify-content: end;
+			gap: 16px;
+		}
 	}
 }
 </style>
diff --git a/src/mixins/UserConfig.js b/src/mixins/UserConfig.js
@@ -36,6 +36,7 @@ export default {
 				? croppedLayoutLocalStorage === 'true'
 				: loadState('photos', 'croppedLayout', 'false') === 'true',
 			photosLocation: loadState('photos', 'photosLocation', ''),
+			photosLocationOwner: loadState('photos', 'photosLocationOwner', ''),
 		}
 	},