aspera-cli 4.25.1 → 4.25.3

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

@@ -36,6 +36,7 @@ require 'digest'
 require 'open3'
 require 'date'
 require 'erb'
+require 'net/http'
 
 module Aspera
   module Cli
@@ -107,11 +108,7 @@ module Aspera
           )
           options.parse_options!
           Log.log.debug{"#{Info::CMD_NAME} folder: #{@main_folder}"}
-          # Data persistency manager, created by config plugin, set for global object
-          context.persistency = PersistencyFolder.new(File.join(@main_folder, PERSISTENCY_FOLDER))
-          # Set folders for plugin lookup
-          Plugins::Factory.instance.add_lookup_folder(self.class.gem_plugins_folder)
-          Plugins::Factory.instance.add_lookup_folder(File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME))
+          setup_persistency_and_plugin_folders
           # Option to set config file
           options.declare(
             :config_file, 'Path to YAML file with preset configuration',
@@ -121,12 +118,7 @@ module Aspera
           options.parse_options!
           # Read config file (set @config_presets)
           read_config_file
-          # Add preset handler (needed for smtp)
-          ExtendedValue.instance.on(EXTEND_PRESET){ |v| preset_by_name(v)}
-          ExtendedValue.instance.on(EXTEND_VAULT){ |v| vault_value(v)}
-          ExtendedValue.instance.on(EXTEND_ARGS){ |v| options.args_as_extended(v)}
-          # Load defaults before it can be overridden
-          add_plugin_default_preset(CONF_GLOBAL_SYM)
+          setup_extended_value_handlers
           # Vault options
           options.declare(:secret, 'Secret for access keys')
           options.declare(:vault, 'Vault for secrets', allowed: Hash)
@@ -145,9 +137,8 @@ module Aspera
           options.declare(:sdk_url, 'Ascp: URL to get Aspera Transfer Executables', default: SpecialValues::DEF)
           options.parse_options!
           set_sdk_dir
-          options.declare(:ascp_path, 'Ascp: Path to ascp (or product with "product:")', handler: {o: Ascp::Installation.instance, m: :ascp_path}, default: "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{Ascp::Installation::FIRST_FOUND}")
           options.declare(:locations_url, 'Ascp: URL to get download locations of Aspera Transfer Daemon', handler: {o: Ascp::Installation.instance, m: :transferd_urls})
-          options.declare(:sdk_folder, 'Ascp: SDK installation folder path', handler: {o: Products::Transferd, m: :sdk_directory})
+          options.declare(:sdk_folder, 'Ascp: Path to folder with ascp (or product with "product:")', handler: {o: Products::Transferd, m: :sdk_directory})
           options.declare(:progress_bar, 'Display progress bar', allowed: Allowed::TYPES_BOOLEAN, default: Environment.terminal?)
           # Email options
           options.declare(:smtp, 'Email: SMTP configuration', allowed: Hash)
@@ -165,17 +156,39 @@ module Aspera
           options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', allowed: [Array, NilClass])
           options.parse_options!
           @progress_bar = TransferProgress.new if options.get_option(:progress_bar)
+          setup_pac_executor
+          setup_rest_and_transfer_runtime
+        end
+
+        private
+
+        def setup_persistency_and_plugin_folders
+          context.persistency = PersistencyFolder.new(File.join(@main_folder, PERSISTENCY_FOLDER))
+          Plugins::Factory.instance.add_lookup_folder(self.class.gem_plugins_folder)
+          Plugins::Factory.instance.add_lookup_folder(File.join(@main_folder, ASPERA_PLUGINS_FOLDERNAME))
+        end
+
+        def setup_extended_value_handlers
+          ExtendedValue.instance.on(EXTEND_PRESET){ |v| preset_by_name(v)}
+          ExtendedValue.instance.on(EXTEND_VAULT){ |v| vault_value(v)}
+          ExtendedValue.instance.on(EXTEND_ARGS){ |v| options.args_as_extended(v)}
+          add_plugin_default_preset(CONF_GLOBAL_SYM)
+        end
+
+        def setup_pac_executor
           pac_script = options.get_option(:fpac)
-          # Create PAC executor
-          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), type: 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
+          return unless pac_script
+
+          @pac_exec = ProxyAutoConfig.new(pac_script).register_uri_generic
+          proxy_user_pass = options.get_option(:proxy_credentials)
+          if proxy_user_pass
+            Aspera.assert(proxy_user_pass.length.eql?(2), type: 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
+
+        def setup_rest_and_transfer_runtime
           RestParameters.instance.user_agent = Info::CMD_NAME
           RestParameters.instance.progress_bar = @progress_bar
           RestParameters.instance.session_cb = lambda{ |http_session| update_http_session(http_session)}
@@ -197,12 +210,14 @@ module Aspera
           keys_to_delete.each{ |k| @option_http_options.delete(k)}
           OAuth::Factory.instance.persist_mgr = persistency if @option_cache_tokens
           OAuth::Web.additional_info = "#{Info::CMD_NAME} v#{Cli::VERSION}"
-          Transfer::Parameters.file_list_folder = File.join(@main_folder, 'filelists')
-          RestErrorAnalyzer.instance.log_file = File.join(@main_folder, 'rest_exceptions.log')
+          Transfer::Parameters.file_list_folder = File.join(@main_folder, FILE_LIST_FOLDER_NAME)
+          RestErrorAnalyzer.instance.log_file = File.join(@main_folder, REST_EXCEPTIONS_LOG_FILENAME)
           # Register aspera REST call error handlers
           RestErrorsAspera.register_handlers
         end
 
+        public
+
         attr_accessor :main_folder, :option_cache_tokens, :option_insecure, :option_warn_insecure_cert, :option_http_options
         attr_reader :option_ignore_cert_host_port, :progress_bar
 
@@ -307,10 +322,7 @@ module Aspera
             if @option_warn_insecure_cert
               base_url = "https://#{address}:#{port}"
               if !@ssl_warned_urls.include?(base_url)
-                formatter.display_message(
-                  :error,
-                  "#{Formatter::WARNING_FLASH} Ignoring certificate for: #{base_url}. Do not deactivate certificate verification in production."
-                )
+                Log.log.warn{"Ignoring certificate for: #{base_url}. Do not deactivate certificate verification in production."}
                 @ssl_warned_urls.push(base_url)
               end
             end
@@ -416,7 +428,7 @@ module Aspera
           raise Cli::Error, "Preset already exists: #{preset_name}  (use --override=yes or provide alternate name on command line)" \
             if !option_override && @config_presets.key?(preset_name)
           if option_default
-            formatter.display_status("Setting config preset as default for #{plugin_name}")
+            Log.log.info("Setting config preset as default for #{plugin_name}")
             @config_presets[CONF_PRESET_DEFAULTS][plugin_name.to_s] = preset_name
           end
           @config_presets[preset_name] = preset_values
@@ -439,7 +451,7 @@ module Aspera
             Log.log.warn{"overwriting value for #{param_name}: #{selected_preset[param_name]}"}
           end
           selected_preset[param_name] = param_value
-          formatter.display_status("Updated: #{preset}: #{param_name} <- #{param_value}")
+          Log.log.info("Updated: #{preset}: #{param_name} <- #{param_value}")
           nil
         end
 
@@ -553,62 +565,15 @@ module Aspera
           raise Cli::Error, e.to_s
         end
 
-        def execute_connect_action
-          command = options.get_next_command(%i[list info version])
-          if %i[info version].include?(command)
-            connect_id = options.get_next_argument('id or title')
-            one_res = Products::Connect.instance.versions.find{ |i| i['id'].eql?(connect_id) || i['title'].eql?(connect_id)}
-            raise Cli::BadIdentifier.new(:connect, connect_id) if one_res.nil?
-          end
-          case command
-          when :list
-            return Main.result_object_list(Products::Connect.instance.versions, fields: %w[id title version])
-          when :info
-            one_res.delete('links')
-            return Main.result_single_object(one_res)
-          when :version
-            all_links = one_res['links']
-            command = options.get_next_command(%i[list download open])
-            if %i[download open].include?(command)
-              link_title = options.get_next_argument('title or rel')
-              one_link = all_links.find{ |i| i['title'].eql?(link_title) || i['rel'].eql?(link_title)}
-              raise "no such value: #{link_title}" if one_link.nil?
-            end
-            case command
-            when :list
-              return Main.result_object_list(all_links)
-            when :download
-              archive_path = one_link['href']
-              save_to_path = File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), archive_path.gsub(%r{.*/}, ''))
-              Products::Connect.instance.cdn_api.call(operation: 'GET', subpath: archive_path, save_to_file: save_to_path)
-              return Main.result_status("Downloaded: #{save_to_path}")
-            when :open
-              Environment.instance.open_uri(one_link['href'])
-              return Main.result_status("Opened: #{one_link['href']}")
-            end
-          end
-          Aspera.error_unreachable_line
-        end
-
         def install_transfer_sdk
