Expose session based authentication through mount point type

Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Oct 7, 2020 · 8fb946d · 8fb946d
1 parent 678ef84
commit 8fb946d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/apps/files_external/lib/Config/ConfigAdapter.php b/apps/files_external/lib/Config/ConfigAdapter.php
@@ -166,15 +166,15 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
 					null,
 					$loader,
-					$storageConfig->getMountOptions()
+					array_merge($storageConfig->getMountOptions(), ['storageConfig' => $storageConfig])
 				);
 			} else {
 				return new ExternalMountPoint(
 					$storage,
 					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
 					null,
 					$loader,
-					$storageConfig->getMountOptions(),
+					array_merge($storageConfig->getMountOptions(), ['storageConfig' => $storageConfig]),
 					$storageConfig->getId()
 				);
 			}

diff --git a/apps/files_external/lib/Config/ExternalMountPoint.php b/apps/files_external/lib/Config/ExternalMountPoint.php
@@ -24,9 +24,23 @@
 namespace OCA\Files_External\Config;
 
 use OC\Files\Mount\MountPoint;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 
 class ExternalMountPoint extends MountPoint {
+
+	/** @var StorageConfig */
+	private $storageConfig;
+
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null, $mountId = null) {
+		if (isset($mountOptions['storageConfig'])) {
+			$this->storageConfig = $mountOptions['storageConfig'];
+			unset($mountOptions['storageConfig']);
+		}
+		parent::__construct($storage, $mountpoint, $arguments, $loader, $mountOptions, $mountId);
+	}
+
 	public function getMountType() {
-		return 'external';
+		return ($this->storageConfig->getAuthMechanism() instanceof SessionCredentials) ? 'external-session' : 'external';
 	}
 }