Add organization id in claims (#17954)

* add OrganizationId in claims. * Update components/gitpod-protocol/go/gitpod-service.go * fix
gitpod-io · Jun 26, 2023 · f74ba1c · f74ba1c
1 parent dfebcc0
commit f74ba1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/components/gitpod-protocol/go/gitpod-service.go b/components/gitpod-protocol/go/gitpod-service.go
@@ -1682,10 +1682,11 @@ type Workspace struct {
 	// The source where to get the workspace base image from. This source is resolved
 	// during workspace creation. Once a base image has been built the information in here
 	// is superseded by baseImageNameResolved.
-	ImageSource interface{} `json:"imageSource,omitempty"`
-	OwnerID     string      `json:"ownerId,omitempty"`
-	Pinned      bool        `json:"pinned,omitempty"`
-	Shareable   bool        `json:"shareable,omitempty"`
+	ImageSource    interface{} `json:"imageSource,omitempty"`
+	OrganizationId string      `json:"organizationId,omitempty"`
+	OwnerID        string      `json:"ownerId,omitempty"`
+	Pinned         bool        `json:"pinned,omitempty"`
+	Shareable      bool        `json:"shareable,omitempty"`
 
 	// Mark as deleted (user-facing). The actual deletion of the workspace content is executed
 	// with a (configurable) delay

diff --git a/components/public-api-server/pkg/apiv1/identityprovider.go b/components/public-api-server/pkg/apiv1/identityprovider.go
@@ -88,6 +88,8 @@ func (srv *IdentityProviderService) GetIDToken(ctx context.Context, req *connect
 	userInfo := oidc.NewUserInfo()
 	userInfo.SetName(user.Name)
 	userInfo.SetSubject(subject)
+	userInfo.AppendClaims("org_id", workspace.Workspace.OrganizationId)
+
 	if email != "" {
 		userInfo.SetEmail(email, user.OrganizationId != "")
 	}