aspera-cli 4.17.0 → 4.18.1

data/lib/aspera/cli/plugins/config.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-# cspell:ignore initdemo genkey pubkey asperasoft
+# cspell:ignore initdemo genkey pubkey asperasoft filelists
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/extended_value'
+require 'aspera/cli/special_values'
 require 'aspera/cli/version'
 require 'aspera/cli/formatter'
 require 'aspera/cli/info'
@@ -15,7 +16,7 @@ require 'aspera/transfer/spec'
 require 'aspera/keychain/encrypted_hash'
 require 'aspera/keychain/macos_security'
 require 'aspera/proxy_auto_config'
-require 'aspera/open_application'
+require 'aspera/environment'
 require 'aspera/persistency_action_once'
 require 'aspera/id_generator'
 require 'aspera/persistency_folder'
@@ -25,6 +26,7 @@ require 'aspera/rest'
 require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/oauth'
+require 'openssl'
 require 'open3'
 require 'date'
 require 'erb'
@@ -141,7 +143,7 @@ module Aspera
             Aspera.assert(!app_name.empty?)
             return File.join(module_family_folder, app_name)
           end
-        end # self
+        end
 
         def initialize(gem:, name:, help:, version:, **env)
           # we need to defer parsing of options until we have the config file, so we can use @extend with @preset
@@ -163,7 +165,6 @@ module Aspera
           @option_http_options = {}
           @ssl_warned_urls = []
           @option_cache_tokens = true
-          @proxy_credentials = nil
           @main_folder = nil
           @option_config_file = nil
           # store is used for ruby https
@@ -230,9 +231,10 @@ module Aspera
           options.declare(:silent_insecure, 'Issue a warning if certificate is ignored', values: :bool, handler: {o: self, m: :option_warn_insecure_cert}, default: :yes)
           options.declare(:cert_stores, 'List of folder with trusted certificates', types: [Array, String], handler: {o: self, m: :trusted_cert_locations})
           options.declare(:http_options, 'Options for HTTP/S socket', types: Hash, handler: {o: self, m: :option_http_options}, default: {})
+          options.declare(:http_proxy, 'URL for HTTP proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
           options.declare(:cache_tokens, 'Save and reuse OAuth tokens', values: :bool, handler: {o: self, m: :option_cache_tokens})
           options.declare(:fpac, 'Proxy auto configuration script')
-          options.declare(:proxy_credentials, 'HTTP proxy credentials (user and password)', types: Array)
+          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac. Array: user,password', types: Array)
           options.parse_options!
           @progress_bar = TransferProgress.new if options.get_option(:progress_bar)
           # Check SDK folder is set or not, for compatibility, we check in two places
@@ -255,20 +257,21 @@ module Aspera
           end
           pac_script = options.get_option(:fpac)
           # create PAC executor
-          @pac_exec = ProxyAutoConfig.new(pac_script).register_uri_generic unless pac_script.nil?
-          proxy_user_pass = options.get_option(:proxy_credentials)
-          if !proxy_user_pass.nil?
-            Aspera.assert(proxy_user_pass.length.eql?(2), exception_class: Cli::BadArgument){"proxy_credentials shall have two elements (#{proxy_user_pass.length})"}
-            @proxy_credentials = {user: proxy_user_pass[0], pass: proxy_user_pass[1]}
-            @pac_exec.proxy_user = @proxy_credentials[:user]
-            @pac_exec.proxy_pass = @proxy_credentials[:pass]
+          if !pac_script.nil?
+            @pac_exec = ProxyAutoConfig.new(pac_script).register_uri_generic
+            proxy_user_pass = options.get_option(:proxy_credentials)
+            if !proxy_user_pass.nil?
+              Aspera.assert(proxy_user_pass.length.eql?(2), exception_class: Cli::BadArgument){"proxy_credentials shall have two elements (#{proxy_user_pass.length})"}
+              @pac_exec.proxy_user = proxy_user_pass[0]
+              @pac_exec.proxy_pass = proxy_user_pass[1]
+            end
           end
           Rest.set_parameters(
             user_agent:  PROGRAM_NAME,
             session_cb:  lambda{|http_session|update_http_session(http_session)},
             progress_bar: @progress_bar)
           OAuth::Factory.instance.persist_mgr = persistency if @option_cache_tokens
-          Transfer::Parameters.file_list_folder = File.join(@main_folder, 'filelists') # cspell: disable-line
+          Transfer::Parameters.file_list_folder = File.join(@main_folder, 'filelists')
           RestErrorAnalyzer.instance.log_file = File.join(@main_folder, 'rest_exceptions.log')
           # register aspera REST call error handlers
           RestErrorsAspera.register_handlers
@@ -291,7 +294,7 @@ module Aspera
             Aspera.assert_type(path, String){'Expecting a String for certificate location'}
             paths_to_add = [path]
             Log.log.debug{"Adding cert location: #{path}"}
-            if path.eql?(ExtendedValue::DEF)
+            if path.eql?(SpecialValues::DEF)
               @certificate_store.set_default_paths
               paths_to_add = [
                 OpenSSL::X509::DEFAULT_CERT_DIR,
@@ -322,7 +325,7 @@ module Aspera
           locations = @certificate_paths
           if locations.nil?
             # compute default locations
-            self.trusted_cert_locations = ExtendedValue::DEF
+            self.trusted_cert_locations = SpecialValues::DEF
             locations = @certificate_paths
             # restore defaults
             @certificate_paths = @certificate_store = nil
@@ -330,6 +333,15 @@ module Aspera
           return locations
         end
 
+        def option_http_proxy
+          return ENV['http_proxy']
+        end
+
+        def option_http_proxy=(value)
+          URI.parse(value)
+          ENV['http_proxy'] = value
+        end
+
         def option_ignore_cert_host_port=(url_list)
           url_list.each do |url|
             uri = URI.parse(url)
@@ -365,10 +377,6 @@ module Aspera
           http_session.verify_mode = SELF_SIGNED_CERT if http_session.use_ssl? && ignore_cert?(http_session.address, http_session.port)
           http_session.cert_store = @certificate_store if @certificate_store
           Log.log.debug{"using cert store #{http_session.cert_store} (#{@certificate_store})"} unless http_session.cert_store.nil?
-          if @proxy_credentials
-            http_session.proxy_user = @proxy_credentials[:user]
-            http_session.proxy_pass = @proxy_credentials[:pass]
-          end
           @option_http_options.each do |k, v|
             method = "#{k}=".to_sym
             # check if accessor is a method of Net::HTTP
@@ -453,7 +461,7 @@ module Aspera
         def add_plugin_default_preset(plugin_name_sym)
           default_config_name = get_plugin_default_config_name(plugin_name_sym)
           Log.log.debug{"add_plugin_default_preset:#{plugin_name_sym}:#{default_config_name}"}
-          options.add_option_preset(preset_by_name(default_config_name), op: :unshift) unless default_config_name.nil?
+          options.add_option_preset(preset_by_name(default_config_name), 'default_plugin', override: false) unless default_config_name.nil?
           return nil
         end
 
@@ -539,12 +547,12 @@ module Aspera
 
         def option_preset=(value)
           case value
-          when String
-            options.add_option_preset(preset_by_name(value))
           when Hash
-            options.add_option_preset(value)
+            options.add_option_preset(value, 'set')
+          when String
+            options.add_option_preset(preset_by_name(value), 'set_by_name')
           else
-            raise 'Preset definition must be a String for name, or Hash for value'
+            raise 'Preset definition must be a String for preset name, or Hash for set of values'
           end
         end
 
@@ -613,18 +621,18 @@ module Aspera
           check_only = check_only.to_sym unless check_only.nil?
           found_apps = []
           my_self_plugin_sym = self.class.name.split('::').last.downcase.to_sym
-          PluginFactory.instance.plugins.each do |plugin_name_sym, plugin_info|
+          PluginFactory.instance.plugin_list.each do |plugin_name_sym|
             # no detection for internal plugin
             next if plugin_name_sym.eql?(my_self_plugin_sym)
             next if check_only && !check_only.eql?(plugin_name_sym)
             # load plugin class
-            require plugin_info[:require_stanza]
-            detect_plugin_class = PluginFactory.plugin_class(plugin_name_sym)
+            detect_plugin_class = PluginFactory.instance.plugin_class(plugin_name_sym)
             # requires detection method
             next unless detect_plugin_class.respond_to?(:detect)
             detection_info = nil
             begin
               Log.log.debug{"detecting #{plugin_name_sym} at #{app_url}"}
+              formatter.long_operation_running("#{plugin_name_sym}\r")
               detection_info = detect_plugin_class.detect(app_url)
             rescue OpenSSL::SSL::SSLError => e
               Log.log.warn(e.message)
@@ -639,7 +647,7 @@ module Aspera
             app_name = detect_plugin_class.respond_to?(:application_name) ? detect_plugin_class.application_name : detect_plugin_class.name.split('::').last
             # if there is a redirect, then the detector can override the url.
             found_apps.push({product: plugin_name_sym, name: app_name, url: app_url, version: 'unknown'}.merge(detection_info))
-          end # loop
+          end
           raise "No known application found at #{app_url}" if found_apps.empty?
           Aspera.assert(found_apps.all?{|a|a.keys.all?(Symbol)})
           return found_apps
@@ -678,7 +686,7 @@ module Aspera
               api_connect_cdn.call(operation: 'GET', subpath: file_url, save_to_file: File.join(folder_dest, filename))
               return Main.result_status("Downloaded: #{filename}")
             when :open
-              OpenApplication.instance.uri(one_link['href'])
+              Environment.instance.open_uri(one_link['href'])
               return Main.result_status("Opened: #{one_link['href']}")
             end
           end
@@ -726,7 +734,7 @@ module Aspera
           when :spec
             return {
               type:   :object_list,
-              data:   Transfer::Parameters.man_table,
+              data:   Transfer::Parameters.man_table(formatter),
               fields: [%w[name type], Transfer::Parameters::SUPPORTED_AGENTS_SHORT.map(&:to_s), %w[description]].flatten.freeze
             }
           when :errors
@@ -779,11 +787,11 @@ module Aspera
           when :set
             param_name = options.get_next_argument('parameter name')
             param_name = Manager.option_line_to_name(param_name)
-            param_value = options.get_next_argument('parameter value')
+            param_value = options.get_next_argument('parameter value', validation: nil)
             set_preset_key(name, param_name, param_value)
             return Main.result_nothing
           when :initialize
-            config_value = options.get_next_argument('extended value', type: Hash)
+            config_value = options.get_next_argument('extended value', validation: Hash)
             if @config_presets.key?(name)
               Log.log.warn{"configuration already exists: #{name}, overwriting"}
             end
@@ -791,16 +799,16 @@ module Aspera
             return Main.result_status("Modified: #{@option_config_file}")
           when :update
             #  get unprocessed options
-            unprocessed_options = options.get_options_table
+            unprocessed_options = options.unprocessed_options_with_value
             Log.log.debug{"opts=#{unprocessed_options}"}
             @config_presets[name] ||= {}
             @config_presets[name].merge!(unprocessed_options)
             return Main.result_status("Updated: #{name}")
           when :ask
-            options.ask_missing_mandatory = :yes
+            options.ask_missing_mandatory = true
             @config_presets[name] ||= {}
-            options.get_next_argument('option names', expected: :multiple).each do |option_name|
-              option_value = options.get_interactive(:option, option_name)
+            options.get_next_argument('option names', multiple: true).each do |option_name|
+              option_value = options.get_interactive(option_name, option: true)
               @config_presets[name][option_name] = option_value
             end
             return Main.result_status("Updated: #{name}")
@@ -853,6 +861,7 @@ module Aspera
           wizard
           detect
           coffee
+          image
           ascp
           email_test
           smtp_settings
@@ -871,16 +880,16 @@ module Aspera
           when :preset # newer syntax
             return execute_preset
           when :open
-            OpenApplication.editor(@option_config_file.to_s)
+            Environment.open_editor(@option_config_file.to_s)
             return Main.result_nothing
           when :documentation
             section = options.get_next_argument('private key file path', mandatory: false)
             section = "##{section}" unless section.nil?
-            OpenApplication.instance.uri("#{@help}#{section}")
+            Environment.instance.open_uri("#{@help}#{section}")
             return Main.result_nothing
           when :genkey # generate new rsa key
             private_key_path = options.get_next_argument('private key file path')
-            private_key_length = options.get_next_argument('size in bits', mandatory: false, type: Integer, default: DEFAULT_PRIV_KEY_LENGTH)
+            private_key_length = options.get_next_argument('size in bits', mandatory: false, validation: Integer, default: DEFAULT_PRIV_KEY_LENGTH)
             self.class.generate_rsa_private_key(path: private_key_path, length: private_key_length)
             return Main.result_status("Generated #{private_key_length} bit RSA key: #{private_key_path}")
           when :pubkey # get pub key
@@ -900,7 +909,7 @@ module Aspera
               return Main.result_status(remote_chain.first.subject.to_a.find { |name, _, _| name == 'CN' }[1])
             end
           when :echo # display the content of a value given on command line
-            return Formatter.auto_type(options.get_next_argument('value'))
+            return Formatter.auto_type(options.get_next_argument('value', validation: nil))
           when :flush_tokens
             deleted_files = OAuth::Factory.instance.flush_tokens
             return {type: :value_list, data: deleted_files, name: 'file'}
@@ -908,20 +917,19 @@ module Aspera
             case options.get_next_command(%i[list create])
             when :list
               result = []
-              PluginFactory.instance.plugins.each do |name, info|
-                require info[:require_stanza]
-                plugin_klass = PluginFactory.plugin_class(name)
+              PluginFactory.instance.plugin_list.each do |name|
+                plugin_class = PluginFactory.instance.plugin_class(name)
                 result.push({
                   plugin: name,
-                  detect: Formatter.tick(plugin_klass.respond_to?(:detect)),
-                  wizard: Formatter.tick(plugin_klass.respond_to?(:wizard)),
-                  path:   info[:source]
+                  detect: Formatter.tick(plugin_class.respond_to?(:detect)),
+                  wizard: Formatter.tick(plugin_class.respond_to?(:wizard)),
+                  path:   PluginFactory.instance.plugin_source(name)
                 })
               end
               return {type: :object_list, data: result, fields: %w[plugin detect wizard path]}
             when :create
-              plugin_name = options.get_next_argument('name', expected: :single).downcase
-              destination_folder = options.get_next_argument('folder', expected: :single, mandatory: false) || File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME)
+              plugin_name = options.get_next_argument('name').downcase
+              destination_folder = options.get_next_argument('folder', mandatory: false) || File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME)
               plugin_file = File.join(destination_folder, "#{plugin_name}.rb")
               content = <<~END_OF_PLUGIN_CODE
                 require 'aspera/cli/plugin'
