lib/manageiq/api/client/authentication.rb in manageiq-api-client-0.3.7 vs lib/manageiq/api/client/authentication.rb in manageiq-api-client-0.4.0

- old
+ new

@@ -4,36 +4,37 @@ class Authentication attr_reader :user attr_reader :password attr_reader :token attr_reader :miqtoken + attr_reader :bearer_token attr_reader :group DEFAULTS = { :user => "admin", :password => "smartvm" }.freeze - CUSTOM_INSPECT_EXCLUSIONS = [:@password].freeze + CUSTOM_INSPECT_EXCLUSIONS = %i[@password @token @miqtoken @bearer_token].freeze include CustomInspectMixin def initialize(options = {}) @user, @password = fetch_credentials(options) - @token, @miqtoken, @group = options.values_at(:token, :miqtoken, :group) + @token, @miqtoken, @bearer_token, @group = options.values_at(:token, :miqtoken, :bearer_token, :group) - unless token || miqtoken + unless token || miqtoken || bearer_token raise "Must specify both a user and a password" if user.blank? || password.blank? end end def self.auth_options_specified?(options) - options.slice(:user, :password, :token, :miqtoken, :group).present? + options.slice(:user, :password, :token, :miqtoken, :bearer_token, :group).present? end private def fetch_credentials(options) - if options.slice(:user, :password, :token, :miqtoken).blank? + if options.slice(:user, :password, :token, :miqtoken, :bearer_token).blank? [DEFAULTS[:user], DEFAULTS[:password]] else [options[:user], options[:password]] end end