bump reva to 9878984ce702

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2024-09-05 15:03:05 +02:00
parent 0f95ab4d3c
commit 5ab53b2474
17 changed files with 260 additions and 208 deletions
+13 -7
View File
@@ -7,6 +7,7 @@ import (
"github.com/CiscoM31/godata"
cs3group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
ocmuser "github.com/cs3org/reva/v2/pkg/ocm/user"
libregraph "github.com/owncloud/libre-graph-api-go"
"github.com/owncloud/ocis/v2/services/graph/pkg/errorcode"
)
@@ -116,19 +117,24 @@ func CreateUserModelFromCS3(u *cs3user.User) *libregraph.User {
u.Id = &cs3user.UserId{}
}
userType := cs3UserTypeToGraph(u.GetId().GetType())
return &libregraph.User{
Identities: []libregraph.ObjectIdentity{
{
Issuer: &u.GetId().Idp,
IssuerAssignedId: &u.GetId().OpaqueId,
},
},
user := &libregraph.User{
Identities: []libregraph.ObjectIdentity{{
Issuer: &u.GetId().Idp,
IssuerAssignedId: &u.GetId().OpaqueId,
}},
UserType: &userType,
DisplayName: u.DisplayName,
Mail: &u.Mail,
OnPremisesSamAccountName: u.Username,
Id: &u.Id.OpaqueId,
}
// decode the remote id if the user is federated
if u.GetId().GetType() == cs3user.UserType_USER_TYPE_FEDERATED {
remoteID := ocmuser.RemoteID(u.GetId())
user.Identities[0].Issuer = &remoteID.Idp
user.Identities[0].IssuerAssignedId = &remoteID.OpaqueId
}
return user
}
func cs3UserTypeToGraph(cs3type cs3user.UserType) string {