fix the empty exact list while searching for a sharee #4265

changelog/unreleased/fix-empty-exact-list.md

@@ -0,0 +1,8 @@
+Bugfix: Empty exact list while searching for a sharee 
+
+We fixed a bug in the sharing api, it always returns an empty exact list while searching for a sharee
+
+
+
+https://github.com/cs3org/reva/pull/3877
+https://github.com/owncloud/ocis/issues/4265

internal/http/services/owncloud/ocs/conversions/main.go

@@ -214,7 +214,7 @@ type MatchData struct {
 type MatchValueData struct {
 	ShareType               int    `json:"shareType" xml:"shareType"`
 	ShareWith               string `json:"shareWith" xml:"shareWith"`
-	ShareWithAdditionalInfo string `json:"shareWithAdditionalInfo" xml:"shareWithAdditionalInfo"`
+	ShareWithAdditionalInfo string `json:"shareWithAdditionalInfo" xml:"shareWithAdditionalInfo,omitempty"`
 	UserType                int    `json:"userType" xml:"userType"`
 }
 

internal/http/services/owncloud/ocs/handlers/apps/sharing/sharees/sharees.go

@@ -20,6 +20,7 @@ package sharees
 
 import (
 	"net/http"
+	"strings"
 
 	grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -67,10 +68,15 @@ func (h *Handler) FindSharees(w http.ResponseWriter, r *http.Request) {
 	log.Debug().Int("count", len(usersRes.GetUsers())).Str("search", term).Msg("users found")
 
 	userMatches := make([]*conversions.MatchData, 0, len(usersRes.GetUsers()))
+	exactUserMatches := make([]*conversions.MatchData, 0)
 	for _, user := range usersRes.GetUsers() {
 		match := h.userAsMatch(user)
 		log.Debug().Interface("user", user).Interface("match", match).Msg("mapped")
-		userMatches = append(userMatches, match)
+		if h.isExactMatch(match, term) {
+			exactUserMatches = append(exactUserMatches, match)
+		} else {
+			userMatches = append(userMatches, match)
+		}
 	}
 
 	groupsRes, err := gwc.FindGroups(r.Context(), &grouppb.FindGroupsRequest{Filter: term, SkipFetchingMembers: true})
@@ -81,16 +87,21 @@ func (h *Handler) FindSharees(w http.ResponseWriter, r *http.Request) {
 	log.Debug().Int("count", len(groupsRes.GetGroups())).Str("search", term).Msg("groups found")
 
 	groupMatches := make([]*conversions.MatchData, 0, len(groupsRes.GetGroups()))
+	exactGroupMatches := make([]*conversions.MatchData, 0)
 	for _, g := range groupsRes.GetGroups() {
 		match := h.groupAsMatch(g)
 		log.Debug().Interface("group", g).Interface("match", match).Msg("mapped")
-		groupMatches = append(groupMatches, match)
+		if h.isExactMatch(match, term) {
+			exactGroupMatches = append(exactGroupMatches, match)
+		} else {
+			groupMatches = append(groupMatches, match)
+		}
 	}
 
 	response.WriteOCSSuccess(w, r, &conversions.ShareeData{
 		Exact: &conversions.ExactMatchesData{
-			Users:   []*conversions.MatchData{},
-			Groups:  []*conversions.MatchData{},
+			Users:   exactUserMatches,
+			Groups:  exactGroupMatches,
 			Remotes: []*conversions.MatchData{},
 		},
 		Users:   userMatches,
@@ -132,3 +143,11 @@ func (h *Handler) groupAsMatch(g *grouppb.Group) *conversions.MatchData {
 func (h *Handler) getAdditionalInfoAttribute(u *userpb.User) string {
 	return templates.WithUser(u, h.additionalInfoAttribute)
 }
+
+func (h *Handler) isExactMatch(match *conversions.MatchData, term string) bool {
+	if match == nil || match.Value == nil {
+		return false
+	}
+	return strings.EqualFold(match.Value.ShareWith, term) || strings.EqualFold(match.Value.ShareWithAdditionalInfo, term) ||
+		strings.EqualFold(match.Label, term)
+}

tests/acceptance/expected-failures-on-OCIS-storage.md

@@ -140,15 +140,7 @@ Synchronization features like etag propagation, setting mtime and locking files
 ### Share
 File and sync features in a shared scenario
 
-### [Different response containing exact and non exact match in response of getting sharees](https://github.com/owncloud/ocis/issues/2376)
--   [coreApiSharees/sharees.feature:100](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L100)
--   [coreApiSharees/sharees.feature:101](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L101)
--   [coreApiSharees/sharees.feature:120](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L120)
--   [coreApiSharees/sharees.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L121)
--   [coreApiSharees/sharees.feature:140](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L140)
--   [coreApiSharees/sharees.feature:141](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L141)
--   [coreApiSharees/sharees.feature:160](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L160)
--   [coreApiSharees/sharees.feature:161](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L161)
+### Contain the remotes list in response to getting sharees while searching
 -   [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L180)
 -   [coreApiSharees/sharees.feature:181](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L181)
 

tests/acceptance/expected-failures-on-S3NG-storage.md

@@ -151,15 +151,7 @@ Synchronization features like etag propagation, setting mtime and locking files
 ### Share
 File and sync features in a shared scenario
 
-### [Different response containing exact and non exact match in response of getting sharees](https://github.com/owncloud/ocis/issues/2376)
--   [coreApiSharees/sharees.feature:100](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L100)
--   [coreApiSharees/sharees.feature:101](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L101)
--   [coreApiSharees/sharees.feature:120](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L120)
--   [coreApiSharees/sharees.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L121)
--   [coreApiSharees/sharees.feature:140](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L140)
--   [coreApiSharees/sharees.feature:141](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L141)
--   [coreApiSharees/sharees.feature:160](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L160)
--   [coreApiSharees/sharees.feature:161](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L161)
+### Contain the remotes list in response to getting sharees while searching
 -   [coreApiSharees/sharees.feature:180](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L180)
 -   [coreApiSharees/sharees.feature:181](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiSharees/sharees.feature#L181)