nextcloud / server

lib/private/Share20/Share.php

Indentation +444 added lines, -444 removed lines

@@ -32,448 +32,448 @@
 
 class Share implements \OCP\Share\IShare {
 
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $providerId;
-	/** @var Node */
-	private $node;
-	/** @var int */
-	private $fileId;
-	/** @var string */
-	private $nodeType;
-	/** @var int */
-	private $shareType;
-	/** @var string */
-	private $sharedWith;
-	/** @var string */
-	private $sharedWithDisplayName;
-	/** @var string */
-	private $sharedWithAvatar;
-	/** @var string */
-	private $sharedBy;
-	/** @var string */
-	private $shareOwner;
-	/** @var int */
-	private $permissions;
-	/** @var \DateTime */
-	private $expireDate;
-	/** @var string */
-	private $password;
-	/** @var string */
-	private $token;
-	/** @var int */
-	private $parent;
-	/** @var string */
-	private $target;
-	/** @var \DateTime */
-	private $shareTime;
-	/** @var bool */
-	private $mailSend;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ICacheEntry|null */
-	private $nodeCacheEntry;
-
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setId($id) {
-		if (is_int($id)) {
-			$id = (string)$id;
-		}
-
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->id !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
-		}
-
-		$this->id = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFullId() {
-		if ($this->providerId === null || $this->id === null) {
-			throw new \UnexpectedValueException;
-		}
-		return $this->providerId . ':' . $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setProviderId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->providerId !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
-		}
-
-		$this->providerId = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNode(Node $node) {
-		$this->fileId = null;
-		$this->nodeType = null;
-		$this->node = $node;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNode() {
-		if ($this->node === null) {
-
-			if ($this->shareOwner === null || $this->fileId === null) {
-				throw new NotFoundException();
-			}
-
-			// for federated shares the owner can be a remote user, in this
-			// case we use the initiator
-			if($this->userManager->userExists($this->shareOwner)) {
-				$userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
-			}
-
-			$nodes = $userFolder->getById($this->fileId);
-			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
-			}
-
-			$this->node = $nodes[0];
-		}
-
-		return $this->node;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeId($fileId) {
-		$this->node = null;
-		$this->fileId = $fileId;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeId() {
-		if ($this->fileId === null) {
-			$this->fileId = $this->getNode()->getId();
-		}
-
-		return $this->fileId;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeType($type) {
-		if ($type !== 'file' && $type !== 'folder') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->nodeType = $type;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeType() {
-		if ($this->nodeType === null) {
-			$node = $this->getNode();
-			$this->nodeType = $node instanceof File ? 'file' : 'folder';
-		}
-
-		return $this->nodeType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareType($shareType) {
-		$this->shareType = $shareType;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareType() {
-		return $this->shareType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWith($sharedWith) {
-		if (!is_string($sharedWith)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWith = $sharedWith;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith() {
-		return $this->sharedWith;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithDisplayName($displayName) {
-		if (!is_string($displayName)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithDisplayName = $displayName;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithDisplayName() {
-		return $this->sharedWithDisplayName;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithAvatar($src) {
-		if (!is_string($src)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithAvatar = $src;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithAvatar() {
-		return $this->sharedWithAvatar;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPermissions($permissions) {
-		//TODO checkes
-
-		$this->permissions = $permissions;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPermissions() {
-		return $this->permissions;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setExpirationDate($expireDate) {
-		//TODO checks
-
-		$this->expireDate = $expireDate;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getExpirationDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedBy($sharedBy) {
-		if (!is_string($sharedBy)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-		$this->sharedBy = $sharedBy;
-
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedBy() {
-		//TODO check if set
-		return $this->sharedBy;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareOwner($shareOwner) {
-		if (!is_string($shareOwner)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-
-		$this->shareOwner = $shareOwner;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareOwner() {
-		//TODO check if set
-		return $this->shareOwner;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPassword($password) {
-		$this->password = $password;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setToken($token) {
-		$this->token = $token;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Set the parent of this share
-	 *
-	 * @param int parent
-	 * @return \OCP\Share\IShare
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function setParent($parent) {
-		$this->parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Get the parent of this share.
-	 *
-	 * @return int
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setTarget($target) {
-		$this->target = $target;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getTarget() {
-		return $this->target;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareTime(\DateTime $shareTime) {
-		$this->shareTime = $shareTime;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareTime() {
-		return $this->shareTime;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setMailSend($mailSend) {
-		$this->mailSend = $mailSend;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getMailSend() {
-		return $this->mailSend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry) {
-		$this->nodeCacheEntry = $entry;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeCacheEntry() {
-		return $this->nodeCacheEntry;
-	}
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $providerId;
+    /** @var Node */
+    private $node;
+    /** @var int */
+    private $fileId;
+    /** @var string */
+    private $nodeType;
+    /** @var int */
+    private $shareType;
+    /** @var string */
+    private $sharedWith;
+    /** @var string */
+    private $sharedWithDisplayName;
+    /** @var string */
+    private $sharedWithAvatar;
+    /** @var string */
+    private $sharedBy;
+    /** @var string */
+    private $shareOwner;
+    /** @var int */
+    private $permissions;
+    /** @var \DateTime */
+    private $expireDate;
+    /** @var string */
+    private $password;
+    /** @var string */
+    private $token;
+    /** @var int */
+    private $parent;
+    /** @var string */
+    private $target;
+    /** @var \DateTime */
+    private $shareTime;
+    /** @var bool */
+    private $mailSend;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ICacheEntry|null */
+    private $nodeCacheEntry;
+
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setId($id) {
+        if (is_int($id)) {
+            $id = (string)$id;
+        }
+
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->id !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
+        }
+
+        $this->id = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFullId() {
+        if ($this->providerId === null || $this->id === null) {
+            throw new \UnexpectedValueException;
+        }
+        return $this->providerId . ':' . $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setProviderId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->providerId !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
+        }
+
+        $this->providerId = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNode(Node $node) {
+        $this->fileId = null;
+        $this->nodeType = null;
+        $this->node = $node;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNode() {
+        if ($this->node === null) {
+
+            if ($this->shareOwner === null || $this->fileId === null) {
+                throw new NotFoundException();
+            }
+
+            // for federated shares the owner can be a remote user, in this
+            // case we use the initiator
+            if($this->userManager->userExists($this->shareOwner)) {
+                $userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
+            }
+
+            $nodes = $userFolder->getById($this->fileId);
+            if (empty($nodes)) {
+                throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+            }
+
+            $this->node = $nodes[0];
+        }
+
+        return $this->node;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeId($fileId) {
+        $this->node = null;
+        $this->fileId = $fileId;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeId() {
+        if ($this->fileId === null) {
+            $this->fileId = $this->getNode()->getId();
+        }
+
+        return $this->fileId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeType($type) {
+        if ($type !== 'file' && $type !== 'folder') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->nodeType = $type;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeType() {
+        if ($this->nodeType === null) {
+            $node = $this->getNode();
+            $this->nodeType = $node instanceof File ? 'file' : 'folder';
+        }
+
+        return $this->nodeType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareType($shareType) {
+        $this->shareType = $shareType;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareType() {
+        return $this->shareType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWith($sharedWith) {
+        if (!is_string($sharedWith)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWith = $sharedWith;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith() {
+        return $this->sharedWith;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithDisplayName($displayName) {
+        if (!is_string($displayName)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithDisplayName = $displayName;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithDisplayName() {
+        return $this->sharedWithDisplayName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithAvatar($src) {
+        if (!is_string($src)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithAvatar = $src;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithAvatar() {
+        return $this->sharedWithAvatar;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPermissions($permissions) {
+        //TODO checkes
+
+        $this->permissions = $permissions;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPermissions() {
+        return $this->permissions;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExpirationDate($expireDate) {
+        //TODO checks
+
+        $this->expireDate = $expireDate;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExpirationDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedBy($sharedBy) {
+        if (!is_string($sharedBy)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+        $this->sharedBy = $sharedBy;
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedBy() {
+        //TODO check if set
+        return $this->sharedBy;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareOwner($shareOwner) {
+        if (!is_string($shareOwner)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+
+        $this->shareOwner = $shareOwner;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareOwner() {
+        //TODO check if set
+        return $this->shareOwner;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPassword($password) {
+        $this->password = $password;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setToken($token) {
+        $this->token = $token;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getToken() {
+        return $this->token;
+    }
+
+    /**
+     * Set the parent of this share
+     *
+     * @param int parent
+     * @return \OCP\Share\IShare
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function setParent($parent) {
+        $this->parent = $parent;
+        return $this;
+    }
+
+    /**
+     * Get the parent of this share.
+     *
+     * @return int
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTarget($target) {
+        $this->target = $target;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareTime(\DateTime $shareTime) {
+        $this->shareTime = $shareTime;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareTime() {
+        return $this->shareTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setMailSend($mailSend) {
+        $this->mailSend = $mailSend;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMailSend() {
+        return $this->mailSend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry) {
+        $this->nodeCacheEntry = $entry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeCacheEntry() {
+        return $this->nodeCacheEntry;
+    }
 }

lib/public/Share/IShare.php

Indentation +338 added lines, -338 removed lines

@@ -39,342 +39,342 @@
  */
 interface IShare {
 
-	/**
-	 * Set the internal id of the share
-	 * It is only allowed to set the internal id of a share once.
-	 * Attempts to override the internal id will result in an IllegalIDChangeException
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws IllegalIDChangeException
-	 * @throws \InvalidArgumentException
-	 * @since 9.1.0
-	 */
-	public function setId($id);
-
-	/**
-	 * Get the internal id of the share.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getId();
-
-	/**
-	 * Get the full share id. This is the <providerid>:<internalid>.
-	 * The full id is unique in the system.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 * @throws \UnexpectedValueException If the fullId could not be constructed
-	 */
-	public function getFullId();
-
-	/**
-	 * Set the provider id of the share
-	 * It is only allowed to set the provider id of a share once.
-	 * Attempts to override the provider id will result in an IllegalIDChangeException
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws IllegalIDChangeException
-	 * @throws \InvalidArgumentException
-	 * @since 9.1.0
-	 */
-	public function setProviderId($id);
-
-	/**
-	 * Set the node of the file/folder that is shared
-	 *
-	 * @param Node $node
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNode(Node $node);
-
-	/**
-	 * Get the node of the file/folder that is shared
-	 *
-	 * @return File|Folder
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNode();
-
-	/**
-	 * Set file id for lazy evaluation of the node
-	 * @param int $fileId
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNodeId($fileId);
-
-	/**
-	 * Get the fileid of the node of this share
-	 * @return int
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNodeId();
-
-	/**
-	 * Set the type of node (file/folder)
-	 *
-	 * @param string $type
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setNodeType($type);
-
-	/**
-	 * Get the type of node (file/folder)
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 * @throws NotFoundException
-	 */
-	public function getNodeType();
-
-	/**
-	 * Set the shareType
-	 *
-	 * @param int $shareType
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareType($shareType);
-
-	/**
-	 * Get the shareType
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getShareType();
-
-	/**
-	 * Set the receiver of this share.
-	 *
-	 * @param string $sharedWith
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setSharedWith($sharedWith);
-
-	/**
-	 * Get the receiver of this share.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getSharedWith();
-
-	/**
-	 * Set the display name of the receiver of this share.
-	 *
-	 * @param string $displayName
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 14.0.0
-	 */
-	public function setSharedWithDisplayName($displayName);
-
-	/**
-	 * Get the display name of the receiver of this share.
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getSharedWithDisplayName();
-
-	/**
-	 * Set the avatar of the receiver of this share.
-	 *
-	 * @param string $src
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 14.0.0
-	 */
-	public function setSharedWithAvatar($src);
-
-	/**
-	 * Get the avatar of the receiver of this share.
-	 *
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getSharedWithAvatar();
-
-	/**
-	 * Set the permissions.
-	 * See \OCP\Constants::PERMISSION_*
-	 *
-	 * @param int $permissions
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setPermissions($permissions);
-
-	/**
-	 * Get the share permissions
-	 * See \OCP\Constants::PERMISSION_*
-	 *
-	 * @return int
-	 * @since 9.0.0
-	 */
-	public function getPermissions();
-
-	/**
-	 * Set the expiration date
-	 *
-	 * @param null|\DateTime $expireDate
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setExpirationDate($expireDate);
-
-	/**
-	 * Get the expiration date
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getExpirationDate();
-
-	/**
-	 * Set the sharer of the path.
-	 *
-	 * @param string $sharedBy
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setSharedBy($sharedBy);
-
-	/**
-	 * Get share sharer
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getSharedBy();
-
-	/**
-	 * Set the original share owner (who owns the path that is shared)
-	 *
-	 * @param string $shareOwner
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareOwner($shareOwner);
-
-	/**
-	 * Get the original share owner (who owns the path that is shared)
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getShareOwner();
-
-	/**
-	 * Set the password for this share.
-	 * When the share is passed to the share manager to be created
-	 * or updated the password will be hashed.
-	 *
-	 * @param string $password
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setPassword($password);
-
-	/**
-	 * Get the password of this share.
-	 * If this share is obtained via a shareprovider the password is
-	 * hashed.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getPassword();
-
-	/**
-	 * Set the public link token.
-	 *
-	 * @param string $token
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setToken($token);
-
-	/**
-	 * Get the public link token.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getToken();
-
-	/**
-	 * Set the target path of this share relative to the recipients user folder.
-	 *
-	 * @param string $target
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setTarget($target);
-
-	/**
-	 * Get the target path of this share relative to the recipients user folder.
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTarget();
-
-	/**
-	 * Set the time this share was created
-	 *
-	 * @param \DateTime $shareTime
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setShareTime(\DateTime $shareTime);
-
-	/**
-	 * Get the timestamp this share was created
-	 *
-	 * @return \DateTime
-	 * @since 9.0.0
-	 */
-	public function getShareTime();
-
-	/**
-	 * Set if the recipient is informed by mail about the share.
-	 *
-	 * @param bool $mailSend
-	 * @return \OCP\Share\IShare The modified object
-	 * @since 9.0.0
-	 */
-	public function setMailSend($mailSend);
-
-	/**
-	 * Get if the recipient informed by mail about the share.
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function getMailSend();
-
-	/**
-	 * Set the cache entry for the shared node
-	 *
-	 * @param ICacheEntry $entry
-	 * @since 11.0.0
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry);
-
-	/**
-	 * Get the cache entry for the shared node
-	 *
-	 * @return null|ICacheEntry
-	 * @since 11.0.0
-	 */
-	public function getNodeCacheEntry();
+    /**
+     * Set the internal id of the share
+     * It is only allowed to set the internal id of a share once.
+     * Attempts to override the internal id will result in an IllegalIDChangeException
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws IllegalIDChangeException
+     * @throws \InvalidArgumentException
+     * @since 9.1.0
+     */
+    public function setId($id);
+
+    /**
+     * Get the internal id of the share.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getId();
+
+    /**
+     * Get the full share id. This is the <providerid>:<internalid>.
+     * The full id is unique in the system.
+     *
+     * @return string
+     * @since 9.0.0
+     * @throws \UnexpectedValueException If the fullId could not be constructed
+     */
+    public function getFullId();
+
+    /**
+     * Set the provider id of the share
+     * It is only allowed to set the provider id of a share once.
+     * Attempts to override the provider id will result in an IllegalIDChangeException
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws IllegalIDChangeException
+     * @throws \InvalidArgumentException
+     * @since 9.1.0
+     */
+    public function setProviderId($id);
+
+    /**
+     * Set the node of the file/folder that is shared
+     *
+     * @param Node $node
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNode(Node $node);
+
+    /**
+     * Get the node of the file/folder that is shared
+     *
+     * @return File|Folder
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNode();
+
+    /**
+     * Set file id for lazy evaluation of the node
+     * @param int $fileId
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNodeId($fileId);
+
+    /**
+     * Get the fileid of the node of this share
+     * @return int
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNodeId();
+
+    /**
+     * Set the type of node (file/folder)
+     *
+     * @param string $type
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setNodeType($type);
+
+    /**
+     * Get the type of node (file/folder)
+     *
+     * @return string
+     * @since 9.0.0
+     * @throws NotFoundException
+     */
+    public function getNodeType();
+
+    /**
+     * Set the shareType
+     *
+     * @param int $shareType
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareType($shareType);
+
+    /**
+     * Get the shareType
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getShareType();
+
+    /**
+     * Set the receiver of this share.
+     *
+     * @param string $sharedWith
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setSharedWith($sharedWith);
+
+    /**
+     * Get the receiver of this share.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getSharedWith();
+
+    /**
+     * Set the display name of the receiver of this share.
+     *
+     * @param string $displayName
+     * @return \OCP\Share\IShare The modified object
+     * @since 14.0.0
+     */
+    public function setSharedWithDisplayName($displayName);
+
+    /**
+     * Get the display name of the receiver of this share.
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getSharedWithDisplayName();
+
+    /**
+     * Set the avatar of the receiver of this share.
+     *
+     * @param string $src
+     * @return \OCP\Share\IShare The modified object
+     * @since 14.0.0
+     */
+    public function setSharedWithAvatar($src);
+
+    /**
+     * Get the avatar of the receiver of this share.
+     *
+     * @return string
+     * @since 14.0.0
+     */
+    public function getSharedWithAvatar();
+
+    /**
+     * Set the permissions.
+     * See \OCP\Constants::PERMISSION_*
+     *
+     * @param int $permissions
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setPermissions($permissions);
+
+    /**
+     * Get the share permissions
+     * See \OCP\Constants::PERMISSION_*
+     *
+     * @return int
+     * @since 9.0.0
+     */
+    public function getPermissions();
+
+    /**
+     * Set the expiration date
+     *
+     * @param null|\DateTime $expireDate
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setExpirationDate($expireDate);
+
+    /**
+     * Get the expiration date
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getExpirationDate();
+
+    /**
+     * Set the sharer of the path.
+     *
+     * @param string $sharedBy
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setSharedBy($sharedBy);
+
+    /**
+     * Get share sharer
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getSharedBy();
+
+    /**
+     * Set the original share owner (who owns the path that is shared)
+     *
+     * @param string $shareOwner
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareOwner($shareOwner);
+
+    /**
+     * Get the original share owner (who owns the path that is shared)
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getShareOwner();
+
+    /**
+     * Set the password for this share.
+     * When the share is passed to the share manager to be created
+     * or updated the password will be hashed.
+     *
+     * @param string $password
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setPassword($password);
+
+    /**
+     * Get the password of this share.
+     * If this share is obtained via a shareprovider the password is
+     * hashed.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getPassword();
+
+    /**
+     * Set the public link token.
+     *
+     * @param string $token
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setToken($token);
+
+    /**
+     * Get the public link token.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getToken();
+
+    /**
+     * Set the target path of this share relative to the recipients user folder.
+     *
+     * @param string $target
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setTarget($target);
+
+    /**
+     * Get the target path of this share relative to the recipients user folder.
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTarget();
+
+    /**
+     * Set the time this share was created
+     *
+     * @param \DateTime $shareTime
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setShareTime(\DateTime $shareTime);
+
+    /**
+     * Get the timestamp this share was created
+     *
+     * @return \DateTime
+     * @since 9.0.0
+     */
+    public function getShareTime();
+
+    /**
+     * Set if the recipient is informed by mail about the share.
+     *
+     * @param bool $mailSend
+     * @return \OCP\Share\IShare The modified object
+     * @since 9.0.0
+     */
+    public function setMailSend($mailSend);
+
+    /**
+     * Get if the recipient informed by mail about the share.
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function getMailSend();
+
+    /**
+     * Set the cache entry for the shared node
+     *
+     * @param ICacheEntry $entry
+     * @since 11.0.0
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry);
+
+    /**
+     * Get the cache entry for the shared node
+     *
+     * @return null|ICacheEntry
+     * @since 11.0.0
+     */
+    public function getNodeCacheEntry();
 }

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +906 added lines, -906 removed lines

@@ -63,919 +63,919 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		string $userId,
-		IL10N $l10n,
-		IConfig $config
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-		$this->config = $config;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 */
-	protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			'permissions' => $share->getPermissions(),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = $nodes[0];
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceOf \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
-
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = $share->getPassword();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-
-		} else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// getSharedWith() returns either "name (type, owner)" or
-			// "name (type, owner) [id]", depending on the Circles app version.
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-
-			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
-			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
-				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
-			}
-
-			$result['share_with_avatar'] = $share->getSharedWithAvatar();
-
-			$shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
-			$shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
-			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook(string $query, string $property): string {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
-				if ($value === $query) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($this->canAccessShare($share)) {
-			try {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			} catch (NotFoundException $e) {
-				//Fall trough
-			}
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_GROUP &&
-			$share->getShareOwner() !== $this->currentUser &&
-			$share->getSharedBy() !== $this->currentUser) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $expireDate
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSForbiddenException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function createShare(
-		string $path = null,
-		int $permissions = null,
-		int $shareType = -1,
-		string $shareWith = null,
-		string $publicUpload = 'false',
-		string $password = '',
-		string $expireDate = ''
-	): DataResponse {
-		$share = $this->shareManager->newShare();
-
-		if ($permissions === null) {
-			$permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~Constants::PERMISSION_DELETE;
-			$permissions &= ~Constants::PERMISSION_CREATE;
-		}
-
-		/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     * @param IConfig $config
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        string $userId,
+        IL10N $l10n,
+        IConfig $config
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+        $this->config = $config;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     */
+    protected function formatShare(\OCP\Share\IShare $share, Node $recipientNode = null): array {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            'permissions' => $share->getPermissions(),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = $nodes[0];
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceOf \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
+
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = $share->getPassword();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+
+        } else if ($share->getShareType() === Share::SHARE_TYPE_REMOTE || $share->getShareType() === Share::SHARE_TYPE_REMOTE_GROUP) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } else if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // getSharedWith() returns either "name (type, owner)" or
+            // "name (type, owner) [id]", depending on the Circles app version.
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+
+            $result['share_with_displayname'] = $share->getSharedWithDisplayName();
+            if (empty($result['share_with_displayname'])) {
+                $displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
+                $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
+            }
+
+            $result['share_with_avatar'] = $share->getSharedWithAvatar();
+
+            $shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
+            $shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
+            $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook(string $query, string $property): string {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach($r[$property] as $value) {
+                if ($value === $query) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($this->canAccessShare($share)) {
+            try {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            } catch (NotFoundException $e) {
+                //Fall trough
+            }
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_GROUP &&
+            $share->getShareOwner() !== $this->currentUser &&
+            $share->getSharedBy() !== $this->currentUser) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $expireDate
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSForbiddenException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function createShare(
+        string $path = null,
+        int $permissions = null,
+        int $shareType = -1,
+        string $shareWith = null,
+        string $publicUpload = 'false',
+        string $password = '',
+        string $expireDate = ''
+    ): DataResponse {
+        $share = $this->shareManager->newShare();
+
+        if ($permissions === null) {
+            $permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~Constants::PERMISSION_DELETE;
+            $permissions &= ~Constants::PERMISSION_CREATE;
+        }
+
+        /*
 		 * Hack for https://github.com/owncloud/core/issues/22587
 		 * We check the permissions via webdav. But the permissions of the mount point
 		 * do not equal the share permissions. Here we fix that for federated mounts.
 		 */
-		if ($path->getStorage()->instanceOfStorage(Storage::class)) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === Share::SHARE_TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_LINK) {
-			//Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			/*
+        if ($path->getStorage()->instanceOfStorage(Storage::class)) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === Share::SHARE_TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_LINK) {
+            //Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            /*
 			 * For now we only allow 1 link share.
 			 * Return the existing link share if this is a duplicate
 			 */
-			$existingShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, false, 1, 0);
-			if (!empty($existingShares)) {
-				return new DataResponse($this->formatShare($existingShares[0]));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$share->setPermissions(
-					Constants::PERMISSION_READ |
-					Constants::PERMISSION_CREATE |
-					Constants::PERMISSION_UPDATE |
-					Constants::PERMISSION_DELETE
-				);
-			} else {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			}
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-
-		} else if ($shareType === Share::SHARE_TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
-			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else if ($shareType === Share::SHARE_TYPE_EMAIL) {
-			if ($share->getNodeType() === 'file') {
-				$share->setPermissions(Constants::PERMISSION_READ);
-			} else {
-				$share->setPermissions($permissions);
-			}
-			$share->setSharedWith($shareWith);
-		} else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
-			if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param \OCP\Files\File|\OCP\Files\Folder $node
-	 * @param boolean $includeTags
-	 * @return DataResponse
-	 */
-	private function getSharedWithMe($node = null, bool $includeTags): DataResponse {
-
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares);
-
-		$shares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @param \OCP\Files\Folder $folder
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	private function getSharesInDir(Node $folder): DataResponse {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = [];
-		foreach ($nodes as $node) {
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
-			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
-			}
-			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
-			}
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share);
-			} catch (NotFoundException $e) {
-				//Ignore this share
-			}
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		string $shared_with_me = 'false',
-		string $reshares = 'false',
-		string $subfiles = 'false',
-		string $path = null,
-		string $include_tags = 'false'
-	): DataResponse {
-
-		if ($path !== null) {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$path = $userFolder->get($path);
-				$this->lock($path);
-			} catch (\OCP\Files\NotFoundException $e) {
-				throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock path'));
-			}
-		}
-
-		$include_tags = $include_tags === 'true';
-
-		if ($shared_with_me === 'true') {
-			$result = $this->getSharedWithMe($path, $include_tags);
-			return $result;
-		}
-
-		if ($subfiles === 'true') {
-			$result = $this->getSharesInDir($path);
-			return $result;
-		}
-
-		if ($reshares === 'true') {
-			$reshares = true;
-		} else {
-			$reshares = false;
-		}
-
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-		if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-			$mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
-		} else {
-			$mailShares = [];
-		}
-		if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-			$circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
-		} else {
-			$circleShares = [];
-		}
-
-		$shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares);
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		$formatted = [];
-		foreach ($shares as $share) {
-			try {
-				$formatted[] = $this->formatShare($share, $path);
-			} catch (NotFoundException $e) {
-				//Ignore share
-			}
-		}
-
-		if ($include_tags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return new DataResponse($formatted);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 */
-	public function updateShare(
-		string $id,
-		int $permissions = null,
-		string $password = null,
-		string $publicUpload = null,
-		string $expireDate = null
-	): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		/*
+            $existingShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, false, 1, 0);
+            if (!empty($existingShares)) {
+                return new DataResponse($this->formatShare($existingShares[0]));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $share->setPermissions(
+                    Constants::PERMISSION_READ |
+                    Constants::PERMISSION_CREATE |
+                    Constants::PERMISSION_UPDATE |
+                    Constants::PERMISSION_DELETE
+                );
+            } else {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            }
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+
+        } else if ($shareType === Share::SHARE_TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        }  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+            if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else if ($shareType === Share::SHARE_TYPE_EMAIL) {
+            if ($share->getNodeType() === 'file') {
+                $share->setPermissions(Constants::PERMISSION_READ);
+            } else {
+                $share->setPermissions($permissions);
+            }
+            $share->setSharedWith($shareWith);
+        } else if ($shareType === Share::SHARE_TYPE_CIRCLE) {
+            if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param \OCP\Files\File|\OCP\Files\Folder $node
+     * @param boolean $includeTags
+     * @return DataResponse
+     */
+    private function getSharedWithMe($node = null, bool $includeTags): DataResponse {
+
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares);
+
+        $shares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @param \OCP\Files\Folder $folder
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    private function getSharesInDir(Node $folder): DataResponse {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = [];
+        foreach ($nodes as $node) {
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
+            $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
+            if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
+            }
+            if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
+            }
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share);
+            } catch (NotFoundException $e) {
+                //Ignore this share
+            }
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        string $shared_with_me = 'false',
+        string $reshares = 'false',
+        string $subfiles = 'false',
+        string $path = null,
+        string $include_tags = 'false'
+    ): DataResponse {
+
+        if ($path !== null) {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $path = $userFolder->get($path);
+                $this->lock($path);
+            } catch (\OCP\Files\NotFoundException $e) {
+                throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock path'));
+            }
+        }
+
+        $include_tags = $include_tags === 'true';
+
+        if ($shared_with_me === 'true') {
+            $result = $this->getSharedWithMe($path, $include_tags);
+            return $result;
+        }
+
+        if ($subfiles === 'true') {
+            $result = $this->getSharesInDir($path);
+            return $result;
+        }
+
+        if ($reshares === 'true') {
+            $reshares = true;
+        } else {
+            $reshares = false;
+        }
+
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
+        if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+            $mailShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $path, $reshares, -1, 0);
+        } else {
+            $mailShares = [];
+        }
+        if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+            $circleShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_CIRCLE, $path, $reshares, -1, 0);
+        } else {
+            $circleShares = [];
+        }
+
+        $shares = array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares);
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        $formatted = [];
+        foreach ($shares as $share) {
+            try {
+                $formatted[] = $this->formatShare($share, $path);
+            } catch (NotFoundException $e) {
+                //Ignore share
+            }
+        }
+
+        if ($include_tags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return new DataResponse($formatted);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     */
+    public function updateShare(
+        string $id,
+        int $permissions = null,
+        string $password = null,
+        string $publicUpload = null,
+        string $expireDate = null
+    ): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if ($permissions === null && $password === null && $publicUpload === null && $expireDate === null) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        /*
 		 * expirationdate, password and publicUpload only make sense for link shares
 		 */
-		if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			} else if ($publicUpload === 'false') {
-				$newPermissions = Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
-				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					Constants::PERMISSION_READ,
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
-					Constants::PERMISSION_CREATE, // hidden file list
-					Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
-				], true)
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} else if ($password !== null) {
-				$share->setPassword($password);
-			}
-
-		} else {
-			if ($permissions !== null) {
-				$permissions = (int)$permissions;
-				$share->setPermissions($permissions);
-			}
-
-			if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
-				if ($password === '') {
-					$share->setPassword(null);
-				} else if ($password !== null) {
-					$share->setPassword($password);
-				}
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} else if ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-		}
-
-		if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
-			/* Check if this is an incomming share */
-			$incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
-			$incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
-
-			/** @var \OCP\Share\IShare[] $incomingShares */
-			if (!empty($incomingShares)) {
-				$maxPermissions = 0;
-				foreach ($incomingShares as $incomingShare) {
-					$maxPermissions |= $incomingShare->getPermissions();
-				}
-
-				if ($share->getPermissions() & ~$maxPermissions) {
-					throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
-				}
-			}
-		}
-
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// If the share is shared with you (or a group you are a member of)
-		if ($share->getShareType() === Share::SHARE_TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate(string $expireDate): \DateTime {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById(string $id): IShare {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @throws LockedException
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 * @throws @LockedException
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
+        if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            } else if ($publicUpload === 'false') {
+                $newPermissions = Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = (int)$permissions;
+                $newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    Constants::PERMISSION_READ,
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
+                    Constants::PERMISSION_CREATE, // hidden file list
+                    Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
+                ], true)
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } else if ($password !== null) {
+                $share->setPassword($password);
+            }
+
+        } else {
+            if ($permissions !== null) {
+                $permissions = (int)$permissions;
+                $share->setPermissions($permissions);
+            }
+
+            if ($share->getShareType() === Share::SHARE_TYPE_EMAIL) {
+                if ($password === '') {
+                    $share->setPassword(null);
+                } else if ($password !== null) {
+                    $share->setPassword($password);
+                }
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } else if ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+        }
+
+        if ($permissions !== null && $share->getShareOwner() !== $this->currentUser) {
+            /* Check if this is an incomming share */
+            $incomingShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $share->getNode(), -1, 0);
+            $incomingShares = array_merge($incomingShares, $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $share->getNode(), -1, 0));
+
+            /** @var \OCP\Share\IShare[] $incomingShares */
+            if (!empty($incomingShares)) {
+                $maxPermissions = 0;
+                foreach ($incomingShares as $incomingShare) {
+                    $maxPermissions |= $incomingShare->getPermissions();
+                }
+
+                if ($share->getPermissions() & ~$maxPermissions) {
+                    throw new OCSNotFoundException($this->l->t('Cannot increase permissions'));
+                }
+            }
+        }
+
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // If the share is shared with you (or a group you are a member of)
+        if ($share->getShareType() === Share::SHARE_TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        if ($checkGroups && $share->getShareType() === Share::SHARE_TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === Share::SHARE_TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate(string $expireDate): \DateTime {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById(string $id): IShare {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     * @throws LockedException
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     * @throws @LockedException
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -214,14 +214,14 @@ 
 
 			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
 			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId? strrpos($share->getSharedWith(), ' '): strlen($share->getSharedWith()));
+				$displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
 				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
 			}
 
 			$result['share_with_avatar'] = $share->getSharedWithAvatar();
 
-			$shareWithStart = ($hasCircleId? strrpos($share->getSharedWith(), '[') + 1: 0);
-			$shareWithLength = ($hasCircleId? -1: strpos($share->getSharedWith(), ' '));
+			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
 			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
 		}
 
@@ -243,7 +243,7 @@ 
 		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
 		$result = \OC::$server->getContactsManager()->search($query, [$property]);
 		foreach ($result as $r) {
-			foreach($r[$property] as $value) {
+			foreach ($r[$property] as $value) {
 				if ($value === $query) {
 					return $r['FN'];
 				}
@@ -470,7 +470,7 @@ 
 
 			$share->setSharedWith($shareWith);
 			$share->setPermissions($permissions);
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
 				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not allow shares from type %s', [$path->getPath(), $shareType]));
 			}
@@ -531,7 +531,7 @@ 
 
 		$shares = array_merge($userShares, $groupShares, $circleShares);
 
-		$shares = array_filter($shares, function (IShare $share) {
+		$shares = array_filter($shares, function(IShare $share) {
 			return $share->getShareOwner() !== $this->currentUser;
 		});
 
@@ -570,7 +570,7 @@ 
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_USER, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
 			$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-			if($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
+			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
 				$shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser, Share::SHARE_TYPE_EMAIL, $node, false, -1, 0));
 			}
 			if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
@@ -739,7 +739,7 @@ 
 			}
 
 			if ($permissions !== null) {
-				$newPermissions = (int)$permissions;
+				$newPermissions = (int) $permissions;
 				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
 			}
 
@@ -797,7 +797,7 @@ 
 
 		} else {
 			if ($permissions !== null) {
-				$permissions = (int)$permissions;
+				$permissions = (int) $permissions;
 				$share->setPermissions($permissions);
 			}
 
@@ -925,7 +925,7 @@ 
 
 		// First check if it is an internal share.
 		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+			$share = $this->shareManager->getShareById('ocinternal:'.$id, $this->currentUser);
 			return $share;
 		} catch (ShareNotFound $e) {
 			// Do nothing, just try the other share type
@@ -934,7 +934,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocCircleShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -943,7 +943,7 @@ 
 
 		try {
 			if ($this->shareManager->shareProviderExists(Share::SHARE_TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+				$share = $this->shareManager->getShareById('ocMailShare:'.$id, $this->currentUser);
 				return $share;
 			}
 		} catch (ShareNotFound $e) {
@@ -953,7 +953,7 @@ 
 		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
 			throw new ShareNotFound();
 		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+		$share = $this->shareManager->getShareById('ocFederatedSharing:'.$id, $this->currentUser);
 
 		return $share;
 	}