feat(auth): always indicate public link user

Signed-off-by: jkoberg <jkoberg@owncloud.com>
kobergj · Sep 18, 2024 · ec12c62 · ec12c62
1 parent d445295
commit ec12c62
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/pkg/auth/manager/publicshares/publicshares.go b/pkg/auth/manager/publicshares/publicshares.go
@@ -25,7 +25,6 @@ import (
 
 	authpb "github.com/cs3org/go-cs3apis/cs3/auth/provider/v1beta1"
 	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
-	userprovider "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	rpcv1beta1 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1"
 	types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
@@ -127,26 +126,29 @@ func (m *manager) Authenticate(ctx context.Context, token, secret string) (*user
 		return nil, nil, errtypes.InternalError(publicShareResponse.Status.Message)
 	}
 
-	var owner *user.User
-	// FIXME use new user type SPACE_OWNER
-	if publicShareResponse.GetShare().GetOwner().GetType() == 8 {
-		owner = &user.User{Id: publicShareResponse.GetShare().GetOwner(), DisplayName: "Public", Username: "public"}
-	} else {
-		getUserResponse, err := gwConn.GetUser(ctx, &userprovider.GetUserRequest{
-			UserId: publicShareResponse.GetShare().GetCreator(),
-		})
-		switch {
-		case err != nil:
-			return nil, nil, err
-		case getUserResponse.GetStatus().GetCode() == rpcv1beta1.Code_CODE_NOT_FOUND:
-			return nil, nil, errtypes.NotFound(getUserResponse.GetStatus().GetMessage())
-		case getUserResponse.GetStatus().GetCode() == rpcv1beta1.Code_CODE_PERMISSION_DENIED:
-			return nil, nil, errtypes.InvalidCredentials(getUserResponse.GetStatus().GetMessage())
-		case getUserResponse.GetStatus().GetCode() != rpcv1beta1.Code_CODE_OK:
-			return nil, nil, errtypes.InternalError(getUserResponse.GetStatus().GetMessage())
+	owner := &user.User{Id: publicShareResponse.GetShare().GetOwner(), DisplayName: "Public", Username: "public"}
+	/*
+		var owner *user.User
+		// FIXME use new user type SPACE_OWNER
+		if publicShareResponse.GetShare().GetOwner().GetType() == 8 {
+			owner = &user.User{Id: publicShareResponse.GetShare().GetOwner(), DisplayName: "Public", Username: "public"}
+		} else {
+			getUserResponse, err := gwConn.GetUser(ctx, &userprovider.GetUserRequest{
+				UserId: publicShareResponse.GetShare().GetCreator(),
+			})
+			switch {
+			case err != nil:
+				return nil, nil, err
+			case getUserResponse.GetStatus().GetCode() == rpcv1beta1.Code_CODE_NOT_FOUND:
+				return nil, nil, errtypes.NotFound(getUserResponse.GetStatus().GetMessage())
+			case getUserResponse.GetStatus().GetCode() == rpcv1beta1.Code_CODE_PERMISSION_DENIED:
+				return nil, nil, errtypes.InvalidCredentials(getUserResponse.GetStatus().GetMessage())
+			case getUserResponse.GetStatus().GetCode() != rpcv1beta1.Code_CODE_OK:
+				return nil, nil, errtypes.InternalError(getUserResponse.GetStatus().GetMessage())
+			}
+			owner = getUserResponse.GetUser()
 		}
-		owner = getUserResponse.GetUser()
-	}
+	*/
 
 	share := publicShareResponse.GetShare()
 	role := authpb.Role_ROLE_VIEWER