OKTA-720638: Fix OASv3 spec - unable to access IdP links (#1519)

* OKTA-720638: Fix OASv3 spec - unable to access IdP links * Updated revision in pom.xml files
okta · Jun 24, 2024 · 12fcfe1 · 12fcfe1
1 parent 9878b82
commit 12fcfe1
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 13 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-sdk-api</artifactId>

diff --git a/api/src/main/java/com/okta/sdk/helper/PaginationUtil.java b/api/src/main/java/com/okta/sdk/helper/PaginationUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2024-Present Okta, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.okta.sdk.helper;
 
 import com.okta.commons.lang.Assert;

diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-sdk-coverage</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-sdk-examples</artifactId>

diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-examples</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>okta-sdk-impl</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.okta.sdk</groupId>
         <artifactId>okta-sdk-root</artifactId>
-        <version>17.0.1-SNAPSHOT</version>
+        <version>18.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy b/integration-tests/src/test/groovy/com/okta/sdk/tests/it/IdpIT.groovy
@@ -141,6 +141,13 @@ class IdpIT extends ITSupport {
         // retrieve
         IdentityProvider retrievedIdp = identityProviderApi.getIdentityProvider(createdIdp.getId())
         assertThat(retrievedIdp.getId(), equalTo(createdIdp.getId()))
+        assertThat(retrievedIdp.getLinks(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getAuthorize(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getAuthorize().getHints(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getAuthorize().getHref(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getClientRedirectUri(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getClientRedirectUri().getHints(), notNullValue())
+        assertThat(retrievedIdp.getLinks().getClientRedirectUri().getHref(), notNullValue())
 
         // update
         String newName = "java-sdk-it-" + UUID.randomUUID().toString()

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>com.okta.sdk</groupId>
     <artifactId>okta-sdk-root</artifactId>
-    <version>17.0.1-SNAPSHOT</version>
+    <version>18.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Okta Java SDK</name>
@@ -68,12 +68,12 @@
             <dependency>
                 <groupId>com.okta.sdk</groupId>
                 <artifactId>okta-sdk-api</artifactId>
-                <version>17.0.1-SNAPSHOT</version>
+                <version>18.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.okta.sdk</groupId>
                 <artifactId>okta-sdk-impl</artifactId>
-                <version>17.0.1-SNAPSHOT</version>
+                <version>18.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Other Okta Projects -->
@@ -103,14 +103,14 @@
             <dependency>
                 <groupId>com.okta.sdk</groupId>
                 <artifactId>okta-sdk-integration-tests</artifactId>
-                <version>17.0.1-SNAPSHOT</version>
+                <version>18.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Examples -->
             <dependency>
                 <groupId>com.okta.sdk</groupId>
                 <artifactId>okta-sdk-examples-quickstart</artifactId>
-                <version>17.0.1-SNAPSHOT</version>
+                <version>18.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Logging -->

diff --git a/src/swagger/api.yaml b/src/swagger/api.yaml
@@ -26055,8 +26055,42 @@ components:
           $ref: '#/components/schemas/IdentityProviderType'
         _links:
           type: object
-          additionalProperties:
-              $ref: '#/components/schemas/HrefObjectSelfLink'
+          additionalProperties: true
+          allOf:
+            - $ref: '#/components/schemas/LinksSelf'
+            - properties:
+                acs:
+                  description: SAML 2.0 Assertion Consumer Service URL for the Okta SP
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                authorize:
+                  description: OAuth 2.0 authorization endpoint for the IdP OAuth 2.0 Authorization Code flow
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                clientRedirectUri:
+                  description: Redirect URI for the OAuth 2.0 Authorization Code flow
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                metadata:
+                  description: 'Federation metadata document for the IdP (for example: SAML 2.0 Metadata)'
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                users:
+                  description: IdP users
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                deactivate:
+                  description: Deactivate IdP
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                activate:
+                  description: Activate IdP
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
+                keys:
+                  description: IdP keys
+                  allOf:
+                    - $ref: '#/components/schemas/HrefObject'
     IdentityProviderApplicationUser:
       type: object
       properties: