Minor fixes

pkg/auth/manager/ldap/ldap.go

@@ -186,11 +186,11 @@ func (am *mgr) Authenticate(ctx context.Context, clientID, clientSecret string)
 	}
 	gidNumber, err := strconv.ParseInt(sr.Entries[0].GetEqualFoldAttributeValue(am.c.Schema.GIDNumber), 10, 64)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	uidNumber, err := strconv.ParseInt(sr.Entries[0].GetEqualFoldAttributeValue(am.c.Schema.UIDNumber), 10, 64)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 	u := &user.User{
 		Id: userID,

pkg/auth/manager/oidc/oidc.go

@@ -130,12 +130,12 @@ func (am *mgr) Authenticate(ctx context.Context, clientID, clientSecret string)
 		return nil, nil, fmt.Errorf("no \"preferred_username\" or \"name\" attribute found in userinfo: maybe the client did not request the oidc \"profile\"-scope")
 	}
 
-	var uid, gid int64
+	var uid, gid float64
 	if am.c.UIDClaim != "" {
-		uid, _ = claims[am.c.UIDClaim].(int64)
+		uid, _ = claims[am.c.UIDClaim].(float64)
 	}
 	if am.c.GIDClaim != "" {
-		gid, _ = claims[am.c.GIDClaim].(int64)
+		gid, _ = claims[am.c.GIDClaim].(float64)
 	}
 
 	userID := &user.UserId{
@@ -167,8 +167,8 @@ func (am *mgr) Authenticate(ctx context.Context, clientID, clientSecret string)
 		Mail:         claims["email"].(string),
 		MailVerified: claims["email_verified"].(bool),
 		DisplayName:  claims["name"].(string),
-		UidNumber:    uid,
-		GidNumber:    gid,
+		UidNumber:    int64(uid),
+		GidNumber:    int64(gid),
 	}
 
 	scope, err := scope.GetOwnerScope()

pkg/cbox/user/rest/rest.go

@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"net/url"
 	"regexp"
+	"strconv"
 	"strings"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -168,8 +169,8 @@ func (m *manager) parseAndCacheUser(ctx context.Context, userData map[string]int
 	upn, _ := userData["upn"].(string)
 	mail, _ := userData["primaryAccountEmail"].(string)
 	name, _ := userData["displayName"].(string)
-	uidNumber, _ := userData["uid"].(int64)
-	gidNumber, _ := userData["gid"].(int64)
+	uidNumber, _ := userData["uid"].(float64)
+	gidNumber, _ := userData["gid"].(float64)
 
 	userID := &userpb.UserId{
 		OpaqueId: upn,
@@ -180,8 +181,8 @@ func (m *manager) parseAndCacheUser(ctx context.Context, userData map[string]int
 		Username:    upn,
 		Mail:        mail,
 		DisplayName: name,
-		UidNumber:   uidNumber,
-		GidNumber:   gidNumber,
+		UidNumber:   int64(uidNumber),
+		GidNumber:   int64(gidNumber),
 	}
 
 	if err := m.cacheUserDetails(u); err != nil {
@@ -264,8 +265,8 @@ func (m *manager) findUsersByFilter(ctx context.Context, url string, users map[s
 		upn, _ := usrInfo["upn"].(string)
 		mail, _ := usrInfo["primaryAccountEmail"].(string)
 		name, _ := usrInfo["displayName"].(string)
-		uidNumber, _ := usrInfo["uid"].(int64)
-		gidNumber, _ := usrInfo["gid"].(int64)
+		uidNumber, _ := usrInfo["uid"].(float64)
+		gidNumber, _ := usrInfo["gid"].(float64)
 
 		uid := &userpb.UserId{
 			OpaqueId: upn,
@@ -276,8 +277,8 @@ func (m *manager) findUsersByFilter(ctx context.Context, url string, users map[s
 			Username:    upn,
 			Mail:        mail,
 			DisplayName: name,
-			UidNumber:   uidNumber,
-			GidNumber:   gidNumber,
+			UidNumber:   int64(uidNumber),
+			GidNumber:   int64(gidNumber),
 		}
 	}
 
@@ -371,5 +372,5 @@ func extractUID(u *userpb.User) (string, error) {
 	if u.UidNumber == 0 {
 		return "", errors.New("rest: could not retrieve UID from user")
 	}
-	return fmt.Sprintf("%v", u.UidNumber), nil
+	return strconv.FormatInt(u.UidNumber, 10), nil
 }

pkg/storage/utils/eosfs/eosfs.go

@@ -1540,7 +1540,7 @@ func (fs *eosfs) extractUIDAndGID(u *userpb.User) (string, string, error) {
 	if u.GidNumber == 0 {
 		return "", "", errors.New("eos: gid missing for user")
 	}
-	return fmt.Sprintf("%v", u.UidNumber), fmt.Sprintf("%v", u.GidNumber), nil
+	return strconv.FormatInt(u.UidNumber, 10), strconv.FormatInt(u.GidNumber, 10), nil
 }
 
 func (fs *eosfs) getUIDGateway(ctx context.Context, u *userpb.UserId) (string, string, error) {

pkg/user/manager/demo/demo.go

@@ -21,7 +21,7 @@ package demo
 import (
 	"context"
 	"errors"
-	"fmt"
+	"strconv"
 	"strings"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -70,7 +70,7 @@ func extractClaim(u *userpb.User, claim string) (string, error) {
 		return u.Username, nil
 	case "uid":
 		if u.UidNumber != 0 {
-			return fmt.Sprintf("%v", u.UidNumber), nil
+			return strconv.FormatInt(u.UidNumber, 10), nil
 		}
 	}
 	return "", errors.New("demo: invalid field")

pkg/user/manager/json/json.go

@@ -21,8 +21,8 @@ package json
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
+	"strconv"
 	"strings"
 
 	"github.com/cs3org/reva/pkg/user"
@@ -113,7 +113,7 @@ func extractClaim(u *userpb.User, claim string) (string, error) {
 		return u.Username, nil
 	case "uid":
 		if u.UidNumber != 0 {
-			return fmt.Sprintf("%v", u.UidNumber), nil
+			return strconv.FormatInt(u.UidNumber, 10), nil
 		}
 	}
 	return "", errors.New("json: invalid field")