@@ -950,11 +958,9 @@ module Aspera
             } if action.eql?(:detect)
             return wizard_find(apps)
           when :coffee
-            if OpenApplication.instance.url_method.eql?(:text)
-              return Main.result_picture_in_terminal(options, Rest.new(base_url: COFFEE_IMAGE).read('')[:http].body)
-            end
-            OpenApplication.instance.uri(COFFEE_IMAGE)
-            return Main.result_nothing
+            return Main.result_image(COFFEE_IMAGE, formatter: formatter)
+          when :image
+            return Main.result_image(options.get_next_argument('image uri or blob'), formatter: formatter)
           when :ascp
             execute_action_ascp
           when :gem
@@ -1019,17 +1025,17 @@ module Aspera
             apps.first
           else
             formatter.display_status('Multiple applications detected, please select from:')
-            formatter.display_results({type: :object_list, data: apps, fields: %w[product url version]})
+            formatter.display_results(type: :object_list, data: apps, fields: %w[product url version])
             answer = options.prompt_user_input_in_list('product', apps.map{|a|a[:product]})
             apps.find{|a|a[:product].eql?(answer)}
           end
-          wiz_url = identification[:url]
           Log.log.debug{Log.dump(:identification, identification)}
+          wiz_url = identification[:url]
           formatter.display_status("Using: #{identification[:name]} at #{wiz_url}".bold)
           # set url for instantiation of plugin
-          options.add_option_preset({url: wiz_url})
+          options.add_option_preset({url: wiz_url}, 'wizard')
           # instantiate plugin: command line options will be known and wizard can be called
-          wiz_plugin_class = PluginFactory.plugin_class(identification[:product])
+          wiz_plugin_class = PluginFactory.instance.plugin_class(identification[:product])
           Aspera.assert(wiz_plugin_class.respond_to?(:wizard), exception_class: Cli::BadArgument) do
             "Detected: #{identification[:product]}, but this application has no wizard"
           end
@@ -1072,7 +1078,7 @@ module Aspera
           Log.log.debug{"wizard result: #{wizard_result}"}
           Aspera.assert(WIZARD_RESULT_KEYS.eql?(wizard_result.keys.sort)){"missing or extra keys in wizard result: #{wizard_result.keys}"}
           # get preset name from user or default
-          wiz_preset_name = options.get_option(:id)
+          wiz_preset_name = nil
           if wiz_preset_name.nil?
             elements = [
               identification[:product],
@@ -1198,7 +1204,7 @@ module Aspera
             return default_config_name
           end
           return nil
-        end # get_plugin_default_config_name
+        end
 
         # TODO: delete: ALLOWED_KEYS = %i[password username description].freeze
         # @return [Hash] result of execution of vault command
@@ -1208,19 +1214,20 @@ module Aspera
           when :info
             return {type: :single_object, data: vault_info}
           when :list
-            return {type: :object_list, data: vault.list}
+            return {type: :object_list, data: vault.list, fields: %w(label url username password description)}
           when :show
             return {type: :single_object, data: vault.get(label: options.get_next_argument('label'))}
           when :create
-            label = options.get_next_argument('label', type: String)
-            info = options.get_next_argument('info', type: Hash)
+            label = options.get_next_argument('label', validation: String)
+            info = options.get_next_argument('info', validation: Hash)
             info = info.symbolize_keys
             info[:label] = label
             vault.set(info)
             return Main.result_status('Password added')
           when :delete
-            vault.delete(label: options.get_next_argument('label'))
-            return Main.result_status('Password deleted')
+            label_to_delete = options.get_next_argument('label')
+            vault.delete(label: label_to_delete)
+            return Main.result_status("Entry deleted: #{label_to_delete}")
           when :password
             Aspera.assert(vault.respond_to?(:password=)){'Vault does not support password change'}
             new_password = options.get_next_argument('new_password')
@@ -1264,7 +1271,7 @@ module Aspera
                 info[:password])
             when 'system'
               case Environment.os
