Tag users that have left CERN and hide them when performing a search (i.e. when sharing)

Author: glpatcern

user/cache.go

@@ -127,7 +127,8 @@ func (m *manager) findCachedUsers(query string) ([]*userpb.User, error) {
 	userMap := make(map[string]*userpb.User)
 	for _, user := range userStrings {
 		u := userpb.User{}
-		if err = json.Unmarshal([]byte(user), &u); err == nil {
+		// Only keep users that have no opaque "inactive" flag set (cf. parseAndCacheUser)
+		if err = json.Unmarshal([]byte(user), &u); err == nil && (u.Opaque == nil || u.Opaque.Map["inactive"] == nil) {
 			userMap[u.Id.OpaqueId] = &u
 		}
 	}

user/rest.go

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
+	types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
 	"github.com/cs3org/reva/v3"
 	"github.com/cs3org/reva/v3/pkg/appctx"
 	utils "github.com/cs3org/reva/v3/pkg/cbox/utils"
@@ -232,6 +233,17 @@ func (m *manager) parseAndCacheUser(ctx context.Context, i *Identity) (*userpb.U
 		GidNumber:   int64(i.GID),
 	}
 	u.Username = utils.FormatUserID(u.Id)
+	if i.ActiveUser == false && u.Id.Type == userpb.UserType_USER_TYPE_PRIMARY {
+		// keep track that this primary account is inactive, i.e. has left CERN
+		u.Opaque = &types.Opaque{
+			Map: map[string]*types.OpaqueEntry{
+				"inactive": {
+					Decoder: "plain",
+					Value:   []byte("yes"),
+				},
+			},
+		}
+	}
 
 	if err := m.cacheUserDetails(u); err != nil {
 		log.Error().Err(err).Msg("rest: error caching user details")