feat(controlplane): show role information in API (#554)

Signed-off-by: Miguel Martinez Trivino <[email protected]>

Author: migmartri

app/cli/cmd/organization_describe.go

@@ -46,7 +46,11 @@ func contextTableOutput(config *action.ConfigContextItem) error {
 	gt.SetTitle("Current Context")
 	gt.AppendRow(table.Row{"Logged in as", config.CurrentUser.Email})
 	gt.AppendSeparator()
-	gt.AppendRow(table.Row{"Organization", fmt.Sprintf("%s (%s)", config.CurrentOrg.Name, config.CurrentOrg.ID)})
+
+	if m := config.CurrentMembership; m != nil {
+		gt.AppendRow(table.Row{"Organization", fmt.Sprintf("%s (role=%s)", m.Org.Name, m.Role)})
+	}
+
 	backend := config.CurrentCASBackend
 	if backend != nil {
 		gt.AppendSeparator()

app/cli/cmd/organization_list.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -49,10 +49,10 @@ func orgMembershipTableOutput(items []*action.MembershipItem) error {
 	}
 
 	t := newTableWriter()
-	t.AppendHeader(table.Row{"Org ID", "Org Name", "Current", "Joined At"})
+	t.AppendHeader(table.Row{"Org ID", "Org Name", "Current", "Role", "Joined At"})
 
 	for _, i := range items {
-		t.AppendRow(table.Row{i.Org.ID, i.Org.Name, i.Current, i.CreatedAt.Format(time.RFC822)})
+		t.AppendRow(table.Row{i.Org.ID, i.Org.Name, i.Current, i.Role, i.CreatedAt.Format(time.RFC822)})
 		t.AppendSeparator()
 	}
 

app/cli/internal/action/config_current_context.go

@@ -32,7 +32,7 @@ func NewConfigCurrentContext(cfg *ActionsOpts) *ConfigCurrentContext {
 
 type ConfigContextItem struct {
 	CurrentUser       *UserItem
-	CurrentOrg        *OrgItem
+	CurrentMembership *MembershipItem
 	CurrentCASBackend *CASBackendItem
 }
 
@@ -52,7 +52,7 @@ func (action *ConfigCurrentContext) Run() (*ConfigContextItem, error) {
 
 	return &ConfigContextItem{
 		CurrentUser:       pbUserItemToAction(res.GetCurrentUser()),
-		CurrentOrg:        pbOrgItemToAction(res.GetCurrentOrg()),
+		CurrentMembership: pbMembershipItemToAction(res.GetCurrentMembership()),
 		CurrentCASBackend: pbCASBackendItemToAction(res.GetCurrentCasBackend()),
 	}, nil
 }

app/cli/internal/action/membership_list.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ type MembershipItem struct {
 	CreatedAt *time.Time `json:"joinedAt"`
 	UpdatedAt *time.Time `json:"updatedAt"`
 	Org       *OrgItem
+	Role      string `json:"role"`
 }
 
 func NewMembershipList(cfg *ActionsOpts) *MembershipList {
@@ -71,11 +72,22 @@ func pbMembershipItemToAction(in *pb.OrgMembershipItem) *MembershipItem {
 		return nil
 	}
 
+	var role string
+	switch in.Role {
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_ADMIN:
+		role = "admin"
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_VIEWER:
+		role = "viewer"
+	case pb.MembershipRole_MEMBERSHIP_ROLE_ORG_OWNER:
+		role = "owner"
+	}
+
 	return &MembershipItem{
 		ID:        in.GetId(),
 		CreatedAt: toTimePtr(in.GetCreatedAt().AsTime()),
 		UpdatedAt: toTimePtr(in.GetCreatedAt().AsTime()),
 		Org:       pbOrgItemToAction(in.Org),
 		Current:   in.Current,
+		Role:      role,
 	}
 }

app/controlplane/api/controlplane/v1/context.pb.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,23 +16,24 @@
 syntax = "proto3";
 
 package controlplane.v1;
-option go_package = "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1;v1";
 
 import "controlplane/v1/response_messages.proto";
 
+option go_package = "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1;v1";
+
 service ContextService {
   // Get information about the current logged in context
-	rpc Current (ContextServiceCurrentRequest) returns (ContextServiceCurrentResponse);
+  rpc Current(ContextServiceCurrentRequest) returns (ContextServiceCurrentResponse);
 }
 
 message ContextServiceCurrentRequest {}
 
 message ContextServiceCurrentResponse {
   Result result = 1;
-  
+
   message Result {
     User current_user = 1;
-    OrgItem current_org = 2;
+    OrgMembershipItem current_membership = 2;
     CASBackendItem current_cas_backend = 3;
   }
 }

app/controlplane/api/controlplane/v1/context.pb.validate.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,20 +16,21 @@
 syntax = "proto3";
 
 package controlplane.v1;
-option go_package = "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1;v1";
 
 import "controlplane/v1/response_messages.proto";
 import "validate/validate.proto";
 
+option go_package = "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1;v1";
+
 service OrganizationService {
   // Mermbership management
   // List the organizations this user has access to
-	rpc ListMemberships (OrganizationServiceListMembershipsRequest) returns (OrganizationServiceListMembershipsResponse);
-	rpc DeleteMembership (DeleteMembershipRequest) returns (DeleteMembershipResponse);
-	rpc SetCurrentMembership (SetCurrentMembershipRequest) returns (SetCurrentMembershipResponse);
+  rpc ListMemberships(OrganizationServiceListMembershipsRequest) returns (OrganizationServiceListMembershipsResponse);
+  rpc DeleteMembership(DeleteMembershipRequest) returns (DeleteMembershipResponse);
+  rpc SetCurrentMembership(SetCurrentMembershipRequest) returns (SetCurrentMembershipResponse);
   // Organization management
-	rpc Create (OrganizationServiceCreateRequest) returns (OrganizationServiceCreateResponse);
-	rpc Update (OrganizationServiceUpdateRequest) returns (OrganizationServiceUpdateResponse);
+  rpc Create(OrganizationServiceCreateRequest) returns (OrganizationServiceCreateResponse);
+  rpc Update(OrganizationServiceUpdateRequest) returns (OrganizationServiceUpdateResponse);
 }
 
 message OrganizationServiceListMembershipsRequest {}