aspera-cli 4.20.0 → 4.21.2

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

@@ -66,14 +66,14 @@ module Aspera
             base_url = "#{base_url}.#{Api::AoC::SAAS_DOMAIN_PROD}" unless base_url.include?('.')
             # AoC is only https
             return nil unless base_url.start_with?('https://')
-            res_http = Rest.new(base_url: base_url, redirect_max: 10).call(operation: 'GET')[:http]
-            # Any AoC is on this domain
-            return nil unless res_http.uri.host.end_with?(Api::AoC::SAAS_DOMAIN_PROD)
-            Log.log.debug{"AoC Main page: #{res_http.body.include?(Api::AoC::PRODUCT_NAME)}"}
-            base_url = res_http.uri.to_s if res_http.uri.path.include?('/public')
+            res_http = Rest.new(base_url: base_url, redirect_max: 0).call(operation: 'GET', subpath: 'auth/ping', return_error: true)[:http]
+            return nil if res_http['Location'].nil?
+            redirect_uri = URI.parse(res_http['Location'])
+            od = Api::AoC.split_org_domain(URI.parse(base_url))
+            return nil unless redirect_uri.path.end_with?("oauth2/#{od[:organization]}/login")
             # either in standard domain, or product name in page
             return {
-              version: 'SaaS',
+              version: Api::AoC.saas_url?(base_url) ? 'SaaS' : 'Self-managed',
               url:     base_url
             }
           end
@@ -92,8 +92,6 @@ module Aspera
             # set vars to look like object
             options = object.options
             formatter = object.formatter
-            options.declare(:use_generic_client, 'Wizard: AoC: use global or org specific jwt client id', values: :bool, default: true)
-            options.parse_options!
             instance_url = options.get_option(:url, mandatory: true)
             pub_link_info = Api::AoC.link_info(instance_url)
             if !pub_link_info[:token].nil?
@@ -108,6 +106,8 @@ module Aspera
                 test_args:    'organization'
               }
             end
+            options.declare(:use_generic_client, 'Wizard: AoC: use global or org specific jwt client id', values: :bool, default: Api::AoC.saas_url?(instance_url))
+            options.parse_options!
             # make username mandatory for jwt, this triggers interactive input
             wiz_username = options.get_option(:username, mandatory: true)
             raise "Username shall be an email in AoC: #{wiz_username}" if !(wiz_username =~ /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i)
@@ -133,15 +133,15 @@ module Aspera
                 formatter.display_status('Please login to your Aspera on Cloud instance.'.red)
                 formatter.display_status('Navigate to: 𓃑  → Admin → Integrations → API Clients')
                 formatter.display_status('Check or create in integration:')
-                formatter.display_status("- name: #{@info[:name]}")
+                formatter.display_status('- name: cli')
                 formatter.display_status("- redirect uri: #{REDIRECT_LOCALHOST}")
                 formatter.display_status('- origin: localhost')
                 formatter.display_status('Use the generated client id and secret in the following prompts.'.red)
               end
-              Environment.instance.open_uri("#{instance_url}/admin/api-clients")
+              Environment.instance.open_uri("#{instance_url}/admin/integrations/api-clients")
               options.get_option(:client_id, mandatory: true)
               options.get_option(:client_secret, mandatory: true)
-              use_browser_authentication = true
+              # use_browser_authentication = true
             end
             if use_browser_authentication
               formatter.display_status('We will use web authentication to bootstrap.')
@@ -282,13 +282,17 @@ module Aspera
         end
 
         # list all entities, given additional, default and user's queries
+        # @param resource_class_path path to query on API
+        # @param fields fields to display
+        # @param base_query a query applied always
+        # @param default_query default query unless overriden by user
         def result_list(resource_class_path, fields: nil, base_query: {}, default_query: {})
           Aspera.assert_type(base_query, Hash)
           Aspera.assert_type(default_query, Hash)
           user_query = query_read_delete(default: default_query)
           # caller may add specific modifications or checks
           yield(user_query) if block_given?
-          return {type: :object_list, fields: fields}.merge(api_read_all(resource_class_path, base_query.merge(user_query)))
+          return {type: :object_list, fields: fields}.merge(api_read_all(resource_class_path, base_query.merge(user_query).compact))
         end
 
         def resolve_dropbox_name_default_ws_id(query)
