feat(api): make redirect_uri optional (#165)

Author: stainless-bot

finch-java-core/src/main/kotlin/com/tryfinch/api/models/AccessTokenCreateParams.kt

@@ -17,29 +17,29 @@ import java.util.Optional
 class AccessTokenCreateParams
 constructor(
     private val code: String,
-    private val redirectUri: String,
     private val clientId: String?,
     private val clientSecret: String?,
+    private val redirectUri: String?,
     private val additionalQueryParams: Map<String, List<String>>,
     private val additionalHeaders: Map<String, List<String>>,
     private val additionalBodyProperties: Map<String, JsonValue>,
 ) {
 
     fun code(): String = code
 
-    fun redirectUri(): String = redirectUri
-
     fun clientId(): Optional<String> = Optional.ofNullable(clientId)
 
     fun clientSecret(): Optional<String> = Optional.ofNullable(clientSecret)
 
+    fun redirectUri(): Optional<String> = Optional.ofNullable(redirectUri)
+
     @JvmSynthetic
     internal fun getBody(): AccessTokenCreateBody {
         return AccessTokenCreateBody(
             code,
-            redirectUri,
             clientId,
             clientSecret,
+            redirectUri,
             additionalBodyProperties,
         )
     }
@@ -53,22 +53,22 @@ constructor(
     class AccessTokenCreateBody
     internal constructor(
         private val code: String?,
-        private val redirectUri: String?,
         private val clientId: String?,
         private val clientSecret: String?,
+        private val redirectUri: String?,
         private val additionalProperties: Map<String, JsonValue>,
     ) {
 
         private var hashCode: Int = 0
 
         @JsonProperty("code") fun code(): String? = code
 
-        @JsonProperty("redirect_uri") fun redirectUri(): String? = redirectUri
-
         @JsonProperty("client_id") fun clientId(): String? = clientId
 
         @JsonProperty("client_secret") fun clientSecret(): String? = clientSecret
 
+        @JsonProperty("redirect_uri") fun redirectUri(): String? = redirectUri
+
         @JsonAnyGetter
         @ExcludeMissing
         fun _additionalProperties(): Map<String, JsonValue> = additionalProperties
@@ -82,9 +82,9 @@ constructor(
 
             return other is AccessTokenCreateBody &&
                 this.code == other.code &&
-                this.redirectUri == other.redirectUri &&
                 this.clientId == other.clientId &&
                 this.clientSecret == other.clientSecret &&
+                this.redirectUri == other.redirectUri &&
                 this.additionalProperties == other.additionalProperties
         }
 
@@ -93,17 +93,17 @@ constructor(
                 hashCode =
                     Objects.hash(
                         code,
-                        redirectUri,
                         clientId,
                         clientSecret,
+                        redirectUri,
                         additionalProperties,
                     )
             }
             return hashCode
         }
 
         override fun toString() =
-            "AccessTokenCreateBody{code=$code, redirectUri=$redirectUri, clientId=$clientId, clientSecret=$clientSecret, additionalProperties=$additionalProperties}"
+            "AccessTokenCreateBody{code=$code, clientId=$clientId, clientSecret=$clientSecret, redirectUri=$redirectUri, additionalProperties=$additionalProperties}"
 
         companion object {
 
@@ -113,31 +113,31 @@ constructor(
         class Builder {
 
             private var code: String? = null
-            private var redirectUri: String? = null
             private var clientId: String? = null
             private var clientSecret: String? = null
+            private var redirectUri: String? = null
             private var additionalProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
             @JvmSynthetic
             internal fun from(accessTokenCreateBody: AccessTokenCreateBody) = apply {
                 this.code = accessTokenCreateBody.code
-                this.redirectUri = accessTokenCreateBody.redirectUri
                 this.clientId = accessTokenCreateBody.clientId
                 this.clientSecret = accessTokenCreateBody.clientSecret
+                this.redirectUri = accessTokenCreateBody.redirectUri
                 additionalProperties(accessTokenCreateBody.additionalProperties)
             }
 
             @JsonProperty("code") fun code(code: String) = apply { this.code = code }
 
-            @JsonProperty("redirect_uri")
-            fun redirectUri(redirectUri: String) = apply { this.redirectUri = redirectUri }
-
             @JsonProperty("client_id")
             fun clientId(clientId: String) = apply { this.clientId = clientId }
 
             @JsonProperty("client_secret")
             fun clientSecret(clientSecret: String) = apply { this.clientSecret = clientSecret }
 
+            @JsonProperty("redirect_uri")
+            fun redirectUri(redirectUri: String) = apply { this.redirectUri = redirectUri }
+
             fun additionalProperties(additionalProperties: Map<String, JsonValue>) = apply {
                 this.additionalProperties.clear()
                 this.additionalProperties.putAll(additionalProperties)
@@ -155,9 +155,9 @@ constructor(
             fun build(): AccessTokenCreateBody =
                 AccessTokenCreateBody(
                     checkNotNull(code) { "`code` is required but was not set" },
-                    checkNotNull(redirectUri) { "`redirectUri` is required but was not set" },
                     clientId,
                     clientSecret,
+                    redirectUri,
                     additionalProperties.toUnmodifiable(),
                 )
         }
@@ -176,9 +176,9 @@ constructor(
 
         return other is AccessTokenCreateParams &&
             this.code == other.code &&
-            this.redirectUri == other.redirectUri &&
             this.clientId == other.clientId &&
             this.clientSecret == other.clientSecret &&
+            this.redirectUri == other.redirectUri &&
             this.additionalQueryParams == other.additionalQueryParams &&
             this.additionalHeaders == other.additionalHeaders &&
             this.additionalBodyProperties == other.additionalBodyProperties
@@ -187,17 +187,17 @@ constructor(
     override fun hashCode(): Int {
         return Objects.hash(
             code,
-            redirectUri,
             clientId,
             clientSecret,
+            redirectUri,
             additionalQueryParams,
             additionalHeaders,
             additionalBodyProperties,
         )
     }
 
     override fun toString() =
-        "AccessTokenCreateParams{code=$code, redirectUri=$redirectUri, clientId=$clientId, clientSecret=$clientSecret, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}"
+        "AccessTokenCreateParams{code=$code, clientId=$clientId, clientSecret=$clientSecret, redirectUri=$redirectUri, additionalQueryParams=$additionalQueryParams, additionalHeaders=$additionalHeaders, additionalBodyProperties=$additionalBodyProperties}"
 
     fun toBuilder() = Builder().from(this)
 
@@ -210,32 +210,32 @@ constructor(
     class Builder {
 
         private var code: String? = null
-        private var redirectUri: String? = null
         private var clientId: String? = null
         private var clientSecret: String? = null
+        private var redirectUri: String? = null
         private var additionalQueryParams: MutableMap<String, MutableList<String>> = mutableMapOf()
         private var additionalHeaders: MutableMap<String, MutableList<String>> = mutableMapOf()
         private var additionalBodyProperties: MutableMap<String, JsonValue> = mutableMapOf()
 
         @JvmSynthetic
         internal fun from(accessTokenCreateParams: AccessTokenCreateParams) = apply {
             this.code = accessTokenCreateParams.code
-            this.redirectUri = accessTokenCreateParams.redirectUri
             this.clientId = accessTokenCreateParams.clientId
             this.clientSecret = accessTokenCreateParams.clientSecret
+            this.redirectUri = accessTokenCreateParams.redirectUri
             additionalQueryParams(accessTokenCreateParams.additionalQueryParams)
             additionalHeaders(accessTokenCreateParams.additionalHeaders)
             additionalBodyProperties(accessTokenCreateParams.additionalBodyProperties)
         }
 
         fun code(code: String) = apply { this.code = code }
 
-        fun redirectUri(redirectUri: String) = apply { this.redirectUri = redirectUri }
-
         fun clientId(clientId: String) = apply { this.clientId = clientId }
 
         fun clientSecret(clientSecret: String) = apply { this.clientSecret = clientSecret }
 
+        fun redirectUri(redirectUri: String) = apply { this.redirectUri = redirectUri }
+
         fun additionalQueryParams(additionalQueryParams: Map<String, List<String>>) = apply {
             this.additionalQueryParams.clear()
             putAllQueryParams(additionalQueryParams)
@@ -293,9 +293,9 @@ constructor(
         fun build(): AccessTokenCreateParams =
             AccessTokenCreateParams(
                 checkNotNull(code) { "`code` is required but was not set" },
-                checkNotNull(redirectUri) { "`redirectUri` is required but was not set" },
                 clientId,
                 clientSecret,
+                redirectUri,
                 additionalQueryParams.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
                 additionalHeaders.mapValues { it.value.toUnmodifiable() }.toUnmodifiable(),
                 additionalBodyProperties.toUnmodifiable(),

finch-java-core/src/test/kotlin/com/tryfinch/api/models/AccessTokenCreateParamsTest.kt

@@ -12,9 +12,9 @@ class AccessTokenCreateParamsTest {
     fun createAccessTokenCreateParams() {
         AccessTokenCreateParams.builder()
             .code("<your_authorization_code>")
-            .redirectUri("https://example.com")
             .clientId("<your_client_id>")
             .clientSecret("<your_client_secret>")
+            .redirectUri("https://example.com")
             .build()
     }
 
@@ -23,28 +23,23 @@ class AccessTokenCreateParamsTest {
         val params =
             AccessTokenCreateParams.builder()
                 .code("<your_authorization_code>")
-                .redirectUri("https://example.com")
                 .clientId("<your_client_id>")
                 .clientSecret("<your_client_secret>")
+                .redirectUri("https://example.com")
                 .build()
         val body = params.getBody()
         assertThat(body).isNotNull
         assertThat(body.code()).isEqualTo("<your_authorization_code>")
-        assertThat(body.redirectUri()).isEqualTo("https://example.com")
         assertThat(body.clientId()).isEqualTo("<your_client_id>")
         assertThat(body.clientSecret()).isEqualTo("<your_client_secret>")
+        assertThat(body.redirectUri()).isEqualTo("https://example.com")
     }
 
     @Test
     fun getBodyWithoutOptionalFields() {
-        val params =
-            AccessTokenCreateParams.builder()
-                .code("<your_authorization_code>")
-                .redirectUri("https://example.com")
-                .build()
+        val params = AccessTokenCreateParams.builder().code("<your_authorization_code>").build()
         val body = params.getBody()
         assertThat(body).isNotNull
         assertThat(body.code()).isEqualTo("<your_authorization_code>")
-        assertThat(body.redirectUri()).isEqualTo("https://example.com")
     }
 }

finch-java-core/src/test/kotlin/com/tryfinch/api/services/blocking/AccessTokenServiceTest.kt

@@ -25,9 +25,9 @@ class AccessTokenServiceTest {
             accessTokenService.create(
                 AccessTokenCreateParams.builder()
                     .code("<your_authorization_code>")
-                    .redirectUri("https://example.com")
                     .clientId("<your_client_id>")
                     .clientSecret("<your_client_secret>")
+                    .redirectUri("https://example.com")
                     .build()
             )
         println(createAccessTokenResponse)