TW-4612: add authentication multi-credential support

Author: googsvg

.claude/settings.local.json

@@ -10,7 +10,9 @@
       "Bash(find:*)",
       "Bash(./gradlew clean build:*)",
       "Bash(java -version:*)",
-      "Bash(/usr/libexec/java_home:*)"
+      "Bash(/usr/libexec/java_home:*)",
+      "Bash(JAVA_HOME=/Users/gordan.o@nylas.com/Library/Java/JavaVirtualMachines/corretto-19.0.2/Contents/Home ./gradlew test:*)",
+      "Bash(JAVA_HOME=/Users/gordan.o@nylas.com/Library/Java/JavaVirtualMachines/corretto-19.0.2/Contents/Home ./gradlew:*)"
     ]
   }
 }

src/main/kotlin/com/nylas/models/Connector.kt

@@ -12,6 +12,11 @@ sealed class Connector(
    */
   @Json(name = "provider")
   val provider: AuthProvider,
+  /**
+   * The ID of the active credential for this connector (for multi-credential setups).
+   */
+  @Json(name = "active_credential_id")
+  open val activeCredentialId: String? = null,
 ) {
   /**
    * Class representing a Google connector creation request.
@@ -27,7 +32,12 @@ sealed class Connector(
      */
     @Json(name = "scope")
     val scope: List<String>? = null,
-  ) : Connector(AuthProvider.GOOGLE)
+    /**
+     * The ID of the active credential for this connector
+     */
+    @Json(name = "active_credential_id")
+    override val activeCredentialId: String? = null,
+  ) : Connector(AuthProvider.GOOGLE, activeCredentialId)
 
   /**
    * Class representing a Microsoft connector creation request.
@@ -43,7 +53,12 @@ sealed class Connector(
      */
     @Json(name = "scope")
     val scope: List<String>? = null,
-  ) : Connector(AuthProvider.MICROSOFT)
+    /**
+     * The ID of the active credential for this connector
+     */
+    @Json(name = "active_credential_id")
+    override val activeCredentialId: String? = null,
+  ) : Connector(AuthProvider.MICROSOFT, activeCredentialId)
 
   /**
    * Class representing an IMAP connector creation request.

src/main/kotlin/com/nylas/models/CreateCredentialRequest.kt

@@ -56,8 +56,28 @@ sealed class CreateCredentialRequest(
   ) : CreateCredentialRequest(name, credentialData, CredentialType.SERVICEACCOUNT)
 
   /**
-   * Class representing a request to create an override credential
+   * Class representing a request to create a connector credential.
+   * For multi-credential OAuth flows, provide clientId and clientSecret in credentialData.
+   * For other overrides, use extraProperties in credentialData.
    */
