From a26ca1e638c4b395311bc2d010d0ffd070dbbe2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Tue, 5 May 2020 18:46:24 +0200
Subject: [PATCH] Do not filter id matching userId on non-user-share shares
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
.../js/dist/files_sharing_tab.js | Bin 980657 -> 980715 bytes
.../js/dist/files_sharing_tab.js.map | Bin 2846805 -> 2846990 bytes
.../lib/Controller/ShareAPIController.php | 9 +++++----
.../src/components/SharingEntry.vue | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
index 2d94a8b26973b1b57a39e4adc79fd9644c8d9e2a..8855a5102ce5a0c245e008ac26f91927f688c1d9 100644
GIT binary patch
delta 223
zcmdn^*825Z>xLG_7N!>F7M3ln{bn47NtT8NMkdMA6{ayuOjr2K$g({^jb#;cd#n{J
z5VHX>I}mdKF((jn0WtUXSSy~Nn>kEPQq#<m%~Pfq2y-Y+Z+OR}fe_m8j;EdzrXY5D
zAQQXrv`svQ2nDBK@Mvyd`<_SizLZjCv2I?zZfS99k&;!aUU5cZQL0`^WkIUqbcemX
o(yXDuu0cA}cPH{XZ)ZKv+s2D9WNtN^MEmMHyxUjb;bW5m0LMy8{Qv*}
delta 179
zcmaF;)_UVx>xLG_7N!>F7M3ln{buY2#%5;8sfp9&r!h-TSNP1xvOPeJWfgOKtQ9K|
zvjH(X5OV-AClGT1G57XZE1sX5Ig$;`Q_YN%Or{qIb0|%3c*moG5ZdsLr=An0Aa;5n
w6T9%VO+1DO1*c!|Xl`Hoo=5cl^z&bNdA4($=iSQ-mu^3Mhj;tgJA86d04}&a$p8QV
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
index c13ca7038524db38451d41c7d4f2c932a5febb0d..107734448cece7a9f0d74ea51485aa8e1cc3ac63 100644
GIT binary patch
delta 685
zcmZ9|UrbU_90%}Sxgdf!MM)$zkn&up3)c%55)J1eXg24VxmJ|TE`-*^Xi}u>p@$ym
zrADLe_taXiY&thL?`vC+)vV24SPzl?S+SKpG<)cwADcz%;j?qj_x#TJot@WjmzjI-
zmYG#YkPXPPw^%Vr#SzX3cd5g;HXr;cvB_Y-TU64+#S3#<R#yB9F8Jcc4f9%cE^lCc
zJ~_CXaJNgjd@0AE2BbkO(jpydM0(VO49KXKa?M98Oh)~5nj33ieBe9Fm4_5cmF!YP
zh*ElDK#B<Cl#WZeQ6Wa@r0n0#7b8NP()cl9HcaVkSQw);CN9D=8|PDxpW`-kY&t6X
z;l6|G$cqUM?LjT56`4>QYDZ?Y7uD)4s8baa*4Q1rUrx;gl1DD8m5Nnh^im=y^?T(c
z+$vl5<u|KVR2#ccH|jzAkqy~VFLIy*=pgD-H>+f{@t<oyk{JdHRicIIFIL;%4Pds&
zulj1@3~|7lAH-RYR=<)Ac+5^6JbzCNhCdHIe-o6aT^88>OqyXOPVDs)kGDxX41XYl
zdG`)c-8=kXx%+a~eI?_*o=q);rX1Nz%0kL>ZRu*t-Wv+p!BpTa?5WA<Np<R#vrnww
z^rFcr!Vu#!!^;7_A4V8gOKsK$J&Y?{FT+2xLLta+)uSih_=lj^xD=>9aB>~fxp~ij
eT`_{z0^g~vH5OpvJ0HuhYh37%x~@6=DE%AZZ~LzR
delta 584
zcmeBsw3hMegSCtslq^}&(o8HTKNK{a?7+)C-Fu@5_vT#7ABHSR#)ig|6Lah)CuFm-
zSeT?(06FTD&zFmAex2RU#bRV^k^~juZC+K@zN(B7h?#(x8Hibcm=%cGfS4VKIe?fG
zh`E56d;6*~9-D`Zx!a$I^LjHe8csKk;=MIJM~#<f`bBwO-R;%Uyyw|iGF<gdr%zPk
z6>CpP;ss(pAm#^R0U#CxVj&<F24WE)76oFEI&mPD*q)Lk>EFSTY+#;hW}IX){o^}z
z$?XkyB!w9{42;dpl2a2CrwhE4lxpXEBMHPHS{jIDfLIoY<$zcoh!ucX5r~z5SQ&^_
zfLL`q=NmN-b~Ll~pR4&YP7erIW1W8Bj0XSo4cpaur%!mO#=?&5gz5f|)t<mb6gMkL
zPZzi<%04~jiJB%{*zucMJtxfNvC|DF$Vg1T&@0V1{rxvJIfS(dPt|;<mxybov>*Gf
zw*A<5^=mh$KYpUFu>IdfjbC~QbsHyYm`uH=$v6GJkEZZ+`|awI(+w=uSrJ0>-l;2t
tc@Ce|1QGgxLG~B!rVUo=ho>)P*0i49@loBkJ)cDrh_$xovuMxH0RTTS+>HPL
diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index 547c462c84f..49320d57f16 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -221,7 +221,7 @@ class ShareAPIController extends OCSController {
if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
if ($share->getShareType() === IShare::TYPE_LINK
|| $share->getShareType() === IShare::TYPE_EMAIL) {
- $result['permissions'] |= Constants::PERMISSION_SHARE;
+ $result['permissions'] |= Constants::PERMISSION_SHARE;
}
}
@@ -613,12 +613,12 @@ class ShareAPIController extends OCSController {
$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares);
- $shares = array_filter($shares, function (IShare $share) {
+ $filteredShares = array_filter($shares, function (IShare $share) {
return $share->getShareOwner() !== $this->currentUser;
});
$formatted = [];
- foreach ($shares as $share) {
+ foreach ($filteredShares as $share) {
if ($this->canAccessShare($share)) {
try {
$formatted[] = $this->formatShare($share);
@@ -791,7 +791,8 @@ class ShareAPIController extends OCSController {
continue;
}
- if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+ if (in_array($share->getId(), $known)
+ || ($share->getSharedWith() === $this->currentUser && $share->getShareType() === IShare::TYPE_USER)) {
continue;
}
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
index 288236abad7..4af3a6b4431 100644
--- a/apps/files_sharing/src/components/SharingEntry.vue
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -23,6 +23,7 @@
<template>
<li class="sharing-entry">
<Avatar class="sharing-entry__avatar"
+ :is-no-user="share.type !== SHARE_TYPES.SHARE_TYPE_USER"
:user="share.shareWith"
:display-name="share.shareWithDisplayName"
:url="share.shareWithAvatar" />
--
GitLab