diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91ce8c596..d7c694d5a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,7 +39,7 @@ jobs: run: | set -x - if [ ! -z $(gofmt -l .) ] + if [ -n "$(gofmt -s -l .)" ] then echo 'Make sure to run "gofmt -s -w ." before commit!' && exit 1 fi diff --git a/internal/api/oauthserver/service.go b/internal/api/oauthserver/service.go index 5ea9db46e..d083d5f85 100644 --- a/internal/api/oauthserver/service.go +++ b/internal/api/oauthserver/service.go @@ -374,12 +374,12 @@ func (s *Server) regenerateOAuthServerClientSecret(ctx context.Context, clientID // OAuthServerClientUpdateParams contains parameters for updating an OAuth client type OAuthServerClientUpdateParams struct { - RedirectURIs *[]string `json:"redirect_uris,omitempty"` - GrantTypes *[]string `json:"grant_types,omitempty"` - ClientName *string `json:"client_name,omitempty"` - ClientURI *string `json:"client_uri,omitempty"` - LogoURI *string `json:"logo_uri,omitempty"` - TokenEndpointAuthMethod *string `json:"token_endpoint_auth_method,omitempty"` + RedirectURIs *[]string `json:"redirect_uris,omitempty"` + GrantTypes *[]string `json:"grant_types,omitempty"` + ClientName *string `json:"client_name,omitempty"` + ClientURI *string `json:"client_uri,omitempty"` + LogoURI *string `json:"logo_uri,omitempty"` + TokenEndpointAuthMethod *string `json:"token_endpoint_auth_method,omitempty"` } // isEmpty returns true if no fields are set for update diff --git a/internal/api/provider/custom_oauth_claims_test.go b/internal/api/provider/custom_oauth_claims_test.go index b543e3a08..185fbd228 100644 --- a/internal/api/provider/custom_oauth_claims_test.go +++ b/internal/api/provider/custom_oauth_claims_test.go @@ -191,7 +191,7 @@ func TestCustomOIDCProvider_GetUserData_UserinfoAllowlist(t *testing.T) { provider, err := NewCustomOIDCProvider( context.Background(), "client-id", "client-secret", "https://myapp.com/callback", - []string{"openid"}, server.URL, server.URL + "/.well-known/openid-configuration", false, + []string{"openid"}, server.URL, server.URL+"/.well-known/openid-configuration", false, nil, nil, nil, []string{"mail", "sn"}, newTestOIDCProviderCache(t, 0), @@ -257,7 +257,7 @@ func TestCustomOIDCProvider_GetUserData_IDTokenAllowlist(t *testing.T) { provider, err := NewCustomOIDCProvider( context.Background(), "client-id", "client-secret", "https://myapp.com/callback", - []string{"openid"}, server.URL, server.URL + "/.well-known/openid-configuration", false, + []string{"openid"}, server.URL, server.URL+"/.well-known/openid-configuration", false, nil, nil, nil, []string{"groups", "org_id"}, newTestOIDCProviderCache(t, 0), diff --git a/internal/api/provider/provider.go b/internal/api/provider/provider.go index c3ab0781f..efbd08a18 100644 --- a/internal/api/provider/provider.go +++ b/internal/api/provider/provider.go @@ -92,24 +92,24 @@ type Claims struct { Exp float64 `json:"exp,omitempty" structs:"exp,omitempty"` // Default profile claims - Name string `json:"name,omitempty" structs:"name,omitempty"` - FamilyName string `json:"family_name,omitempty" structs:"family_name,omitempty"` - GivenName string `json:"given_name,omitempty" structs:"given_name,omitempty"` - MiddleName string `json:"middle_name,omitempty" structs:"middle_name,omitempty"` - NickName string `json:"nickname,omitempty" structs:"nickname,omitempty"` - PreferredUsername string `json:"preferred_username,omitempty" structs:"preferred_username,omitempty"` - Profile string `json:"profile,omitempty" structs:"profile,omitempty"` - Picture string `json:"picture,omitempty" structs:"picture,omitempty"` - Website string `json:"website,omitempty" structs:"website,omitempty"` - Gender string `json:"gender,omitempty" structs:"gender,omitempty"` - Birthdate string `json:"birthdate,omitempty" structs:"birthdate,omitempty"` - ZoneInfo string `json:"zoneinfo,omitempty" structs:"zoneinfo,omitempty"` - Locale string `json:"locale,omitempty" structs:"locale,omitempty"` + Name string `json:"name,omitempty" structs:"name,omitempty"` + FamilyName string `json:"family_name,omitempty" structs:"family_name,omitempty"` + GivenName string `json:"given_name,omitempty" structs:"given_name,omitempty"` + MiddleName string `json:"middle_name,omitempty" structs:"middle_name,omitempty"` + NickName string `json:"nickname,omitempty" structs:"nickname,omitempty"` + PreferredUsername string `json:"preferred_username,omitempty" structs:"preferred_username,omitempty"` + Profile string `json:"profile,omitempty" structs:"profile,omitempty"` + Picture string `json:"picture,omitempty" structs:"picture,omitempty"` + Website string `json:"website,omitempty" structs:"website,omitempty"` + Gender string `json:"gender,omitempty" structs:"gender,omitempty"` + Birthdate string `json:"birthdate,omitempty" structs:"birthdate,omitempty"` + ZoneInfo string `json:"zoneinfo,omitempty" structs:"zoneinfo,omitempty"` + Locale string `json:"locale,omitempty" structs:"locale,omitempty"` UpdatedAt *UnixTimeOrString `json:"updated_at,omitempty" structs:"updated_at,omitempty"` - Email string `json:"email,omitempty" structs:"email,omitempty"` - EmailVerified bool `json:"email_verified,omitempty" structs:"email_verified"` - Phone string `json:"phone,omitempty" structs:"phone,omitempty"` - PhoneVerified bool `json:"phone_verified,omitempty" structs:"phone_verified"` + Email string `json:"email,omitempty" structs:"email,omitempty"` + EmailVerified bool `json:"email_verified,omitempty" structs:"email_verified"` + Phone string `json:"phone,omitempty" structs:"phone,omitempty"` + PhoneVerified bool `json:"phone_verified,omitempty" structs:"phone_verified"` // Custom profile claims that are provider specific CustomClaims map[string]interface{} `json:"custom_claims,omitempty" structs:"custom_claims,omitempty"` diff --git a/internal/api/settings.go b/internal/api/settings.go index 7fb21a05f..80c481e9b 100644 --- a/internal/api/settings.go +++ b/internal/api/settings.go @@ -32,14 +32,14 @@ type ProviderSettings struct { } type Settings struct { - ExternalProviders ProviderSettings `json:"external"` - DisableSignup bool `json:"disable_signup"` - MailerAutoconfirm bool `json:"mailer_autoconfirm"` - PhoneAutoconfirm bool `json:"phone_autoconfirm"` - SmsProvider string `json:"sms_provider"` - SAMLEnabled bool `json:"saml_enabled"` - SAMLPrivateKeyNextConfigured bool `json:"saml_private_key_next_configured"` - PasskeysEnabled bool `json:"passkeys_enabled"` + ExternalProviders ProviderSettings `json:"external"` + DisableSignup bool `json:"disable_signup"` + MailerAutoconfirm bool `json:"mailer_autoconfirm"` + PhoneAutoconfirm bool `json:"phone_autoconfirm"` + SmsProvider string `json:"sms_provider"` + SAMLEnabled bool `json:"saml_enabled"` + SAMLPrivateKeyNextConfigured bool `json:"saml_private_key_next_configured"` + PasskeysEnabled bool `json:"passkeys_enabled"` } func (a *API) Settings(w http.ResponseWriter, r *http.Request) error { @@ -74,9 +74,9 @@ func (a *API) Settings(w http.ResponseWriter, r *http.Request) error { Phone: config.External.Phone.Enabled, Zoom: config.External.Zoom.Enabled, }, - DisableSignup: config.DisableSignup, - MailerAutoconfirm: config.Mailer.Autoconfirm, - PhoneAutoconfirm: config.Sms.Autoconfirm, + DisableSignup: config.DisableSignup, + MailerAutoconfirm: config.Mailer.Autoconfirm, + PhoneAutoconfirm: config.Sms.Autoconfirm, SmsProvider: config.Sms.Provider, SAMLEnabled: config.SAML.Enabled, SAMLPrivateKeyNextConfigured: config.SAML.CertificateNext != nil, diff --git a/internal/conf/confload/confload.go b/internal/conf/confload/confload.go index aa0170cc0..2315ba882 100644 --- a/internal/conf/confload/confload.go +++ b/internal/conf/confload/confload.go @@ -134,4 +134,4 @@ func loadEnvironment(filename string) error { } } return err -} \ No newline at end of file +}