-              when Environment::OS_X
+              when Environment::OS_MACOS
                 @vault = Keychain::MacosSystem.new(info[:name], info[:password])
               else
                 raise 'not implemented for this OS'

data/lib/aspera/cli/plugins/console.rb

@@ -18,7 +18,10 @@ module Aspera
               next unless base_url.start_with?('https://')
               api = Rest.new(base_url: base_url, redirect_max: 2)
               test_endpoint = 'login'
-              test_page = api.call(operation: 'GET', subpath: test_endpoint, url_params: {local: true})
+              test_page = api.call(
+                operation: 'GET',
+                subpath:   test_endpoint,
+                query:     {local: true})
               next unless test_page[:http].body.include?('Aspera Console')
               version = 'unknown'
               if (m = test_page[:http].body.match(/\(v([1-9]\..*)\)/))
@@ -102,7 +105,7 @@ module Aspera
             end
           end
         end
-      end # Console
-    end # Plugins
-  end # Cli
-end # Aspera
+      end
+    end
+  end
+end

data/lib/aspera/cli/plugins/faspex.rb

@@ -5,11 +5,12 @@ require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/plugins/node'
 require 'aspera/cli/plugins/config'
 require 'aspera/cli/extended_value'
+require 'aspera/cli/special_values'
 require 'aspera/cli/transfer_agent'
 require 'aspera/transfer/uri'
 require 'aspera/transfer/spec'
 require 'aspera/persistency_action_once'
-require 'aspera/open_application'
+require 'aspera/environment'
 require 'aspera/nagios'
 require 'aspera/id_generator'
 require 'aspera/log'
@@ -179,7 +180,11 @@ module Aspera
           loop do
             # get a batch of package information
             # order: first batch is latest packages, and then in a batch ids are increasing
-            atom_xml = api_v3.call(operation: 'GET', subpath: "#{mailbox}.atom", headers: {'Accept' => 'application/xml'}, url_params: mailbox_query)[:http].body
+            atom_xml = api_v3.call(
+              operation: 'GET',
+              subpath:   "#{mailbox}.atom",
+              headers:   {'Accept' => 'application/xml'},
+              query:     mailbox_query)[:http].body
             box_data = XmlSimple.xml_in(atom_xml, {'ForceArray' => %w[entry field link to]})
             Log.log.debug{Log.dump(:box_data, box_data)}
             items = box_data.key?('entry') ? box_data['entry'] : []