-          # Reset to default location, if older default was used
-          Products::Transferd.sdk_directory = self.class.default_app_main_folder(app_name: TRANSFERD_APP_NAME) if @sdk_default_location
           asked_version = options.get_next_argument('transferd version', mandatory: false)
           name, version, folder = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true), version: asked_version)
           return Main.result_status("Installed #{name} version #{version} in #{folder}")
         end
 
         def execute_action_ascp
-          command = options.get_next_command(%i[connect use show products info install spec schema errors])
+          command = options.get_next_command(%i[show products info install spec schema errors])
           case command
-          when :connect
-            return execute_connect_action
-          when :use
-            ascp_path = options.get_next_argument('path to ascp')
-            Ascp::Installation.instance.ascp_path = ascp_path
-            formatter.display_status("ascp version: #{Ascp::Installation.instance.get_ascp_version(ascp_path)}")
-            set_global_default(:ascp_path, ascp_path)
-            return Main.result_nothing
           when :show
             return Main.result_text(Ascp::Installation.instance.path(:ascp))
           when :info
@@ -622,15 +587,10 @@ module Aspera
             SecretHider::ADDITIONAL_KEYS_TO_HIDE.concat(DataRepository::ELEMENTS.map(&:to_s))
             return Main.result_single_object(data)
           when :products
-            command = options.get_next_command(%i[list use])
+            command = options.get_next_command(%i[list])
             case command
             when :list
               return Main.result_object_list(Ascp::Installation.instance.installed_products, fields: %w[name app_root])
-            when :use
-              default_product = options.get_next_argument('product name')
-              Ascp::Installation.instance.use_ascp_from_product(default_product)
-              set_global_default(:ascp_path, "#{Ascp::Installation::USE_PRODUCT_PREFIX}#{default_product}")
-              return Main.result_nothing
             end
           when :install
             return install_transfer_sdk
@@ -848,7 +808,7 @@ module Aspera
             file_url = options.get_next_argument('source URL').chomp
             file_dest = options.get_next_argument('file path', mandatory: false)
             file_dest = File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_url.gsub(%r{.*/}, '')) if file_dest.nil?
-            formatter.display_status("Downloading: #{file_url}")
+            Log.log.info("Downloading: #{file_url}")
             Rest.new(base_url: file_url).call(operation: 'GET', save_to_file: file_dest)
             return Main.result_status("Saved to: #{file_dest}")
           when :tokens
@@ -1047,8 +1007,7 @@ module Aspera
           return false if @config_checksum_on_disk.eql?(current_checksum)
           FileUtils.mkdir_p(@main_folder)
           Environment.restrict_file_access(@main_folder)
-          Log.log.info{"Writing #{@option_config_file}"}
-          formatter.display_status('Saving config file.')
+          Log.log.info{"Saving config file: #{@option_config_file}"}
           Environment.write_file_restricted(@option_config_file, force: true){@config_presets.to_yaml}
           @config_checksum_on_disk = current_checksum
           return true
@@ -1200,6 +1159,8 @@ module Aspera
         # Folder containing custom plugins in user's config folder
         ASPERA_PLUGINS_FOLDERNAME = 'plugins'
         PERSISTENCY_FOLDER = 'persist_store'
+        FILE_LIST_FOLDER_NAME = 'filelists'
+        REST_EXCEPTIONS_LOG_FILENAME = 'rest_exceptions.log'
         ASPERA = 'aspera'
         SERVER_COMMAND = 'server'
         TRANSFERD_APP_NAME = 'sdk'
@@ -1232,6 +1193,8 @@ module Aspera
           :CONF_PRESET_DEFAULTS,
           :CONF_PRESET_GLOBAL,
           :ASPERA_PLUGINS_FOLDERNAME,
+          :FILE_LIST_FOLDER_NAME,
+          :REST_EXCEPTIONS_LOG_FILENAME,
           :ASPERA,
           :DEMO_SERVER,
           :DEMO_PRESET,

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

@@ -20,9 +20,9 @@ module Aspera
           @plugins = {}
         end
 
-        # @return list of registered plugins
+        # @return [Array<Symbol>] Sorted list of registered plugins
         def plugin_list
