Skip to content
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

Jump to bottom

revert csr model rename #398

Merged
merged 2 commits into from
Jun 5, 2020
Merged

revert csr model rename #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aaf112
revert csr model rename
arvindkrishnakumar-okta Jun 5, 2020
93e56a7
IT update
arvindkrishnakumar-okta Jun 5, 2020
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
18 changes: 9 additions & 9 deletions integration-tests/src/test/groovy/com/okta/sdk/tests/it/ApplicationsIT.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ import com.okta.sdk.resource.application.BasicAuthApplication
import com.okta.sdk.resource.application.BookmarkApplication
import com.okta.sdk.resource.application.BookmarkApplicationSettings
import com.okta.sdk.resource.application.BookmarkApplicationSettingsApplication
import com.okta.sdk.resource.application.CertificateSigningRequest
import com.okta.sdk.resource.application.CertificateSigningRequestMetadata
import com.okta.sdk.resource.application.CertificateSigningRequestMetadataSubject
import com.okta.sdk.resource.application.CertificateSigningRequestMetadataSubjectAltNames
import com.okta.sdk.resource.application.Csr
import com.okta.sdk.resource.application.CsrMetadata
import com.okta.sdk.resource.application.CsrMetadataSubject
import com.okta.sdk.resource.application.CsrMetadataSubjectAltNames
import com.okta.sdk.resource.application.JsonWebKey
import com.okta.sdk.resource.application.JsonWebKeyList
import com.okta.sdk.resource.application.OAuth2ScopeConsentGrant
Expand Down Expand Up @@ -531,7 +531,7 @@ class ApplicationsIT extends ITSupport {
}

@Test
void certificateSigningRequestTest() {
void csrTest() {
Client client = getClient()

String label = "app-${uniqueTestName}"
Expand Down Expand Up @@ -562,19 +562,19 @@ class ApplicationsIT extends ITSupport {
assertThat(app.getStatus(), equalTo(Application.StatusEnum.ACTIVE))

// create csr metadata
CertificateSigningRequestMetadata csrMetadata = client.instantiate(CertificateSigningRequestMetadata)
.setSubject(client.instantiate(CertificateSigningRequestMetadataSubject)
CsrMetadata csrMetadata = client.instantiate(CsrMetadata)
.setSubject(client.instantiate(CsrMetadataSubject)
.setCountryName("US")
.setStateOrProvinceName("California")
.setLocalityName("San Francisco")
.setOrganizationName("Okta, Inc.")
.setOrganizationalUnitName("Dev")
.setCommonName("SP Issuer"))
.setSubjectAltNames(client.instantiate(CertificateSigningRequestMetadataSubjectAltNames)
.setSubjectAltNames(client.instantiate(CsrMetadataSubjectAltNames)
.setDnsNames(["dev.okta.com"]))

// generate csr with metadata
CertificateSigningRequest csr = app.generateCsr(csrMetadata)
Csr csr = app.generateCsr(csrMetadata)

// verify
assertPresent(app.listCsrs(), csr)
Expand Down
28 changes: 14 additions & 14 deletions src/swagger/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ paths:
description: Success
schema:
items:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
type: array
security:
- api_token: []
Expand All @@ -241,14 +241,14 @@ paths:
name: metadata
required: true
schema:
$ref: '#/definitions/CertificateSigningRequestMetadata'
$ref: '#/definitions/CsrMetadata'
produces:
- application/json
responses:
'201':
description: Created
schema:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
security:
- api_token: []
summary: Generate Certificate Signing Request for Application
Expand Down Expand Up @@ -296,7 +296,7 @@ paths:
'200':
description: Success
schema:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
security:
- api_token: []
tags:
Expand Down Expand Up @@ -3136,7 +3136,7 @@ paths:
description: Success
schema:
items:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
type: array
security:
- api_token: []
Expand All @@ -3159,14 +3159,14 @@ paths:
name: metadata
required: true
schema:
$ref: '#/definitions/CertificateSigningRequestMetadata'
$ref: '#/definitions/CsrMetadata'
produces:
- application/pkcs10
responses:
'201':
description: Created
schema:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
security:
- api_token: []
summary: Generate Certificate Signing Request for IdP
Expand Down Expand Up @@ -3216,7 +3216,7 @@ paths:
'200':
description: Success
schema:
$ref: '#/definitions/CertificateSigningRequest'
$ref: '#/definitions/Csr'
security:
- api_token: []
tags:
Expand Down Expand Up @@ -7542,7 +7542,7 @@ definitions:
template_swa: '#/definitions/SwaApplication'
template_swa3field: '#/definitions/SwaThreeFieldApplication'
propertyName: name
CertificateSigningRequest:
Csr:
properties:
created:
format: date-time
Expand All @@ -7560,15 +7560,15 @@ definitions:
type: object
x-okta-tags:
- Application
CertificateSigningRequestMetadata:
CsrMetadata:
properties:
subject:
$ref: '#/definitions/CertificateSigningRequestMetadataSubject'
$ref: '#/definitions/CsrMetadataSubject'
subjectAltNames:
$ref: '#/definitions/CertificateSigningRequestMetadataSubjectAltNames'
$ref: '#/definitions/CsrMetadataSubjectAltNames'
x-okta-tags:
- Application
CertificateSigningRequestMetadataSubject:
CsrMetadataSubject:
properties:
commonName:
type: string
Expand All @@ -7584,7 +7584,7 @@ definitions:
type: string
x-okta-tags:
- Application
CertificateSigningRequestMetadataSubjectAltNames:
CsrMetadataSubjectAltNames:
properties:
dnsNames:
items:
Expand Down