add userid to username mapping to public shares

changelog/unreleased/ocs-share-api-userid.md

@@ -4,3 +4,4 @@ The ocs api should not send the users uuid. Replaced the uuid with the username.
 
 https://github.com/owncloud/ocis/issues/990
 https://github.com/cs3org/reva/pull/1375
+https://github.com/cs3org/reva/pull/1376

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

@@ -52,6 +52,9 @@ const (
 	ShareTypeFederatedCloudShare ShareType = 6
 )
 
+// RedactedField is the constant value for redacted fields
+const RedactedField string = "***redacted***"
+
 // ResourceType indicates the OCS type of the resource
 type ResourceType int
 
@@ -323,8 +326,8 @@ func PublicShare2ShareData(share *link.PublicShare, r *http.Request, publicURL s
 	}
 
 	if share.PasswordProtected {
-		sd.ShareWith = "***redacted***"
-		sd.ShareWithDisplayname = "***redacted***"
+		sd.ShareWith = RedactedField
+		sd.ShareWithDisplayname = RedactedField
 	}
 
 	return sd

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go

@@ -155,6 +155,7 @@ func (h *Handler) createPublicLinkShare(w http.ResponseWriter, r *http.Request)
 		return
 	}
 	h.addDisplaynames(ctx, c, s)
+	h.mapUserIds(ctx, c, s)
 
 	response.WriteOCSSuccess(w, r, s)
 }
@@ -208,6 +209,7 @@ func (h *Handler) listPublicShares(r *http.Request, filters []*link.ListPublicSh
 				continue
 			}
 			h.addDisplaynames(ctx, c, sData)
+			h.mapUserIds(ctx, c, sData)
 
 			log.Debug().Interface("share", share).Interface("info", statResponse.Info).Interface("shareData", share).Msg("mapped")
 
@@ -432,6 +434,7 @@ func (h *Handler) updatePublicShare(w http.ResponseWriter, r *http.Request, shar
 		return
 	}
 	h.addDisplaynames(r.Context(), gwC, s)
+	h.mapUserIds(r.Context(), gwC, s)
 
 	response.WriteOCSSuccess(w, r, s)
 }

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

@@ -1128,7 +1128,9 @@ func (h *Handler) addDisplaynames(ctx context.Context, c gateway.GatewayAPIClien
 func (h *Handler) mapUserIds(ctx context.Context, c gateway.GatewayAPIClient, s *conversions.ShareData) {
 	s.UIDOwner = h.getUsername(ctx, c, s.UIDOwner)
 	s.UIDFileOwner = h.getUsername(ctx, c, s.UIDFileOwner)
-	s.ShareWith = h.getUsername(ctx, c, s.ShareWith)
+	if s.ShareWith != conversions.RedactedField {
+		s.ShareWith = h.getUsername(ctx, c, s.ShareWith)
+	}
 }
 
 func parseTimestamp(timestampString string) (*types.Timestamp, error) {