-          @plugins.keys
+          @plugins.keys.sort
         end
 
         # add a folder to the list of folders to look for plugins

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

@@ -51,7 +51,7 @@ module Aspera
               http = api.call(
                 operation:        'POST',
                 headers:          {
-                  'Content-type' => Rest::MIME_TEXT,
+                  'Content-type' => Mime::TEXT,
                   'Accept'       => 'application/xrds+xml'
                 },
                 ret: :resp
@@ -254,7 +254,7 @@ module Aspera
           package_creation_data = api_public_link.call(
             operation:    'POST',
             subpath:      create_path,
-            content_type: Rest::MIME_JSON,
+            content_type: Mime::JSON,
             body:         package_create_params,
             headers:      {'Accept' => 'text/javascript'},
             ret:          :resp
@@ -418,9 +418,9 @@ module Aspera
                       operation:    'POST',
                       subpath:      'issue-token',
                       query:        {'direction' => 'down'},
-                      content_type: Rest::MIME_TEXT,
+                      content_type: Mime::TEXT,
                       body:         xml_payload,
-                      headers:      {'Accept' => Rest::MIME_TEXT, 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
+                      headers:      {'Accept' => Mime::TEXT, 'Content-Type' => 'application/vnd.aspera.url-list+xml'},
                       ret:          :resp
                     ).body
                   end

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

@@ -94,7 +94,7 @@ module Aspera
 
         def initialize(**_)
           super
-          options.declare(:box, "Package inbox, either shared inbox name or one of: #{Api::Faspex::API_LIST_MAILBOX_TYPES.join(', ')} or #{SpecialValues::ALL}", default: 'inbox')
+          options.declare(:box, "Package inbox, either shared inbox name or one of: #{Api::Faspex::API_LIST_MAILBOX_TYPES.join(', ')} or #{SpecialValues::ALL}", default: 'inbox_all')
           options.declare(:shared_folder, 'Send package with files from shared folder')
           options.declare(:group_type, 'Type of shared box', allowed: %i[shared_inboxes workgroups], default: :shared_inboxes)
           options.parse_options!
@@ -102,7 +102,7 @@ module Aspera
 
         def set_api
           # create an API object with the same options, but with a different subpath
-          @api_v5 = new_with_options(Api::Faspex)
+          @api_v5 = Api::Faspex.new(**Oauth.args_from_options(options))
           # in case user wants to use HTTPGW tell transfer agent how to get address
           transfer.httpgw_url_cb = lambda{@api_v5.read('account')['gateway_url']}
         end
@@ -118,7 +118,7 @@ module Aspera
             recipient_types = [recipient_types] unless recipient_types.is_a?(Array)
           end
           parameters['recipients'].map! do |recipient_data|
-            # if just a string, make a general lookup and build expected name/type hash
+            # If just a string, make a general lookup and build expected name/type hash
             if recipient_data.is_a?(String)
               matched = @api_v5.lookup_by_name('contacts', recipient_data, query: Rest.php_style({context: 'packages', type: recipient_types}))
               recipient_data = {
@@ -174,8 +174,8 @@ module Aspera
         # list all packages with optional filter
         def list_packages_with_filter(query: {})
           filter = options.get_next_argument('filter', mandatory: false, validation: Proc, default: ->(_x){true})
-          # translate box name to API prefix (with ending slash)
           box = options.get_option(:box)
+          # Translate box name to API prefix (with ending slash)
           entity =
             case box
             when SpecialValues::ALL then 'packages' # only admin can list all packages globally
@@ -236,17 +236,12 @@ module Aspera
           rescue Cli::BadArgument
             # paths is optional
           end
+          box = options.get_option(:box)
           download_params = {
-            type:          'received',
+            type:          Api::Faspex.box_type(box),
             transfer_type: Api::Faspex::TRANSFER_CONNECT
           }
-          box = options.get_option(:box)
-          case box
-          when /outbox/ then download_params[:type] = 'sent'
-          when *Api::Faspex::API_LIST_MAILBOX_TYPES then nil # nothing to do
-          else # shared inbox / workgroup
-            download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id']
-          end
+          download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id'] if !Api::Faspex::API_LIST_MAILBOX_TYPES.include?(box) && box != SpecialValues::ALL
           packages.each do |package|
             pkg_id = package['id']
             formatter.display_status("Receiving package #{pkg_id}")
@@ -255,9 +250,9 @@ module Aspera
               operation:    'POST',
               subpath:      "packages/#{pkg_id}/transfer_spec/download",
               query:        download_params,
-              content_type: Rest::MIME_JSON,
+              content_type: Mime::JSON,
               body:         param_file_list,
-              headers:      {'Accept' => Rest::MIME_JSON}
+              headers:      {'Accept' => Mime::JSON}
             )
             # delete flag for Connect Client
             transfer_spec.delete('authentication')
@@ -272,6 +267,56 @@ module Aspera
           return Main.result_transfer_multiple(result_transfer)
         end
 
+        def package_send
+          parameters = value_create_modify(command: :send)
+          # autofill recipient for public url
+          if @api_v5.pub_link_context&.key?('recipient_type') && !parameters.key?('recipients')
+            parameters['recipients'] = [{
+              name:           @api_v5.pub_link_context['name'],
+              recipient_type: @api_v5.pub_link_context['recipient_type']
+            }]
+          end
+          normalize_recipients(parameters)
+          # User specified content prot in tspec, but faspex requires in package creation
+          # `transfer_spec/upload` will set `content_protection`
+          if transfer.user_transfer_spec['content_protection'] && !parameters.key?('ear_enabled')
+            transfer.user_transfer_spec.delete('content_protection')
+            parameters['ear_enabled'] = true
+          end
+          package = @api_v5.create('packages', parameters)
+          shared_folder = options.get_option(:shared_folder)
+          if shared_folder.nil?
+            # send from local files
+            transfer_spec = @api_v5.create(
+              "packages/#{package['id']}/transfer_spec/upload",
+              {paths: transfer.source_list},
+              query: {transfer_type: Api::Faspex::TRANSFER_CONNECT}
+            )
+            # well, we asked a TS for connect, but we actually want a generic one
+            transfer_spec.delete('authentication')
+            return Main.result_transfer(transfer.start(transfer_spec))
+          else
+            # send from remote shared folder
+            if (m = Base.percent_selector(shared_folder))
+              shared_folder = lookup_entity_by_field(
+                api: @api_v5,
+                entity: 'shared_folders',
+                field: m[:field],
+                value: m[:value]
+              )['id']
+            end
+            transfer_request = {shared_folder_id: shared_folder, paths: transfer.source_list}
+            # start remote transfer and get first status
+            result = @api_v5.create("packages/#{package['id']}/remote_transfer", transfer_request)
+            result['id'] = package['id']
+            unless result['status'].eql?('completed')
+              formatter.display_status("Package #{package['id']}")
+              result = wait_package_status(package['id'])
+            end
+            return Main.result_single_object(result)
+          end
+        end
+
         # Browse a folder
         # @param browse_endpoint [String] the endpoint to browse
         def browse_folder(browse_endpoint)
@@ -300,9 +345,9 @@ module Aspera
                 operation:    'POST',
                 subpath:      browse_endpoint,
                 query:        query,
-                content_type: Rest::MIME_JSON,
+                content_type: Mime::JSON,
                 body:         {'path' => path, 'filters' => filters},
-                headers:      {'Accept' => Rest::MIME_JSON},
+                headers:      {'Accept' => Mime::JSON},
                 ret:          :both
               )
               all_items.concat(data['items'])
@@ -339,12 +384,7 @@ module Aspera
           when :show
             return Main.result_single_object(@api_v5.read("packages/#{package_id}"))
           when :browse
-            location = case options.get_option(:box)
-            when 'inbox' then 'received'
-            when 'outbox' then 'sent'
-            else raise BadArgument, 'Browse only available for inbox and outbox'
-            end
-            return browse_folder("packages/#{package_id}/files/#{location}")
+            return browse_folder("packages/#{package_id}/files/#{Api::Faspex.box_type(options.get_option(:box))}")
           when :status
             status_list = options.get_next_argument('list of states, or nothing', mandatory: false, validation: Array)
             status = wait_package_status(package_id, status_list: status_list)
@@ -357,64 +397,21 @@ module Aspera
             @api_v5.call(
               operation:    'DELETE',
               subpath:      'packages',
-              content_type: Rest::MIME_JSON,
+              content_type: Mime::JSON,
               body:         {ids: ids},
-              headers:      {'Accept' => Rest::MIME_JSON}
+              headers:      {'Accept' => Mime::JSON}
             )
             return Main.result_status('Package(s) deleted')
           when :receive
             return package_receive(package_id)
           when :send
-            parameters = value_create_modify(command: command)
-            # autofill recipient for public url
-            if @api_v5.pub_link_context&.key?('recipient_type') && !parameters.key?('recipients')
-              parameters['recipients'] = [{
-                name:           @api_v5.pub_link_context['name'],
-                recipient_type: @api_v5.pub_link_context['recipient_type']
-              }]
-            end
-            normalize_recipients(parameters)
-            # User specified content prot in tspec, but faspex requires in package creation
-            # `transfer_spec/upload` will set `content_protection`
-            if transfer.user_transfer_spec['content_protection'] && !parameters.key?('ear_enabled')
-              transfer.user_transfer_spec.delete('content_protection')
-              parameters['ear_enabled'] = true
-            end
-            package = @api_v5.create('packages', parameters)
-            shared_folder = options.get_option(:shared_folder)
-            if shared_folder.nil?
-              # send from local files
-              transfer_spec = @api_v5.create(
-                "packages/#{package['id']}/transfer_spec/upload",
-                {paths: transfer.source_list},
-                query: {transfer_type: Api::Faspex::TRANSFER_CONNECT}
-              )
-              # well, we asked a TS for connect, but we actually want a generic one
-              transfer_spec.delete('authentication')
-              return Main.result_transfer(transfer.start(transfer_spec))
-            else
-              # send from remote shared folder
-              if (m = Base.percent_selector(shared_folder))
-                shared_folder = lookup_entity_by_field(
-                  api: @api_v5,
-                  entity: 'shared_folders',
-                  field: m[:field],
-                  value: m[:value]
-                )['id']
-              end
-              transfer_request = {shared_folder_id: shared_folder, paths: transfer.source_list}
-              # start remote transfer and get first status
-              result = @api_v5.create("packages/#{package['id']}/remote_transfer", transfer_request)
-              result['id'] = package['id']
-              unless result['status'].eql?('completed')
-                formatter.display_status("Package #{package['id']}")
-                result = wait_package_status(package['id'])
-              end
-              return Main.result_single_object(result)
-            end
+            return package_send
           when :list
             list, total = list_packages_with_filter
-            return Main.result_object_list(list, total: total, fields: %w[id title release_date total_bytes total_files created_time state])
+            fields = %w[id title status sender.name recipients.0.name release_date total_bytes total_files]
+            fields.delete('recipients.0.name') if %w[inbox inbox_history].include?(options.get_option(:box))
+            fields.delete('sender.name') if %w[outbox outbox_history].include?(options.get_option(:box))
+            return Main.result_object_list(list, total: total, fields: fields)
           end
         end
 
@@ -506,7 +503,7 @@ module Aspera
             )
             return Main.result_single_object(result)
           when :members, :saml_groups
