Skip to content

Commit

Permalink
Open API Csr rename update (#394)
Browse files Browse the repository at this point in the history
* openapi csr rename update
  • Loading branch information
arvindkrishnakumar-okta authored Jun 5, 2020
1 parent c676de0 commit 922ac2a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
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.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.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.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 csrTest() {
void certificateSigningRequestTest() {
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
CsrMetadata csrMetadata = client.instantiate(CsrMetadata)
.setSubject(client.instantiate(CsrMetadataSubject)
CertificateSigningRequestMetadata csrMetadata = client.instantiate(CertificateSigningRequestMetadata)
.setSubject(client.instantiate(CertificateSigningRequestMetadataSubject)
.setCountryName("US")
.setStateOrProvinceName("California")
.setLocalityName("San Francisco")
.setOrganizationName("Okta, Inc.")
.setOrganizationalUnitName("Dev")
.setCommonName("SP Issuer"))
.setSubjectAltNames(client.instantiate(CsrMetadataSubjectAltNames)
.setSubjectAltNames(client.instantiate(CertificateSigningRequestMetadataSubjectAltNames)
.setDnsNames(["dev.okta.com"]))

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

// verify
assertPresent(app.listCsrs(), csr)
Expand Down
46 changes: 23 additions & 23 deletions src/swagger/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ paths:
get:
consumes:
- application/json
description: Enumerates CSRs for an application
description: Enumerates Certificate Signing Requests for an application
operationId: listCsrsForApplication
parameters:
- in: path
Expand All @@ -218,11 +218,11 @@ paths:
description: Success
schema:
items:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
type: array
security:
- api_token: []
summary: List CSRs for Application
summary: List Certificate Signing Requests for Application
tags:
- Application
post:
Expand All @@ -241,17 +241,17 @@ paths:
name: metadata
required: true
schema:
$ref: '#/definitions/CsrMetadata'
$ref: '#/definitions/CertificateSigningRequestMetadata'
produces:
- application/json
responses:
'201':
description: Created
schema:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
security:
- api_token: []
summary: Generate CSR for Application
summary: Generate Certificate Signing Request for Application
tags:
- Application
'/api/v1/apps/{appId}/credentials/csrs/{csrId}':
Expand Down Expand Up @@ -296,7 +296,7 @@ paths:
'200':
description: Success
schema:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
security:
- api_token: []
tags:
Expand Down Expand Up @@ -3122,7 +3122,7 @@ paths:
get:
consumes:
- application/json
description: Enumerates signing CSRs for an IdP
description: Enumerates Certificate Signing Requests for an IdP
operationId: listCsrsForIdentityProvider
parameters:
- in: path
Expand All @@ -3136,11 +3136,11 @@ paths:
description: Success
schema:
items:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
type: array
security:
- api_token: []
summary: List Signing CSRs for IdP
summary: List Certificate Signing Requests for IdP
tags:
- IdentityProvider
post:
Expand All @@ -3159,24 +3159,24 @@ paths:
name: metadata
required: true
schema:
$ref: '#/definitions/CsrMetadata'
$ref: '#/definitions/CertificateSigningRequestMetadata'
produces:
- application/pkcs10
responses:
'201':
description: Created
schema:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
security:
- api_token: []
summary: Generate Signing CSR for IdP
summary: Generate Certificate Signing Request for IdP
tags:
- IdentityProvider
'/api/v1/idps/{idpId}/credentials/csrs/{csrId}':
delete:
consumes:
- application/json
description: Revoke a CSR and delete the key pair from the IdP
description: Revoke a Certificate Signing Request and delete the key pair from the IdP
operationId: revokeCsrForIdentityProvider
parameters:
- in: path
Expand All @@ -3199,7 +3199,7 @@ paths:
get:
consumes:
- application/json
description: Gets a specific CSR model by id
description: Gets a specific Certificate Signing Request model by id
operationId: getCsrForIdentityProvider
parameters:
- in: path
Expand All @@ -3216,7 +3216,7 @@ paths:
'200':
description: Success
schema:
$ref: '#/definitions/Csr'
$ref: '#/definitions/CertificateSigningRequest'
security:
- api_token: []
tags:
Expand All @@ -3226,7 +3226,7 @@ paths:
consumes:
- application/json
description: >-
Update the CSR with a signed X.509 certificate and add it into the
Update the Certificate Signing Request with a signed X.509 certificate and add it into the
signing key credentials for the IdP.
parameters:
- in: path
Expand Down Expand Up @@ -7542,7 +7542,7 @@ definitions:
template_swa: '#/definitions/SwaApplication'
template_swa3field: '#/definitions/SwaThreeFieldApplication'
propertyName: name
Csr:
CertificateSigningRequest:
properties:
created:
format: date-time
Expand All @@ -7560,15 +7560,15 @@ definitions:
type: object
x-okta-tags:
- Application
CsrMetadata:
CertificateSigningRequestMetadata:
properties:
subject:
$ref: '#/definitions/CsrMetadataSubject'
$ref: '#/definitions/CertificateSigningRequestMetadataSubject'
subjectAltNames:
$ref: '#/definitions/CsrMetadataSubjectAltNames'
$ref: '#/definitions/CertificateSigningRequestMetadataSubjectAltNames'
x-okta-tags:
- Application
CsrMetadataSubject:
CertificateSigningRequestMetadataSubject:
properties:
commonName:
type: string
Expand All @@ -7584,7 +7584,7 @@ definitions:
type: string
x-okta-tags:
- Application
CsrMetadataSubjectAltNames:
CertificateSigningRequestMetadataSubjectAltNames:
properties:
dnsNames:
items:
Expand Down

0 comments on commit 922ac2a

Please sign in to comment.