Add primary auth method ID to default output fields, fix display bug (#1441)

globals/fields.go

@@ -30,7 +30,7 @@ const (
 	GrantScopeIdField                    = "grant_scope_id"
 	GrantsField                          = "grants"
 	GrantStringsField                    = "grant_strings"
-	PrimaryAuthMethodId                  = "primary_auth_method_id"
+	PrimaryAuthMethodIdField             = "primary_auth_method_id"
 	TargetIdField                        = "target_id"
 	HostIdField                          = "host_id"
 	HostSetIdField                       = "host_set_id"

internal/cmd/commands/scopescmd/funcs.go

@@ -150,7 +150,7 @@ func printItemTable(result api.GenericResult) string {
 		nonAttributeMap["Description"] = item.Description
 	}
 	if item.PrimaryAuthMethodId != "" {
-		nonAttributeMap[flagPrimaryAuthMethodIdName] = item.PrimaryAuthMethodId
+		nonAttributeMap["Primary Auth Method ID"] = item.PrimaryAuthMethodId
 	}
 
 	maxLength := base.MaxAttributesLength(nonAttributeMap, nil, nil)

internal/perms/output_fields.go

@@ -75,6 +75,7 @@ func (o OutputFieldsMap) SelfOrDefaults(userId string) OutputFieldsMap {
 			globals.DescriptionField:                 true,
 			globals.TypeField:                        true,
 			globals.IsPrimaryField:                   true,
+			globals.PrimaryAuthMethodIdField:         true,
 			globals.AuthorizedActionsField:           true,
 			globals.AuthorizedCollectionActionsField: true,
 		}

internal/perms/output_fields_test.go

@@ -248,6 +248,7 @@ func Test_ACLSelfOrDefault(t *testing.T) {
 				globals.DescriptionField:                 true,
 				globals.TypeField:                        true,
 				globals.IsPrimaryField:                   true,
+				globals.PrimaryAuthMethodIdField:         true,
 				globals.AuthorizedActionsField:           true,
 				globals.AuthorizedCollectionActionsField: true,
 			},

internal/servers/controller/handlers/scopes/scope_service.go

@@ -578,7 +578,7 @@ func ToProto(ctx context.Context, in *iam.Scope, opt ...handlers.Option) (*pb.Sc
 	if outputFields.Has(globals.AuthorizedCollectionActionsField) {
 		out.AuthorizedCollectionActions = opts.WithAuthorizedCollectionActions
 	}
-	if outputFields.Has(globals.PrimaryAuthMethodId) && in.GetPrimaryAuthMethodId() != "" {
+	if outputFields.Has(globals.PrimaryAuthMethodIdField) && in.GetPrimaryAuthMethodId() != "" {
 		out.PrimaryAuthMethodId = &wrapperspb.StringValue{Value: in.GetPrimaryAuthMethodId()}
 	}