-            # :shared_inboxes, :workgroups
+            # res_command := :shared_inboxes, :workgroups
             res_id = instance_identifier{ |field, value| lookup_entity_by_field(api: @api_v5, entity: res_sym.to_s, field: field, value: value, query: res_id_query)['id']}
             res_path = "#{res_sym}/#{res_id}/#{res_command}"
             list_key = res_command.to_s
@@ -533,6 +530,7 @@ module Aspera
               access = options.get_next_argument('level', mandatory: false, accept_list: SHARED_INBOX_MEMBER_LEVELS, default: :standard)
               options.unshift_next_argument({user: users.map{ |u| {id: u, access: access}}})
             end
+            # TODO: test SAML group
             return entity_execute(
               api: @api_v5,
               entity: res_path,
@@ -541,11 +539,11 @@ module Aspera
             ) do |field, value|
                      lookup_entity_by_field(
                        api: @api_v5,
-                       entity: 'contacts',
+                       entity: res_path,
                        field: field,
                        value: value,
                        query: Rest.php_style({type: %w[user]})
-                     )['id']
+                     )['user_id']
                    end
           when :reset_password
             # :accounts
@@ -686,7 +684,7 @@ module Aspera
                 @api_v5.create(invitation_endpoint, params)
               end
             when :resend
