Add kwarg forwarding to #authenticate [🚧 TODO: split off type kwarg]

Author: nevans

lib/net/smtp.rb

@@ -862,6 +862,7 @@ def open_message_stream(from_addr, *to_addrs, &block)   # :yield: stream
     DEFAULT_AUTH_TYPE = :plain
 
     # call-seq:
+    #   authenticate(username, secret, type: DEFAULT_AUTH_TYPE, **, &)
     #   authenticate(username, secret, type = DEFAULT_AUTH_TYPE, **, &)
     #
     # Authenticates with the server, using the "AUTH" command.
@@ -871,17 +872,18 @@ def open_message_stream(from_addr, *to_addrs, &block)   # :yield: stream
     # All arguments—other than +type+—are forwarded to the authenticator.
     # Different authenticators may interpret the +username+ and +secret+
     # arguments differently.
-    def authenticate(user, secret, authtype = DEFAULT_AUTH_TYPE)
-      check_auth_args authtype, user, secret
+    def authenticate(user, secret, typearg = nil, type: nil, **kwargs, &block)
+      authtype = type || typearg || DEFAULT_AUTH_TYPE
+      check_auth_args(authtype, user, secret, **kwargs)
       authenticator = Authenticator.auth_class(authtype).new(self)
-      critical { authenticator.auth(user, secret) }
+      critical { authenticator.auth(user, secret, **kwargs) }
     end
 
     private
 
-    def check_auth_args(type, *args, **kwargs)
-      return unless type || args.any? || kwargs.any?
-      type ||= DEFAULT_AUTH_TYPE
+    def check_auth_args(type_arg = nil, *args, type: nil, **kwargs)
+      return unless type_arg || type || args.any? || kwargs.any?
+      type ||= type_arg || DEFAULT_AUTH_TYPE
       if (klass = Authenticator.auth_class(type))
         klass.check_args(*args, **kwargs)
       else