Merge pull request #18355 from nextcloud/backport/17935/stable17

[stable17] adding share type circles
nextcloud · Dec 12, 2019 · 387d216 · 387d216
2 parents 903759d + d6a276c
commit 387d216
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php
@@ -34,6 +34,7 @@
 use OCP\ISession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
+use OCP\Share\IShare;
 use Sabre\DAV\Auth\Backend\AbstractBasic;
 
 /**
@@ -97,7 +98,10 @@ protected function validateUserPass($username, $password) {
 
 		// check if the share is password protected
 		if ($share->getPassword() !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+
+			if ($share->getShareType() === IShare::TYPE_LINK
+				|| $share->getShareType() === IShare::TYPE_EMAIL
+				|| $share->getShareType() === IShare::TYPE_CIRCLE) {
 				if ($this->shareManager->checkPassword($share, $password)) {
 					return true;
 				} else if ($this->session->exists('public_link_authenticated')
@@ -112,7 +116,7 @@ protected function validateUserPass($username, $password) {
 					}
 					return false;
 				}
-			} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
+			} else if ($share->getShareType() === IShare::TYPE_REMOTE) {
 				return true;
 			} else {
 				return false;

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -1329,8 +1329,9 @@ protected function checkExpireDate($share) {
 	 * @return bool
 	 */
 	public function checkPassword(\OCP\Share\IShare $share, $password) {
-		$passwordProtected = $share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK
-			|| $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL;
+		$passwordProtected = $share->getShareType() !== IShare::TYPE_LINK
+							 || $share->getShareType() !== IShare::TYPE_EMAIL
+							 || $share->getShareType() !== IShare::TYPE_CIRCLE;
 		if (!$passwordProtected) {
 			//TODO maybe exception?
 			return false;