morpheus-cli 3.4.1.3 → 3.4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d494a00b196af210b1c23ccf1de41b2e069f0ad
-  data.tar.gz: dabfc1813d542df60e0905187499f7dbe8b210ee
+  metadata.gz: e36f51274524a0ee48ba3f6c51e224d29bc42118
+  data.tar.gz: dadbf3df8aa4ff8fd29d28ffc1b3407d22e2d02b
 SHA512:
-  metadata.gz: dd186cffdf47d09863722bdcc0fd8f5e62f247afb49195d7b900d1315594c063ddaeee13bbcfa7169778218d0a8f130296f42da1018727559dc1b1e13def9d3a
-  data.tar.gz: e396de94d79b666b423c4745f5e4c04f62aa2fcbb14f9ad972058fb7e88f43b9e115f81127b74ad1b2a8fc162e531d22d16f516401c502b99483cdf33d46ed06
+  metadata.gz: 9e526f9adc5da2b3cadd57ea97ffa63ad89052383e8e0ecbe373edf6dd948503d078a0c302186365af8e07c1f769fdbf1b7c24dd441f0024ff97c4cad1de66fb
+  data.tar.gz: 1ccc01cfd9fbc9a5785b41dc5ce294cc3b0b27a9e3e875777aa60db2f68d64594f3a6371154ecfce61bdc6b3c4db144271caeecb262b50864ac21086b2155e00

data/lib/morpheus/cli/credentials.rb

@@ -24,69 +24,101 @@ module Morpheus
         password = nil
         access_token = nil
         skip_save = false
-        # We should return an access Key for Morpheus CLI Here
-        if !opts[:remote_username].nil?
-          username = opts[:remote_username]
-          password = opts[:remote_password]
-          skip_save = opts[:remote_url] ? true : false
-        else
-          access_token = load_saved_credentials
-        end
-        if access_token
-          return access_token
-        end
-        unless opts[:quiet] || opts[:no_prompt]
-          # if username.empty? || password.empty?
-            print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
-          # end
-          if username.empty?
-            print "Username: #{required_blue_prompt} "
-            username = $stdin.gets.chomp!
-          else
-            print "Username: #{required_blue_prompt} #{username}\n"
+        
+        if opts[:remote_token]
+          begin
+            whoami_interface = Morpheus::WhoamiInterface.new(opts[:remote_token], nil, nil, @appliance_url)
+            whoami_response = whoami_interface.get()
+            if opts[:json]
+              print JSON.pretty_generate(whoami_response)
+              print reset, "\n"
+            end
+            access_token = opts[:remote_token]
+            username = whoami_response['user']['username']
+            unless skip_save
+              save_credentials(@appliance_name, access_token)
+            end
+          rescue ::RestClient::Exception => e
+            #raise e
+            if (e.response && e.response.code == 400)
+              print_red_alert "Token not valid."
+              if opts[:json]
+                whoami_response = JSON.parse(e.response.to_s)
+                print JSON.pretty_generate(whoami_response)
+                print reset, "\n"
+              end
+            else
+              #print_rest_exception(e, opts)
+              print_red_alert "Token not valid."
+            end
+            access_token = nil
           end
-          if password.empty?
-            print "Password: #{required_blue_prompt} "
-            password = STDIN.noecho(&:gets).chomp!
-            print "\n"
+        else
+        
+          if !opts[:remote_username].nil?
+            username = opts[:remote_username]
+            password = opts[:remote_password]
+            skip_save = opts[:remote_url] ? true : false
           else
-            print "Password: #{required_blue_prompt} \n"
+            access_token = load_saved_credentials
           end
-        end
-        if username.empty? || password.empty?
-          print_red_alert "Username and password are required to login."
-          return nil
-        end
-        begin
-          auth_interface = Morpheus::AuthInterface.new(@appliance_url)
-          json_response = auth_interface.login(username, password)
-          if opts[:json]
-            print JSON.pretty_generate(json_response)
-            print reset, "\n"
+          if access_token
+            return access_token
           end
-          access_token = json_response['access_token']
-          if access_token && access_token != ""
-            unless skip_save
-              save_credentials(@appliance_name, access_token)
+          unless opts[:quiet] || opts[:no_prompt]
+            # if username.empty? || password.empty?
+              print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+            # end
+            if username.empty?
+              print "Username: #{required_blue_prompt} "
+              username = $stdin.gets.chomp!
+            else
+              print "Username: #{required_blue_prompt} #{username}\n"
             end
-            # return access_token
-          else
-            print_red_alert "Credentials not verified."
-            # return nil
+            if password.empty?
+              print "Password: #{required_blue_prompt} "
+              password = STDIN.noecho(&:gets).chomp!
+              print "\n"
+            else
+              print "Password: #{required_blue_prompt} \n"
+            end
+          end
+          if username.empty? || password.empty?
+            print_red_alert "Username and password are required to login."
+            return nil
           end
-        rescue ::RestClient::Exception => e
-          #raise e
-          if (e.response && e.response.code == 400)
-            print_red_alert "Credentials not verified."
+          begin
+            auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+            json_response = auth_interface.login(username, password)
             if opts[:json]
-              json_response = JSON.parse(e.response.to_s)
               print JSON.pretty_generate(json_response)
               print reset, "\n"
             end
-          else
-            print_rest_exception(e, opts)
+            access_token = json_response['access_token']
+            if access_token && access_token != ""
+              unless skip_save
+                save_credentials(@appliance_name, access_token)
+              end
+              # return access_token
+            else
+              print_red_alert "Credentials not verified."
+              # return nil
+            end
+          rescue ::RestClient::Exception => e
+            #raise e
+            if (e.response && e.response.code == 400)
+              print_red_alert "Credentials not verified."
+              if opts[:json]
+                json_response = JSON.parse(e.response.to_s)
+                print JSON.pretty_generate(json_response)
+                print reset, "\n"
+              end
+            else
+              print_rest_exception(e, opts)
+            end
+            access_token = nil
           end
-          access_token = nil
+
         end
 
 

data/lib/morpheus/cli/login.rb

@@ -36,6 +36,9 @@ class Morpheus::Cli::Login
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
         password = val
       end
+      opts.on( '-T', '--token ACCESS_TOKEN', "Use an existing access token instead of authenticating with a username and password." ) do |val|
+        options[:remote_token] = val
+      end
       build_common_options(opts, options, [:json, :remote, :quiet])
     end
     optparse.parse!(args)
@@ -62,7 +65,7 @@ class Morpheus::Cli::Login
 
     begin
       if options[:quiet]
-        if username.empty? || password.empty?
+        if !options[:remote_token] && (username.empty? || password.empty?)
           print yellow,"You have not specified username and password\n"
           return false
         end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.4.1.3"
+    VERSION = "3.4.1.4"
   end
 end

data/lib/morpheus/cli/whoami.rb

@@ -98,7 +98,7 @@ class Morpheus::Cli::Whoami
       end
 
 
-      load_whoami()
+      json_response = load_whoami()
       
       user = @current_user # from load_whoami()  meh
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.4.1.3
+  version: 3.4.1.4
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler