superbot-cloud 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cf9f4ebda39c246a90a762bf76cb9101fa8f0a34abb8b4c87586fd77b09305
-  data.tar.gz: 3cf214ca9a1215afd9c76f87305da9ec7e647da163330d7a8fe447cd73d2fec6
+  metadata.gz: e4dbcec81d287ce7f963412a81a3061645dd519fe8951919b1bcabc870007857
+  data.tar.gz: aeafad6a71e729648875cbf35e7052864e7e09bf3ed9cc6c3966db0c93e19006
 SHA512:
-  metadata.gz: 9516b4f2711a3b345b3e89707407653b0215edaf22f1f49507d1cb078f6d1ad68f8df0c58f524feeb7235757657d3c0739abc27550675e9ae97cc0e7db647554
-  data.tar.gz: 01a28235edf1bc534f1704bf6f142bf78b012b25c404ca639c481d3e69cc4ea6b78c4cd277e680c0419144813167cb06adb83bcc91f97b625aa36fd23f19e8ed
+  metadata.gz: aa8790116ed3dd57d05b8b89760bd0e9ea2c38122cfa35b74c8ec0c2050828da54c6b3f26595830810a21fab989b9052d6fa0a4a9b8b1f3b85ea0646d24a89e2
+  data.tar.gz: 1b3544b4cc35c66cb80f63e645d78f69d3f2ec65d54aa86d2a7fb4c08a849ab31a9fddb890e1f8cec05c2492b37eec80e6718a0e38410ef28ce23d1533dbaa92

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-cloud (0.2.6)
+    superbot-cloud (0.2.7)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
 

data/lib/superbot/cloud/api.rb

@@ -18,6 +18,7 @@ module Superbot
         cancel_schedule:            { method: :delete, endpoint: 'schedules', required_param: :id },
         webdriver_session_list:     { method: :get, endpoint: 'webdriver_sessions' },
         delete_webdriver_session:   { method: :delete, endpoint: 'webdriver_sessions', required_param: :session_id },
+        get_webdriver_session:      { method: :get, endpoint: 'webdriver_sessions', required_param: :session_id },
         member_list:                { method: :get, endpoint: 'members' },
         add_member:                 { method: :post, endpoint: 'members' },
         remove_member:              { method: :delete, endpoint: 'members', required_param: :username },
@@ -25,7 +26,10 @@ module Superbot
         abort_interactive_run:      { method: :delete, endpoint: 'interactive_runs', required_param: :id },
         update_interactive_run:     { method: :patch, endpoint: 'interactive_runs', required_param: :id },
         show_interactive_run:       { method: :get, endpoint: 'interactive_runs', required_param: :id },
-        interactive_run_list:       { method: :get, endpoint: 'interactive_runs' }
+        interactive_run_list:       { method: :get, endpoint: 'interactive_runs' },
+        access_token_list:          { method: :get, endpoint: 'access_tokens' },
+        create_access_token:        { method: :post, endpoint: 'access_tokens' },
+        revoke_access_token:        { method: :delete, endpoint: 'access_tokens', required_param: :token }
       }.freeze
 
       def self.request(type, params: {})
@@ -46,11 +50,10 @@ module Superbot
             request_class.new(uri).tap { |r| r.set_form_data(params) }
           end
 
-        if Superbot::Cloud.credentials
-          req['Authorization'] = format(
-            'Token token="%<token>s", email="%<email>s"',
-            **Superbot::Cloud.credentials.slice(:email, :token)
-          )
+        auth_token = ENV['SUPERBOT_TOKEN'] || Superbot::Cloud.credentials&.slice(:username, :token)&.values&.join(':')
+        if auth_token
+          auth_type = ENV['SUPERBOT_TOKEN'] ? 'Bearer' : 'Basic'
+          req['Authorization'] = "#{auth_type} #{Base64.urlsafe_encode64(auth_token)}"
         end
 
         response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|

data/lib/superbot/cloud/cli/organization_based_command.rb

@@ -4,7 +4,7 @@ module Superbot
   module Cloud
     module CLI
       class OrganizationBasedCommand < LoginRequiredCommand
-        option ["--org"], "ORGANIZATION", "Name of organization to take action on", required: true, attribute_name: :organization
+        option ["--org"], "ORGANIZATION", "Name of organization to take action on", environment_variable: "SUPERBOT_ORG", required: ENV['SUPERBOT_TOKEN'].to_s.empty?, attribute_name: :organization
       end
     end
   end

data/lib/superbot/cloud/cli/root_command.rb

@@ -12,6 +12,7 @@ require_relative 'webdriver_command'
 require_relative 'member_command'
 require_relative 'schedule_command'
 require_relative 'run_command'
+require_relative 'token_command'
 
 module Superbot
   module Cloud
@@ -25,7 +26,8 @@ module Superbot
         subcommand ['webdriver'], "Manage your webdriver sessions", WebdriverCommand
         subcommand ['member'], "Manage your organization members", MemberCommand
         subcommand ['schedule'], "Manage your schedules", ScheduleCommand
-        subcommand(['run'], "Schedule a cloud run", RunCommand) if ENV['SUPERBOT_FEAT_CLOUD_RUNS'] == 'true'
+        subcommand(['run'], "Manage your interactive cloud runs", RunCommand) if ENV['SUPERBOT_FEAT_CLOUD_RUNS'] == 'true'
+        subcommand ['token'], "Manage your organization tokens", TokenCommand
 
         option ['-v', '--version'], :flag, "Show version information" do
           puts Superbot::Cloud::VERSION

data/lib/superbot/cloud/cli/token/base_command.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Token
+        class BaseCommand < OrganizationBasedCommand
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/token/generate_command.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Token
+        class GenerateCommand < BaseCommand
+          parameter "NAME", "Token title", required: true
+
+          def execute
+            generate_token
+          end
+
+          def generate_token
+            api_response = Superbot::Cloud::Api.request(:create_access_token, params: { organization_name: organization, name: name })
+            puts api_response[:token]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/token/list_command.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Token
+        class ListCommand < BaseCommand
+          OUTPUT_HEADERS = {
+            name: "Title",
+            token: "Token",
+            scope: "API scope"
+          }.freeze
+
+          def execute
+            list_tokens
+          end
+
+          def list_tokens
+            api_response = Superbot::Cloud::Api.request(:access_token_list, params: { organization_name: organization })
+            puts "Organization: #{api_response[:organization]}"
+            puts "Access Tokens:"
+            puts(api_response[:access_tokens].map { |m| m[:username] })
+
+            puts "Organization: #{api_response[:organization]}"
+            puts OUTPUT_HEADERS.values.map { |header| header.ljust(35) }.join
+            puts ''.ljust(35 * OUTPUT_HEADERS.length, '-')
+            api_response[:access_tokens].each do |webdriver_session|
+              puts webdriver_session.slice(*OUTPUT_HEADERS.keys).values.map { |v| v.to_s.ljust(35) }.join
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/token/revoke_command.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Token
+        class RevokeCommand < BaseCommand
+          parameter "TOKEN", "Access token to remove"
+
+          def execute
+            revoke_token
+          end
+
+          def revoke_token
+            api_response = Superbot::Cloud::Api.request(:revoke_access_token, params: { organization_name: organization, token: token })
+            puts "Token was successfully revoked"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/token_command.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative 'token/base_command'
+require_relative 'token/generate_command'
+require_relative 'token/revoke_command'
+require_relative 'token/list_command'
+
+module Superbot
+  module Cloud
+    module CLI
+      class TokenCommand < LoginRequiredCommand
+        subcommand ['generate'], "Generate new access token", Token::GenerateCommand
+        subcommand ['revoke'], "Revoke token", Token::RevokeCommand
+        subcommand ['list'], "List your organization access tokens", Token::ListCommand
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/webdriver/list_command.rb

@@ -21,8 +21,6 @@ module Superbot
           def list_sessions
             states = all? ? nil : %w[idle proxying]
             api_response = Superbot::Cloud::Api.request(:webdriver_session_list, params: { organization_name: organization, 'aasm_state[]': states })
-            abort api_response[:error] if api_response[:error]
-
             abort "No active sessions found for #{api_response[:organization]} organization" if api_response[:webdriver_sessions].empty?
 
             if quiet?

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -166,6 +166,11 @@ files:
 - lib/superbot/cloud/cli/test/list_command.rb
 - lib/superbot/cloud/cli/test/upload_command.rb
 - lib/superbot/cloud/cli/test_command.rb
+- lib/superbot/cloud/cli/token/base_command.rb
+- lib/superbot/cloud/cli/token/generate_command.rb
+- lib/superbot/cloud/cli/token/list_command.rb
+- lib/superbot/cloud/cli/token/revoke_command.rb
+- lib/superbot/cloud/cli/token_command.rb
 - lib/superbot/cloud/cli/validations.rb
 - lib/superbot/cloud/cli/version_command.rb
 - lib/superbot/cloud/cli/webdriver/base_command.rb