Merge pull request #39355 from nextcloud/backport/39323/39323-stable26

AndyScherzinger · web-flow · commit ec0e9dd458c6 · 2023-07-13T14:17:52.000+02:00
[stable26] getStorage before remove
diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php
@@ -143,4 +143,10 @@ public function getVisibilityType() {
 	protected function isApplicable(StorageConfig $config) {
 		return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAl;
 	}
+
+	public function removeStorage($id) {
+		// verify ownership through $this->isApplicable() and otherwise throws an exception
+		$this->getStorage($id);
+		parent::removeStorage($id);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -143,4 +143,10 @@ public function getVisibilityType() {`
`143`	`143`	`protected function isApplicable(StorageConfig $config) {`
`144`	`144`	`return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAl;`
`145`	`145`	`}`
	`146`	`+`
	`147`	`+ public function removeStorage($id) {`
	`148`	`+ // verify ownership through $this->isApplicable() and otherwise throws an exception`
	`149`	`+ $this->getStorage($id);`
	`150`	`+ parent::removeStorage($id);`
	`151`	`+ }`
`146`	`152`	`}`