+  data class Connector(
+    /**
+     * Unique name of this credential
+     */
+    @Json(name = "name")
+    override val name: String,
+    /**
+     * Data that specifies the credential details (client_id/client_secret for OAuth, or extraProperties for overrides)
+     */
+    @Json(name = "credential_data")
+    override val credentialData: CredentialData.ConnectorOverride,
+  ) : CreateCredentialRequest(name, credentialData, CredentialType.CONNECTOR)
+
+  /**
+   * Alias for [Connector] to maintain backward compatibility.
+   * @deprecated Use [Connector] instead.
+   */
+  @Deprecated("Use Connector instead", ReplaceWith("Connector"))
   data class Override(
     /**
      * Unique name of this credential
@@ -77,6 +97,6 @@ sealed class CreateCredentialRequest(
       PolymorphicJsonAdapterFactory.of(CreateCredentialRequest::class.java, "credential_type")
         .withSubtype(Microsoft::class.java, CredentialType.ADMINCONSENT.value)
         .withSubtype(Google::class.java, CredentialType.SERVICEACCOUNT.value)
-        .withSubtype(Override::class.java, CredentialType.CONNECTOR.value)
+        .withSubtype(Connector::class.java, CredentialType.CONNECTOR.value)
   }
 }

src/main/kotlin/com/nylas/models/CreateGrantRequest.kt

@@ -26,6 +26,11 @@ data class CreateGrantRequest(
    */
   @Json(name = "scope")
   val scope: List<String>? = null,
+  /**
+   * The credential ID to use for authentication (for multi-credential setups).
+   */
+  @Json(name = "credential_id")
+  val credentialId: String? = null,
 ) {
   /**
    * Builder for [CreateGrantRequest].
@@ -38,6 +43,7 @@ data class CreateGrantRequest(
   ) {
     private var state: String? = null
     private var scopes: List<String>? = null
+    private var credentialId: String? = null
 
     /**
      * Set the state value to return to developer's website after authentication flow is completed.
@@ -53,10 +59,17 @@ data class CreateGrantRequest(
      */
     fun scopes(scopes: List<String>) = apply { this.scopes = scopes }
 
+    /**
+     * Set the credential ID to use for authentication (for multi-credential setups).
+     * @param credentialId The credential ID
+     * @return This builder
+     */
+    fun credentialId(credentialId: String) = apply { this.credentialId = credentialId }
+
     /**
      * Build the [CreateGrantRequest].
      * @return The built [CreateGrantRequest]
      */
-    fun build() = CreateGrantRequest(provider, settings, state, scopes)
+    fun build() = CreateGrantRequest(provider, settings, state, scopes, credentialId)
   }
 }

src/main/kotlin/com/nylas/models/CredentialData.kt

@@ -33,9 +33,15 @@ sealed class CredentialData(
   ) : CredentialData(extraProperties)
 
   /**
-   * Class representing additional data needed to create a credential for a Connector Override
+   * Class representing additional data needed to create a credential for a Connector Override.
+   * For multi-credential OAuth flows, provide clientId and clientSecret.
+   * For other overrides, use extraProperties.
    */
   data class ConnectorOverride(
-    override val extraProperties: Map<String, String>,
+    @Json(name = "client_id")
+    val clientId: String? = null,
+    @Json(name = "client_secret")
+    val clientSecret: String? = null,
+    override val extraProperties: Map<String, String>? = emptyMap(),
   ) : CredentialData(extraProperties)
 }

src/main/kotlin/com/nylas/models/Grant.kt

@@ -67,4 +67,9 @@ data class Grant(
    */
   @Json(name = "settings")
   val settings: Map<String, Any>? = null,
+  /**
+   * The credential ID associated with this grant (for multi-credential setups).
+   */
+  @Json(name = "credential_id")
+  val credentialId: String? = null,
 )

src/main/kotlin/com/nylas/models/UpdateConnectorRequest.kt

@@ -20,10 +20,16 @@ sealed class UpdateConnectorRequest {
      */
     @Json(name = "scope")
     val scope: List<String>? = null,
+    /**
+     * The ID of the active credential for this connector (for multi-credential setups)
+     */
+    @Json(name = "active_credential_id")
+    val activeCredentialId: String? = null,
   ) : UpdateConnectorRequest() {
     class Builder {
       private var settings: GoogleConnectorSettings? = null
       private var scope: List<String>? = null
+      private var activeCredentialId: String? = null
 
       /**
        * Set the Google OAuth provider credentials and settings
@@ -39,11 +45,18 @@ sealed class UpdateConnectorRequest {
        */
       fun scope(scope: List<String>) = apply { this.scope = scope }
 
+      /**
+       * Set the active credential ID for this connector
+       * @param activeCredentialId The active credential ID
+       * @return The builder
+       */
+      fun activeCredentialId(activeCredentialId: String) = apply { this.activeCredentialId = activeCredentialId }
+
       /**
        * Build the Google connector creation request
        * @return The Google connector creation request
        */
-      fun build() = Google(settings, scope)
+      fun build() = Google(settings, scope, activeCredentialId)
     }
   }
 
