feat(server): support name claim for RBAC SSO (#10927)

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>

Makefile

@@ -139,7 +139,7 @@ define protoc
       -I $(CURDIR) \
       -I $(CURDIR)/vendor \
       -I $(GOPATH)/src \
-      -I $(GOPATH)/pkg/mod/github.com/gogo/protobuf@v1.3.1/gogoproto \
+      -I $(GOPATH)/pkg/mod/github.com/gogo/protobuf@v1.3.2/gogoproto \
       -I $(GOPATH)/pkg/mod/github.com/grpc-ecosystem/grpc-gateway@v1.16.0/third_party/googleapis \
       --gogofast_out=plugins=grpc:$(GOPATH)/src \
       --grpc-gateway_out=logtostderr=true:$(GOPATH)/src \

api/jsonschema/schema.json

@@ -4811,6 +4811,9 @@
         "issuer": {
           "type": "string"
         },
+        "name": {
+          "type": "string"
+        },
         "serviceAccountName": {
           "type": "string"
         },

api/openapi-spec/swagger.json

@@ -8742,6 +8742,9 @@
         "issuer": {
           "type": "string"
         },
+        "name": {
+          "type": "string"
+        },
         "serviceAccountName": {
           "type": "string"
         },

docs/workflow-controller-configmap.yaml

@@ -361,6 +361,7 @@ data:
     scopes:
      - groups
      - email
+     - profile
     # RBAC Config. >= v2.12
     rbac:
       enabled: false

pkg/apiclient/info/info.proto

@@ -32,6 +32,7 @@ message GetUserInfoResponse {
   bool emailVerified = 5;
   string serviceAccountName = 6;
   string serviceAccountNamespace = 7;
+  string name = 8;
 }
 
 message CollectEventRequest {

sdks/java/client/docs/IoArgoprojWorkflowV1alpha1GetUserInfoResponse.md

@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **emailVerified** | **Boolean** |  |  [optional]
 **groups** | **List<String>** |  |  [optional]
 **issuer** | **String** |  |  [optional]
+**name** | **String** |  |  [optional]
 **serviceAccountName** | **String** |  |  [optional]
 **serviceAccountNamespace** | **String** |  |  [optional]
 **subject** | **String** |  |  [optional]

server/auth/sso/sso.go

@@ -287,6 +287,7 @@ func (s *sso) HandleCallback(w http.ResponseWriter, r *http.Request) {
 		Groups:                  groups,
 		Email:                   c.Email,
 		EmailVerified:           c.EmailVerified,
+		Name:                    c.Name,
 		ServiceAccountName:      c.ServiceAccountName,
 		PreferredUsername:       c.PreferredUsername,
 		ServiceAccountNamespace: c.ServiceAccountNamespace,

server/auth/types/claims.go

@@ -13,6 +13,7 @@ type Claims struct {
 	Groups                  []string               `json:"groups,omitempty"`
 	Email                   string                 `json:"email,omitempty"`
 	EmailVerified           bool                   `json:"email_verified,omitempty"`
+	Name                    string                 `json:"name,omitempty"`
 	ServiceAccountName      string                 `json:"service_account_name,omitempty"`
 	ServiceAccountNamespace string                 `json:"service_account_namespace,omitempty"`
 	PreferredUsername       string                 `json:"preferred_username,omitempty"`

server/info/info_server.go

@@ -26,6 +26,7 @@ func (i *infoServer) GetUserInfo(ctx context.Context, _ *infopkg.GetUserInfoRequ
 			Subject:                 claims.Subject,
 			Issuer:                  claims.Issuer,
 			Groups:                  claims.Groups,
+			Name:                    claims.Name,
 			Email:                   claims.Email,
 			EmailVerified:           claims.EmailVerified,
 			ServiceAccountName:      claims.ServiceAccountName,

server/info/info_server_test.go

@@ -14,12 +14,13 @@ import (
 
 func Test_infoServer_GetUserInfo(t *testing.T) {
 	i := &infoServer{}
-	ctx := context.WithValue(context.TODO(), auth.ClaimsKey, &types.Claims{Claims: jwt.Claims{Issuer: "my-iss", Subject: "my-sub"}, Groups: []string{"my-group"}, Email: "my@email", EmailVerified: true, ServiceAccountName: "my-sa"})
+	ctx := context.WithValue(context.TODO(), auth.ClaimsKey, &types.Claims{Claims: jwt.Claims{Issuer: "my-iss", Subject: "my-sub"}, Groups: []string{"my-group"}, Name: "myname", Email: "my@email", EmailVerified: true, ServiceAccountName: "my-sa"})
 	info, err := i.GetUserInfo(ctx, nil)
 	if assert.NoError(t, err) {
 		assert.Equal(t, "my-iss", info.Issuer)
 		assert.Equal(t, "my-sub", info.Subject)
 		assert.Equal(t, []string{"my-group"}, info.Groups)
+		assert.Equal(t, "myname", info.Name)
 		assert.Equal(t, "my@email", info.Email)
 		assert.True(t, info.EmailVerified)
 		assert.Equal(t, "my-sa", info.ServiceAccountName)

ui/src/app/userinfo/components/user-info.tsx

@@ -49,6 +49,10 @@ export class UserInfo extends BasePage<RouteComponentProps<any>, State> {
                                 <dt>Groups:</dt>
                                 <dd>{(this.state.userInfo.groups && this.state.userInfo.groups.length > 0 && this.state.userInfo.groups.join(', ')) || '-'}</dd>
                             </dl>
+                            <dl>
+                                <dt>Name:</dt>
+                                <dd>{this.state.userInfo.name || '-'}</dd>
+                            </dl>
                             <dl>
                                 <dt>Email:</dt>
                                 <dd>{this.state.userInfo.email || '-'}</dd>

ui/src/models/info.ts

@@ -25,6 +25,7 @@ export interface GetUserInfoResponse {
     subject?: string;
     issuer?: string;
     groups?: string[];
+    name?: string;
     email?: string;
     emailVerified?: boolean;
     serviceAccountName?: string;