@@ -344,7 +348,7 @@ module Aspera
             transfer.agent_instance = Agent::Node.new(
               url:      client_apfid[:api].base_url,
               username: client_apfid[:api].app_info[:node_info]['access_key'],
-              password: client_apfid[:api].oauth.token,
+              password: client_apfid[:api].oauth.authorization,
               root_id:  client_apfid[:file_id]
             )
             # additional node to node TS info
@@ -411,8 +415,8 @@ module Aspera
             when :operation then default_fields = nil
             when :short_link then default_fields.push('short_url', 'data.url_token_data.purpose')
             when :user then default_fields.push('name', 'email')
-            when :group_membership then default_fields.push(*%w[group_id member_type member_id])
-            when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
+            when :group_membership then default_fields.push('group_id', 'member_type', 'member_id')
+            when :workspace_membership then default_fields.push('workspace_id', 'member_type', 'member_id')
             end
             return result_list(resource_class_path, fields: default_fields, default_query: default_query)
           when :show
@@ -469,60 +473,111 @@ module Aspera
           when :subscription
             org = aoc_api.read('organization')
             bss_graphql = api_from_options('bss/platform/graphql')
-            # cspell:disable
-            graphql_query = <<-GRAPHQL
-      query ($organization_id: ID!) {
-        aoc (organization_id: $organization_id) {
-          bssSubscription {
-            aocVersion
-            endDate
-            startDate
-            termMonths
-            plan
-            trial
-            termType
-            aocOrganizations {
-              id
-            }
-            additionalStorageVolumeGb
-            additionalEgressVolumeGb
-            term {
-              startDate
-              endDate
-              transferVolumeGb
-              egressVolumeGb
-              storageVolumeGb
-              transferVolumeOffsetGb
-            }
-            paygoRate {
-              transferRate
-              storageRate
-              currency
-            }
-            aocPlanData {
-              tier
-              trial
-              workspaces { max }
-              users {
-                planAmount
-                max
+            command_subscription = options.get_next_command(%i[account usage])
+            case command_subscription
+            when :account
+              # cspell:disable
+              graphql_query = <<-GRAPHQL
+              query ($organization_id: ID!) {
+                aoc (organization_id: $organization_id) {
+                  bssSubscription {
+                    aocVersion
+                    endDate
+                    startDate
+                    termMonths
+                    plan
+                    trial
+                    termType
+                    aocOrganizations {
+                      id
+                    }
+                    additionalStorageVolumeGb
+                    additionalEgressVolumeGb
+                    term {
+                      startDate
+                      endDate
+                      transferVolumeGb
+                      egressVolumeGb
+                      storageVolumeGb
+                      transferVolumeOffsetGb
+                    }
+                    paygoRate {
+                      transferRate
+                      storageRate
+                      currency
+                    }
+                    aocPlanData {
+                      tier
+                      trial
+                      workspaces { max }
+                      users {
+                        planAmount
+                        max
+                      }
+                      samlIntegration
+                      activity
+                      sharedInboxes
+                      uniqueUrls
+                      support
+                      watermarking
+                      byok
+                      automation { planAmount, max }
+                    }
+                  }
+                }
               }
-              samlIntegration
-              activity
-              sharedInboxes
-              uniqueUrls
-              support
-              watermarking
-              byok
-              automation { planAmount, max }
-            }
-          }
-        }
-      }
-            GRAPHQL
-            # cspell:enable
-            result = bss_graphql.create(nil, {query: graphql_query, variables: {organization_id: org['id']}})['data']
-            return {type: :single_object, data: result['aoc']['bssSubscription']}
+              GRAPHQL
+              # cspell:enable
+              result = bss_graphql.create(nil, {query: graphql_query, variables: {organization_id: org['id']}})['data']
+              return {type: :single_object, data: result['aoc']['bssSubscription']}
+            when :usage
+              # cspell:disable
+              graphql_query = <<-GRAPHQL
+              query ($organization_id: ID!, $startDate: Date!, $endDate: Date!, $aggregate: TransferUsageAggregateOption!) {
+                aoc (organization_id: $organization_id) {
+                  bssSubscription {
+                    aocOrganizations { id }
+                    additionalStorageVolumeGb
+                    additionalEgressVolumeGb
+                    aocPlanData {
+                      tier
+                      trial
+                    }
+                    term {
+                      transferVolumeGb
+                      egressVolumeGb
+                      storageVolumeGb
+                      startDate
+                      endDate
+                      transferVolumeOffsetGb
+                    }
+                    termMonths
+                    transferUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { mbTotal }
+                    egressUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { usageMb }
+                  }
+                  subscriptionEntitlements {
+                    id
+                    transferUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { mbTotal }
+                    egressUsages (startDate: $startDate, endDate: $endDate, aggregate: $aggregate) { usageMb }
+                  }
+                }
+              }
+              GRAPHQL
+              aggregate = options.get_next_argument('aggregation', accept_list: %i[ALL MONTHLY], default: :ALL)
+              today = Date.today
+              start_date = options.get_next_argument('start date', mandatory: false, default: today.prev_year.strftime('%Y-%m-%d'))
+              end_date = options.get_next_argument('end date', mandatory: false, default: today.strftime('%Y-%m-%d'))
+              # cspell:enable
+              result = bss_graphql.create(
+                nil,
+                {query:     graphql_query,
+                 variables: {
+                   organization_id: org['id'],
+                   aggregate:       aggregate,
+                   startDate:       start_date,
+                   endDate:         end_date}})['data']
+              return {type: :single_object, data: result['aoc']}
+            end
           when :ats
             ats_api = Rest.new(**aoc_api.params.deep_merge({
               base_url: "#{aoc_api.base_url}/admin/ats/pub/v1",
@@ -686,7 +741,7 @@ module Aspera
           when :servers
             return {type: :object_list, data: Rest.new(base_url: "#{Api::AoC.api_base_url}/#{Api::AoC::API_V1}").read('servers')}
           when :bearer_token
-            return {type: :text, data: aoc_api.oauth.token}
+            return {type: :text, data: aoc_api.oauth.authorization}
           when :organization
             return { type: :single_object, data: aoc_api.read('organization') }
           when :tier_restrictions
@@ -801,6 +856,12 @@ module Aspera
               else
                 ids_to_download = [ids_to_download] unless ids_to_download.is_a?(Array)
               end
+              file_list =
+                begin
+                  transfer.source_list.map{|i|{'source'=>i}}
+                rescue Cli::BadArgument
+                  [{'source' => '.'}]
+                end
               # list here
               result_transfer = []
               formatter.display_status("found #{ids_to_download.length} package(s).")
@@ -816,7 +877,7 @@ module Aspera
                   package_node_api.transfer_spec_gen4(
                     package_info['contents_file_id'],
                     Transfer::Spec::DIRECTION_RECEIVE,
-                    {'paths'=> [{'source' => '.'}]}),
+                    {'paths'=> file_list}),
                   rest_token: package_node_api)
                 result_transfer.push({'package' => package_id, Main::STATUS_FIELD => statuses})
                 # update skip list only if all transfer sessions completed
@@ -837,14 +898,14 @@ module Aspera
                        resolve_dropbox_name_default_ws_id(query)
                      end
             when :delete
-              return do_bulk_operation(command: package_command, descr: 'identifier', values: identifier) do |id|
+              return do_bulk_operation(command: package_command, descr: 'identifier', values: instance_identifier) do |id|
                 Aspera.assert_values(id.class, [String, Integer]){'identifier'}
                 aoc_api.delete("packages/#{id}")
               end
             when *Node::NODE4_READ_ACTIONS
               package_id = instance_identifier
               package_info = aoc_api.read("packages/#{package_id}")
-              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['file_id'], scope: Api::Node::SCOPE_USER)
+              return execute_nodegen4_command(package_command, package_info['node_id'], file_id: package_info['contents_file_id'], scope: Api::Node::SCOPE_USER)
             end
           when :files
             command_repo = options.get_next_command([:short_link].concat(NODE4_EXT_COMMANDS))
@@ -891,7 +952,7 @@ module Aspera
           when :automation
             Log.log.warn('BETA: work under progress')
             # automation api is not in the same place
-            automation_api = Rest.new(**aoc_api.params.merge(base_url: aoc_api.base_url.gsub('/api/', '/automation/')))
+            automation_api = Rest.new(**aoc_api.params, base_url: aoc_api.base_url.gsub('/api/', '/automation/'))
             command_automation = options.get_next_command(%i[workflows instances])
             case command_automation
             when :instances