@@ -246,8 +251,9 @@ module Aspera
           package_creation_data = api_public_link.call(
             operation:   'POST',
             subpath:     create_path,
-            json_params: package_create_params,
-            headers:     {'Accept' => 'text/javascript'})[:http].body
+            headers:     {'Accept' => 'text/javascript'},
+            body:        package_create_params,
+            body_type:   :json)[:http].body
           # get arguments of function call
           package_creation_data.delete!("\n") # one line
           package_creation_data.gsub!(/^[^"]+\("\{/, '{') # delete header
@@ -308,8 +314,9 @@ module Aspera
                 pkg_created = api_v3.call(
                   operation:   'POST',
                   subpath:     'send',
-                  json_params: package_create_params,
-                  headers:     {'Accept' => 'application/json'}
+                  headers:     {'Accept' => 'application/json'},
+                  body:        package_create_params,
+                  body_type:   :json
                 )[:data]
                 if first_source.key?('id')
                   # no transfer spec if remote source: handled by faspex
@@ -347,9 +354,9 @@ module Aspera
                 delivery_id = instance_identifier
                 raise 'empty id' if delivery_id.empty?
                 recipient = options.get_option(:recipient)
-                if delivery_id.eql?(ExtendedValue::ALL)
+                if delivery_id.eql?(SpecialValues::ALL)
                   pkg_id_uri = mailbox_filtered_entries.map{|i|{id: i[PACKAGE_MATCH_FIELD], uri: self.class.get_fasp_uri_from_entry(i, raise_no_link: false)}}
-                elsif delivery_id.eql?(ExtendedValue::INIT)
+                elsif delivery_id.eql?(SpecialValues::INIT)
                   Aspera.assert(skip_ids_persistency){'Only with option once_only'}
                   skip_ids_persistency.data.clear.concat(mailbox_filtered_entries.map{|i|{id: i[PACKAGE_MATCH_FIELD]}})
                   skip_ids_persistency.save
@@ -380,18 +387,18 @@ module Aspera
                 api_public_link = Rest.new(base_url: link_data[:base_url])
                 package_creation_data = api_public_link.call(
                   operation: 'GET',
-                  subpath: link_data[:subpath],
-                  url_params: {passcode: link_data[:query]['passcode']},
-                  headers: {'Accept' => 'application/xml'})
+                  subpath:   link_data[:subpath],
+                  headers:   {'Accept' => 'application/xml'},
+                  query:     {passcode: link_data[:query]['passcode']})
                 if !package_creation_data[:http].body.start_with?('<?xml ')
-                  OpenApplication.instance.uri(link_url)
+                  Environment.instance.open_uri(link_url)
                   raise Cli::Error, 'Unexpected response: package not found ?'
                 end
                 package_entry = XmlSimple.xml_in(package_creation_data[:http].body, {'ForceArray' => false})
                 Log.log.debug{Log.dump(:package_entry, package_entry)}
                 transfer_uri = self.class.get_fasp_uri_from_entry(package_entry)
                 pkg_id_uri = [{id: package_entry['id'], uri: transfer_uri}]
-              end # public link
+              end
               # prune packages already downloaded
               # TODO : remove ids from skip not present in inbox to avoid growing too big
               # skip_ids_data.select!{|id|pkg_id_uri.select{|p|p[:id].eql?(id)}}
@@ -411,10 +418,12 @@ module Aspera
                     xml_payload =
                       %Q(<?xml version="1.0" encoding="UTF-8"?><url-list xmlns="http://schemas.asperasoft.com/xml/url-list"><url href="#{sanitized}"/></url-list>)
                     transfer_spec['token'] = api_v3.call(
-                      operation:        'POST',
-                      subpath:          'issue-token?direction=down',
-                      headers:          {'Accept' => 'text/plain', 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
-                      text_body_params: xml_payload)[:http].body
+                      operation:  'POST',
+                      subpath:    'issue-token',
+                      headers:    {'Accept' => 'text/plain', 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
+                      query:      {'direction' => 'down'},
+                      body:       xml_payload,
+                      body_type:  :text)[:http].body
                   end
                   transfer_spec['direction'] = Transfer::Spec::DIRECTION_RECEIVE
                   statuses = transfer.start(transfer_spec)
@@ -502,9 +511,9 @@ module Aspera
           when :address_book
             result = api_v3.call(
               operation: 'GET',
-              subpath: 'address-book',
-              headers: {'Accept' => 'application/json'},
-              url_params: {'format' => 'json', 'count' => 100_000}
+              subpath:   'address-book',
+              headers:   {'Accept' => 'application/json'},
+              query:     {'format' => 'json', 'count' => 100_000}
             )[:data]
             formatter.display_status("users: #{result['itemsPerPage']}/#{result['totalResults']}, start:#{result['startIndex']}")
             users = result['entry']
@@ -526,9 +535,9 @@ module Aspera
             login_meths = api_v3.call(operation: 'GET', subpath: 'login/new', headers: {'Accept' => 'application/xrds+xml'})[:http].body
             login_methods = XmlSimple.xml_in(login_meths, {'ForceArray' => false})
             return {type: :object_list, data: login_methods['XRD']['Service']}
-          end # command
+          end
         end
       end
     end
-  end # Cli
-end # Aspera
+  end
+end