Skip to content

fix: drop UnmarshalJSON required-property pre-check on OIDC client settings #592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
exitcode0 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: drop UnmarshalJSON required-property pre-check on OIDC client settings #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d3720f
fix: drop required-property pre-check from generated UnmarshalJSON
exitcode0 May 25, 2026
7a5861e
regenerate models
exitcode0 May 25, 2026
76858cc
scope to per-file override via .openapi-generator-ignore
exitcode0 May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions okta/.openapi-generator-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# See: https://openapi-generator.tech/docs/customization/#ignore-file-format
#
# Files listed here are preserved across `make generate-files` runs.
#
# model_open_id_connect_application_settings_client.go contains a manual
# fix for issue #591: the generated UnmarshalJSON rejects valid GET
# responses that omit `grant_types` (e.g. preconfigured apps like
# okta_atspoke_iam_connector). Once the openapi-generator go template is
# updated to skip required-property validation on read for the
# unmarshal path (or the spec is split into request/response variants),
# this entry can be removed.
model_open_id_connect_application_settings_client.go
26 changes: 5 additions & 21 deletions okta/model_open_id_connect_application_settings_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ package okta

import (
"encoding/json"
"fmt"
)

// checks if the OpenIdConnectApplicationSettingsClient type satisfies the MappedNullable interface at compile time
Expand Down Expand Up @@ -1141,26 +1140,11 @@ func (o OpenIdConnectApplicationSettingsClient) ToMap() (map[string]interface{},
}

func (o *OpenIdConnectApplicationSettingsClient) UnmarshalJSON(data []byte) (err error) {
// This validates that all required properties are included in the JSON object
// by unmarshalling the object into a generic map with string keys and checking
// that every required field exists as a key in the generic map.
requiredProperties := []string{
"grant_types",
}

allProperties := make(map[string]interface{})

err = json.Unmarshal(data, &allProperties)

if err != nil {
return err
}

for _, requiredProperty := range requiredProperties {
if _, exists := allProperties[requiredProperty]; !exists {
return fmt.Errorf("no value given for required property %v", requiredProperty)
}
}
// No required-property pre-check on read: the Okta API legitimately
// returns settings.oauthClient without grant_types (e.g. the
// preconfigured app okta_atspoke_iam_connector). Write-side safety is
// preserved by NewOpenIdConnectApplicationSettingsClient(grantTypes)
// and by server-side validation on POST/PUT.

varOpenIdConnectApplicationSettingsClient := _OpenIdConnectApplicationSettingsClient{}

Expand Down