From e626afcc04a92b53082c6a4239a099ef9e8ce5c6 Mon Sep 17 00:00:00 2001 From: Tiago Angelo <5454243+angelokurtis@users.noreply.github.com> Date: Mon, 22 Jun 2020 06:32:50 -0300 Subject: [PATCH] fix: add oauth client name to the CRD spec (#56) Signed-off-by: Tiago Angelo --- api/v1alpha1/oauth2client_types.go | 5 +++++ config/crd/bases/hydra.ory.sh_oauth2clients.yaml | 4 ++++ hydra/types.go | 1 + 3 files changed, 10 insertions(+) diff --git a/api/v1alpha1/oauth2client_types.go b/api/v1alpha1/oauth2client_types.go index 702ef91..ad79d0f 100644 --- a/api/v1alpha1/oauth2client_types.go +++ b/api/v1alpha1/oauth2client_types.go @@ -68,6 +68,10 @@ type HydraAdmin struct { // OAuth2ClientSpec defines the desired state of OAuth2Client type OAuth2ClientSpec struct { + + // ClientName is the human-readable string name of the client to be presented to the end-user during authorization. + ClientName string `json:"clientName,omitempty"` + // +kubebuilder:validation:MaxItems=4 // +kubebuilder:validation:MinItems=1 // @@ -176,6 +180,7 @@ func init() { // ToOAuth2ClientJSON converts an OAuth2Client into a OAuth2ClientJSON object that represents an OAuth2 client digestible by ORY Hydra func (c *OAuth2Client) ToOAuth2ClientJSON() *hydra.OAuth2ClientJSON { return &hydra.OAuth2ClientJSON{ + ClientName: c.Spec.ClientName, GrantTypes: grantToStringSlice(c.Spec.GrantTypes), ResponseTypes: responseToStringSlice(c.Spec.ResponseTypes), RedirectURIs: redirectToStringSlice(c.Spec.RedirectURIs), diff --git a/config/crd/bases/hydra.ory.sh_oauth2clients.yaml b/config/crd/bases/hydra.ory.sh_oauth2clients.yaml index e95b7e7..e8aec8a 100644 --- a/config/crd/bases/hydra.ory.sh_oauth2clients.yaml +++ b/config/crd/bases/hydra.ory.sh_oauth2clients.yaml @@ -393,6 +393,10 @@ spec: items: type: string type: array + clientName: + description: ClientName is the human-readable string name of the client + to be presented to the end-user during authorization. + type: string grantTypes: description: GrantTypes is an array of grant types the client is allowed to use. diff --git a/hydra/types.go b/hydra/types.go index faff395..8bd3f7e 100644 --- a/hydra/types.go +++ b/hydra/types.go @@ -8,6 +8,7 @@ import ( // OAuth2ClientJSON represents an OAuth2 client digestible by ORY Hydra type OAuth2ClientJSON struct { + ClientName string `json:"client_name,omitempty"` ClientID *string `json:"client_id,omitempty"` Secret *string `json:"client_secret,omitempty"` GrantTypes []string `json:"grant_types"`