🔒 Don't raise ArgumentError for overriding args

Instead of raising an exception, conflicting arguments are silently
ignored.  This allows more specific argument (like `authcid` or a
keyword argument) to be used like an override to more generic terms
(like `username` or a positional argument).  It should also simplify
using a single set of keyword credentials with multiple SASL mechanisms,
which could facilitate dynamically negotiating the mechanism, or
automatically retrying multiple acceptable mechanisms.

Author: nevans

lib/net/imap/sasl/oauthbearer_authenticator.rb

@@ -176,8 +176,6 @@ class OAuthBearerAuthenticator < OAuthAuthenticator
         def initialize(arg1 = nil, arg2 = nil, oauth2_token: nil, **args, &blk)
           username, oauth2_token_arg = arg2.nil? ? [nil, arg1] : [arg1, arg2]
           super(username: username, **args, &blk)
-          oauth2_token && oauth2_token_arg and
-            raise ArgumentError, "conflicting values for oauth2_token"
           @oauth2_token = oauth2_token || oauth2_token_arg or
             raise ArgumentError, "missing oauth2_token"
         end

lib/net/imap/sasl/plain_authenticator.rb

@@ -66,10 +66,6 @@ class Net::IMAP::SASL::PlainAuthenticator
   def initialize(user = nil, pass = nil,
                  authcid: nil,
                  username: nil, password: nil, authzid: nil, **)
-    [authcid, username, user].compact.count <= 1 or
-      raise ArgumentError, "conflicting values for username (authcid)"
-    [password, pass].compact.count <= 1 or
-      raise ArgumentError, "conflicting values for password"
     username ||= authcid || user or
       raise ArgumentError, "missing username (authcid)"
     password ||= pass or raise ArgumentError, "missing password"

lib/net/imap/sasl/scram_authenticator.rb

@@ -86,12 +86,8 @@ def initialize(username_arg = nil, password_arg = nil,
                        **options)
           @username = username || username_arg || authcid or
             raise ArgumentError, "missing username (authcid)"
-          [username, username_arg, authcid].compact.count == 1 or
-            raise ArgumentError, "conflicting values for username (authcid)"
           @password = password || password_arg or
             raise ArgumentError, "missing password"
-          [password, password_arg].compact.count == 1 or
-            raise ArgumentError, "conflicting values for password"
           @authzid = authzid
 
           @min_iterations = Integer min_iterations

lib/net/imap/sasl/xoauth2_authenticator.rb

@@ -73,10 +73,6 @@ def initialize(user = nil, token = nil, username: nil, oauth2_token: nil,
       raise ArgumentError, "missing username (authzid)"
     @oauth2_token = oauth2_token || token or
       raise ArgumentError, "missing oauth2_token"
-    [username, user].compact.count == 1 or
-      raise ArgumentError, "conflicting values for username"
-    [oauth2_token, token].compact.count == 1 or
-      raise ArgumentError, "conflicting values for oauth2_token"
     @done = false
   end