-              @api_v5.create("#{invitation_endpoint}/#{instance_identifier}/resend")
+              @api_v5.create("#{invitation_endpoint}/#{instance_identifier}/resend", nil)
               return Main.result_status('Invitation resent')
             else
               return entity_execute(

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

@@ -450,7 +450,7 @@ module Aspera
               @api_node.call(
                 operation:    'POST',
                 subpath:      'services/soap/Transfer-201210',
-                content_type: Rest::MIME_TEXT,
+                content_type: Mime::TEXT,
                 body:         CENTRAL_SOAP_API_TEST,
                 headers:      {'Content-Type' => 'text/xml;charset=UTF-8', 'SOAPAction' => 'FASPSessionNET-200911#GetSessionInfo'},
                 ret:          :resp
@@ -471,9 +471,7 @@ module Aspera
             return Main.result_single_object(nd_info)
           when :license
             # requires: asnodeadmin -mu <node user> --acl-add=internal --internal
-            node_license = @api_node.read('license')
-            Log.log.error('server must have: asnodeadmin -mu <node user> --acl-add=internal --internal') if node_license['failure'].is_a?(String) && node_license['failure'].include?('ACL')
-            return Main.result_single_object(node_license)
+            return Main.result_single_object(@api_node.read('license'))
           when :api_details
             return Main.result_single_object({base_url: @api_node.base_url}.merge(@api_node.params))
           end
@@ -837,7 +835,7 @@ module Aspera
                 @api_node.call(
                   operation:    'POST',
                   subpath:      "asyncs/#{asyncs_id}/#{sync_command}",
-                  content_type: Rest::MIME_TEXT,
+                  content_type: Mime::TEXT,
                   body:         '',
                   ret:          :resp
                 ).body

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

@@ -7,9 +7,33 @@ module Aspera
     module Plugins
       # base class for applications supporting OAuth 2.0 authentication
       class Oauth < BasicAuth
-        # OAuth methods supported
+        class << self
+          # Get command line options specified by `AUTH_OPTIONS` and `defaults.keys` (value is default).
+          # Adds those not nil to the `kwargs`.
+          # Instantiate the provided `klass` with those `kwargs`.
+          # `defaults` can specify a default value (not `nil`)
+          # @param options  [Cli::Manager] Object to get command line options.
+          # @param kwargs   [Hash]  Object creation arguments
+          # @param defaults [Hash]  Additional options, key=symbol, value=default value or nil
+          # @return [Object] instance of `klass`
+          # @raise [Cli::Error] if a required option is missing
+          def args_from_options(options, defaults: nil, **kwargs)
+            defaults ||= {}
+            (AUTH_OPTIONS + defaults.keys).each_with_object(kwargs) do |i, m|
+              v = options.get_option(i)
+              m[i] = v unless v.nil?
+              m[i] = defaults[i] if m[i].nil? && !defaults[i].nil?
+            end
+          rescue ::ArgumentError => e
+            if (m = e.message.match(/missing keyword: :(.*)$/))
+              raise Cli::Error, "Missing option: #{m[1]}"
+            end
+            raise
+          end
+        end
+        # OAuth methods supported (web, jwt)
         AUTH_TYPES = %i[web jwt boot].freeze
-        # Options used for authentication
+        # Options used for authentication (url, auth, client_id, etc...)
         AUTH_OPTIONS = %i[url auth client_id client_secret redirect_uri private_key passphrase username password].freeze
         def initialize(**_)
           super
@@ -20,29 +44,6 @@ module Aspera
           options.declare(:private_key, 'OAuth (JWT) RSA private key PEM value (prefix file path with @file:)')
           options.declare(:passphrase, 'OAuth (JWT) RSA private key passphrase')
         end
-
-        # Get command line options specified by `AUTH_OPTIONS` and `option.keys` (value is default).
-        # Adds those not nil to the `kwargs`.
-        # Instantiate the provided `klass` with those kwargs.
-        # `option` can specify a default value (not `nil`)
-        # @param klass   [Class] API object to create
-        # @param kwargs  [Hash] The fixed keyword arguments for creation
-        # @param option [Hash] Additional options, key=symbol, value:default value or nil
-        # @return [Object] instance of `klass`
-        # @raise [Cli::Error] if a required option is missing
-        def new_with_options(klass, kwargs: {}, option: {})
-          klass.new(**
-            (AUTH_OPTIONS + option.keys).each_with_object(kwargs) do |i, m|
-              v = options.get_option(i)
-              m[i] = v unless v.nil?
-              m[i] = option[i] unless !m[i].nil? || option[i].nil?
-            end)
-        rescue ::ArgumentError => e
-          if (m = e.message.match(/missing keyword: :(.*)$/))
-            raise Cli::Error, "Missing option: #{m[1]}"
-          end
-          raise
-        end
       end
     end
   end