@@ -61,10 +74,16 @@ sealed class UpdateConnectorRequest {
      */
     @Json(name = "scope")
     val scope: List<String>? = null,
+    /**
+     * The ID of the active credential for this connector (for multi-credential setups)
+     */
+    @Json(name = "active_credential_id")
+    val activeCredentialId: String? = null,
   ) : UpdateConnectorRequest() {
     class Builder {
       private var settings: MicrosoftConnectorSettings? = null
       private var scope: List<String>? = null
+      private var activeCredentialId: String? = null
 
       /**
        * Set the Microsoft OAuth provider credentials and settings
@@ -80,11 +99,18 @@ sealed class UpdateConnectorRequest {
        */
       fun scope(scope: List<String>) = apply { this.scope = scope }
 
+      /**
+       * Set the active credential ID for this connector
+       * @param activeCredentialId The active credential ID
+       * @return The builder
+       */
+      fun activeCredentialId(activeCredentialId: String) = apply { this.activeCredentialId = activeCredentialId }
+
       /**
        * Build the Microsoft connector creation request
        * @return The Microsoft connector creation request
        */
-      fun build() = Microsoft(settings, scope)
+      fun build() = Microsoft(settings, scope, activeCredentialId)
     }
   }
 }

src/main/kotlin/com/nylas/models/UrlForAuthenticationConfig.kt

@@ -54,6 +54,12 @@ data class UrlForAuthenticationConfig(
    */
   @Json(name = "login_hint")
   val loginHint: String? = null,
+  /**
+   * The credential ID to use for authentication (for multi-credential setups).
+   * Allowed when response_type is "code".
+   */
+  @Json(name = "credential_id")
+  val credentialId: String? = null,
 ) {
   /**
    * Builder for [UrlForAuthenticationConfig].
@@ -71,6 +77,7 @@ data class UrlForAuthenticationConfig(
     private var includeGrantScopes: Boolean? = null
     private var state: String? = null
     private var loginHint: String? = null
+    private var credentialId: String? = null
 
     /**
      * Set the integration provider type that you already had set up with Nylas for this application.
@@ -124,6 +131,13 @@ data class UrlForAuthenticationConfig(
      */
     fun loginHint(loginHint: String) = apply { this.loginHint = loginHint }
 
+    /**
+     * Set the credential ID to use for authentication (for multi-credential setups).
+     * @param credentialId The credential ID.
+     * @return This builder.
+     */
+    fun credentialId(credentialId: String) = apply { this.credentialId = credentialId }
+
     /**
      * Build the [UrlForAuthenticationConfig].
      * @return The [UrlForAuthenticationConfig].
@@ -138,6 +152,7 @@ data class UrlForAuthenticationConfig(
       includeGrantScopes,
       state,
       loginHint,
+      credentialId,
     )
   }
 }

src/main/kotlin/com/nylas/util/CredentialDataAdapter.kt

@@ -122,22 +122,28 @@ class GoogleServiceAccountCredentialDataAdapter {
 class ConnectorOverrideCredentialDataAdapter {
   @FromJson
   fun fromJson(reader: JsonReader): CredentialData.ConnectorOverride {
+    var clientId: String? = null
+    var clientSecret: String? = null
     val extraProperties = mutableMapOf<String, String>()
 
     reader.beginObject()
     while (reader.hasNext()) {
-      val key = reader.nextName()
-      val value = reader.nextString()
-      extraProperties[key] = value
+      when (val key = reader.nextName()) {
+        "client_id" -> clientId = reader.nextString()
+        "client_secret" -> clientSecret = reader.nextString()
+        else -> extraProperties[key] = reader.nextString()
+      }
     }
     reader.endObject()
 
-    return CredentialData.ConnectorOverride(extraProperties)
+    return CredentialData.ConnectorOverride(clientId, clientSecret, extraProperties)
   }
 
   @ToJson
   fun toJson(writer: JsonWriter, value: CredentialData.ConnectorOverride?) {
     writer.beginObject()
+    value?.clientId?.let { writer.name("client_id").value(it) }
+    value?.clientSecret?.let { writer.name("client_secret").value(it) }
     value?.extraProperties?.forEach { (k, v) ->
       writer.name(k).value(v)
     }