Fixes generated array types (#84)

* Fixes generated array types

- Fixes the generator type selector to properly set the type of an array
  when it's a custom type other than a string

* Updates sms phone number for test

Author: bretterer

okta/logAuthenticationContext.go

@@ -21,11 +21,11 @@ package okta
 import ()
 
 type LogAuthenticationContext struct {
-	AuthenticationProvider string     `json:"authenticationProvider,omitempty"`
-	AuthenticationStep     int64      `json:"authenticationStep,omitempty"`
-	CredentialProvider     []string   `json:"credentialProvider,omitempty"`
-	CredentialType         []string   `json:"credentialType,omitempty"`
-	ExternalSessionId      string     `json:"externalSessionId,omitempty"`
-	Interface              string     `json:"interface,omitempty"`
-	Issuer                 *LogIssuer `json:"issuer,omitempty"`
+	AuthenticationProvider string                   `json:"authenticationProvider,omitempty"`
+	AuthenticationStep     int64                    `json:"authenticationStep,omitempty"`
+	CredentialProvider     []*LogCredentialProvider `json:"credentialProvider,omitempty"`
+	CredentialType         []*LogCredentialType     `json:"credentialType,omitempty"`
+	ExternalSessionId      string                   `json:"externalSessionId,omitempty"`
+	Interface              string                   `json:"interface,omitempty"`
+	Issuer                 *LogIssuer               `json:"issuer,omitempty"`
 }

okta/logEvent.go

@@ -39,7 +39,7 @@ type LogEvent struct {
 	Request               *LogRequest               `json:"request,omitempty"`
 	SecurityContext       *LogSecurityContext       `json:"securityContext,omitempty"`
 	Severity              string                    `json:"severity,omitempty"`
-	Target                []string                  `json:"target,omitempty"`
+	Target                []*LogTarget              `json:"target,omitempty"`
 	Transaction           *LogTransaction           `json:"transaction,omitempty"`
 	Uuid                  string                    `json:"uuid,omitempty"`
 	Version               string                    `json:"version,omitempty"`

okta/logRequest.go

@@ -21,5 +21,5 @@ package okta
 import ()
 
 type LogRequest struct {
-	IpChain []string `json:"ipChain,omitempty"`
+	IpChain []*LogIpAddress `json:"ipChain,omitempty"`
 }

okta/openIdConnectApplicationSettingsClient.go

@@ -21,15 +21,16 @@ package okta
 import ()
 
 type OpenIdConnectApplicationSettingsClient struct {
-	ApplicationType string   `json:"application_type,omitempty"`
-	ClientUri       string   `json:"client_uri,omitempty"`
-	ConsentMethod   string   `json:"consent_method,omitempty"`
-	GrantTypes      []string `json:"grant_types,omitempty"`
-	LogoUri         string   `json:"logo_uri,omitempty"`
-	PolicyUri       string   `json:"policy_uri,omitempty"`
-	RedirectUris    []string `json:"redirect_uris,omitempty"`
-	ResponseTypes   []string `json:"response_types,omitempty"`
-	TosUri          string   `json:"tos_uri,omitempty"`
+	ApplicationType        string               `json:"application_type,omitempty"`
+	ClientUri              string               `json:"client_uri,omitempty"`
+	ConsentMethod          string               `json:"consent_method,omitempty"`
+	GrantTypes             []*OAuthGrantType    `json:"grant_types,omitempty"`
+	LogoUri                string               `json:"logo_uri,omitempty"`
+	PolicyUri              string               `json:"policy_uri,omitempty"`
+	PostLogoutRedirectUris []string             `json:"post_logout_redirect_uris,omitempty"`
+	RedirectUris           []string             `json:"redirect_uris,omitempty"`
+	ResponseTypes          []*OAuthResponseType `json:"response_types,omitempty"`
+	TosUri                 string               `json:"tos_uri,omitempty"`
 }
 
 func NewOpenIdConnectApplicationSettingsClient() *OpenIdConnectApplicationSettingsClient {

okta/samlApplicationSettingsSignOn.go

@@ -21,27 +21,27 @@ package okta
 import ()
 
 type SamlApplicationSettingsSignOn struct {
-	AssertionSigned       *bool    `json:"assertionSigned,omitempty"`
-	AttributeStatements   []string `json:"attributeStatements,omitempty"`
-	Audience              string   `json:"audience,omitempty"`
-	AudienceOverride      string   `json:"audienceOverride,omitempty"`
-	AuthnContextClassRef  string   `json:"authnContextClassRef,omitempty"`
-	DefaultRelayState     string   `json:"defaultRelayState,omitempty"`
-	Destination           string   `json:"destination,omitempty"`
-	DestinationOverride   string   `json:"destinationOverride,omitempty"`
-	DigestAlgorithm       string   `json:"digestAlgorithm,omitempty"`
-	HonorForceAuthn       *bool    `json:"honorForceAuthn,omitempty"`
-	IdpIssuer             string   `json:"idpIssuer,omitempty"`
-	Recipient             string   `json:"recipient,omitempty"`
-	RecipientOverride     string   `json:"recipientOverride,omitempty"`
-	RequestCompressed     *bool    `json:"requestCompressed,omitempty"`
-	ResponseSigned        *bool    `json:"responseSigned,omitempty"`
-	SignatureAlgorithm    string   `json:"signatureAlgorithm,omitempty"`
-	SpIssuer              string   `json:"spIssuer,omitempty"`
-	SsoAcsUrl             string   `json:"ssoAcsUrl,omitempty"`
-	SsoAcsUrlOverride     string   `json:"ssoAcsUrlOverride,omitempty"`
-	SubjectNameIdFormat   string   `json:"subjectNameIdFormat,omitempty"`
-	SubjectNameIdTemplate string   `json:"subjectNameIdTemplate,omitempty"`
+	AssertionSigned       *bool                     `json:"assertionSigned,omitempty"`
+	AttributeStatements   []*SamlAttributeStatement `json:"attributeStatements,omitempty"`
+	Audience              string                    `json:"audience,omitempty"`
+	AudienceOverride      string                    `json:"audienceOverride,omitempty"`
+	AuthnContextClassRef  string                    `json:"authnContextClassRef,omitempty"`
+	DefaultRelayState     string                    `json:"defaultRelayState,omitempty"`
+	Destination           string                    `json:"destination,omitempty"`
+	DestinationOverride   string                    `json:"destinationOverride,omitempty"`
+	DigestAlgorithm       string                    `json:"digestAlgorithm,omitempty"`
+	HonorForceAuthn       *bool                     `json:"honorForceAuthn,omitempty"`
+	IdpIssuer             string                    `json:"idpIssuer,omitempty"`
+	Recipient             string                    `json:"recipient,omitempty"`
+	RecipientOverride     string                    `json:"recipientOverride,omitempty"`
+	RequestCompressed     *bool                     `json:"requestCompressed,omitempty"`
+	ResponseSigned        *bool                     `json:"responseSigned,omitempty"`
+	SignatureAlgorithm    string                    `json:"signatureAlgorithm,omitempty"`
+	SpIssuer              string                    `json:"spIssuer,omitempty"`
+	SsoAcsUrl             string                    `json:"ssoAcsUrl,omitempty"`
+	SsoAcsUrlOverride     string                    `json:"ssoAcsUrlOverride,omitempty"`
+	SubjectNameIdFormat   string                    `json:"subjectNameIdFormat,omitempty"`
+	SubjectNameIdTemplate string                    `json:"subjectNameIdTemplate,omitempty"`
 }
 
 func NewSamlApplicationSettingsSignOn() *SamlApplicationSettingsSignOn {

okta/session.go

@@ -26,17 +26,17 @@ import (
 type SessionResource resource
 
 type Session struct {
-	Links                    interface{}              `json:"_links,omitempty"`
-	Amr                      []string                 `json:"amr,omitempty"`
-	CreatedAt                *time.Time               `json:"createdAt,omitempty"`
-	ExpiresAt                *time.Time               `json:"expiresAt,omitempty"`
-	Id                       string                   `json:"id,omitempty"`
-	Idp                      *SessionIdentityProvider `json:"idp,omitempty"`
-	LastFactorVerification   *time.Time               `json:"lastFactorVerification,omitempty"`
-	LastPasswordVerification *time.Time               `json:"lastPasswordVerification,omitempty"`
-	Login                    string                   `json:"login,omitempty"`
-	Status                   string                   `json:"status,omitempty"`
-	UserId                   string                   `json:"userId,omitempty"`
+	Links                    interface{}                    `json:"_links,omitempty"`
+	Amr                      []*SessionAuthenticationMethod `json:"amr,omitempty"`
+	CreatedAt                *time.Time                     `json:"createdAt,omitempty"`
+	ExpiresAt                *time.Time                     `json:"expiresAt,omitempty"`
+	Id                       string                         `json:"id,omitempty"`
+	Idp                      *SessionIdentityProvider       `json:"idp,omitempty"`
+	LastFactorVerification   *time.Time                     `json:"lastFactorVerification,omitempty"`
+	LastPasswordVerification *time.Time                     `json:"lastPasswordVerification,omitempty"`
+	Login                    string                         `json:"login,omitempty"`
+	Status                   string                         `json:"status,omitempty"`
+	UserId                   string                         `json:"userId,omitempty"`
 }
 
 func (m *SessionResource) GetSession(sessionId string) (*Session, *Response, error) {

okta/userCredentials.go

@@ -21,7 +21,7 @@ package okta
 import ()
 
 type UserCredentials struct {
-	Emails           []string                    `json:"emails,omitempty"`
+	Emails           []*EmailAddress             `json:"emails,omitempty"`
 	Password         *PasswordCredential         `json:"password,omitempty"`
 	Provider         *AuthenticationProvider     `json:"provider,omitempty"`
 	RecoveryQuestion *RecoveryQuestionCredential `json:"recovery_question,omitempty"`

openapi/generator/createdFiles.json

@@ -31,7 +31,11 @@ function getType(obj, prefix="") {
     case 'hash' :
       return String.raw`interface{}`;
     case 'array' :
-      return String.raw`[]string`;
+        if(obj.model == undefined || obj.model === "string") {
+          return String.raw`[]string`;
+        } else {
+          return String.raw`[]` + prefix + obj.model;
+        }
     case 'enum' :
     case '':
     case 'null' :

openapi/generator/index.js

@@ -70,7 +70,7 @@ func Test_exercise_factor_lifecycle(t *testing.T) {
 		assert.Empty(t, factors, "Factors list should be empty")
 
 		factorProfile := okta.NewSmsFactorProfile()
-		factorProfile.PhoneNumber = "15055550006"
+		factorProfile.PhoneNumber = "16284001133"
 
 		factor := okta.NewSmsFactor()
 		factor.Profile = factorProfile