morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/cli/commands/standard/coloring_command.rb

@@ -0,0 +1,60 @@
+require 'optparse'
+require 'morpheus/cli/cli_command'
+require 'json'
+
+# This is for use in dotfile scripts
+# It allows you to turn colors on or off globally
+class Morpheus::Cli::ColoringCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :coloring
+  set_command_hidden
+
+  def handle(args)
+    append_newline = true
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [on|off]"
+      #build_common_options(opts, options, [])
+      opts.on('-h', '--help', "Print this help" ) do
+        puts opts
+        exit
+      end
+      opts.footer = "Enable [on] or Disable [off] ANSI Colors for all output.\n" + 
+                    "Use [on?] or [off?] to print the current value and exit accordingly." + "\n" +
+                    "Pass no arguments to just print the current value."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    
+    exit_code = 0
+
+    if args.count == 0
+      # just print
+    else
+      subcmd = args[0].to_s.strip
+      if subcmd == "on"
+        Term::ANSIColor::coloring = true
+      elsif subcmd == "off"
+        Term::ANSIColor::coloring = false
+      elsif subcmd == "on?"
+        exit_code = Term::ANSIColor::coloring? ? 0 : 1
+      elsif subcmd == "off?"
+        exit_code = Term::ANSIColor::coloring? ? 1 : 0
+      else
+        puts optparse
+        return 127
+      end
+    end
+    unless options[:quiet]
+      if Term::ANSIColor::coloring?
+        puts "#{cyan}coloring: #{bold}#{green}on#{reset}"
+      else
+        puts "coloring: off"
+      end
+    end
+    return exit_code
+  end
+
+end

data/lib/morpheus/cli/{curl_command.rb → commands/standard/curl_command.rb}

@@ -53,13 +53,6 @@ EOT
       curl_args.unshift "--inescure"
     end
 
-    # @access_token = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-    # if !@access_token
-    #   print yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
-    #   print yellow,"Use the 'login' command.",reset,"\n"
-    #   return 0
-    # end
-
     if !@appliance_url
       raise "Unable to determine remote appliance url"
       print "#{red}Unable to determine remote appliance url.#{reset}\n"

data/lib/morpheus/cli/commands/standard/debug_command.rb

@@ -0,0 +1,61 @@
+require 'morpheus/cli/cli_command'
+require 'morpheus/logging'
+
+# This is for use in dotfile scripts
+# It allows you to turn colors on or off globally
+class Morpheus::Cli::DebugCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :debug
+  set_command_hidden
+
+  def handle(args)
+    append_newline = true
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [on|off]"
+      #build_common_options(opts, options, [])
+      opts.on('-h', '--help', "Print this help" ) do
+        puts opts
+        exit
+      end
+      opts.footer = "Enable [on] or Disable [off] debugging for all output.\n" + 
+                    "Use [on?] or [off?] to print the current value and exit accordingly." + "\n" +
+                    "Pass no arguments to just print the current value."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    
+    exit_code = 0
+
+    if args.count == 0
+      # just print
+    else
+      subcmd = args[0].to_s.strip
+      if subcmd == "on"
+        Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
+        ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
+      elsif subcmd == "off"
+        Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::INFO)
+        ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
+      elsif subcmd == "on?"
+        exit_code = Morpheus::Logging.debug? ? 0 : 1
+      elsif subcmd == "off?"
+        exit_code = Morpheus::Logging.debug? ? 1 : 0
+      else
+        puts optparse
+        return 127
+      end
+    end
+    unless options[:quiet]
+      if Morpheus::Logging.debug?
+        puts "#{cyan}debug: #{green}on#{reset}"
+      else
+        puts "#{cyan}debug: #{dark}off#{reset}"
+      end
+    end
+    return exit_code
+  end
+
+end

data/lib/morpheus/cli/{echo_command.rb → commands/standard/echo_command.rb}

@@ -23,7 +23,7 @@ class Morpheus::Cli::Echo
     var_map.merge!(DEFAULT_VARIABLE_MAP)
     appliance = ::Morpheus::Cli::Remote.load_active_remote()
     if appliance
-      var_map.merge!({'%remote' => appliance[:name], '%remote_url' => appliance[:host].to_s, '%username' => appliance[:username].to_s})
+      var_map.merge!({'%remote' => appliance[:name], '%remote_url' => (appliance[:host].to_s || appliance[:url].to_s), '%username' => appliance[:username].to_s})
     else
       var_map.merge!({'%remote' => '', '%remote_url' => '', '%username' => ''})
     end

data/lib/morpheus/cli/commands/standard/get_prompt_command.rb

@@ -0,0 +1,39 @@
+require 'optparse'
+require 'json'
+require 'morpheus/logging'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::GetPromptCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'get-prompt'
+  set_command_hidden
+
+  def handle(args)
+    use_echo = false
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      build_common_options(opts, options, [])
+      opts.on('-e', '--echo', "Use echo to display the prompt, displaying ansi colors and variables." ) do
+        use_echo = true
+      end
+      opts.footer = <<-EOT
+Display the current morpheus shell prompt value.
+This value can be set using `set-prompt [shell-prompt]`.
+EOT
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    if use_echo
+      my_terminal.execute("echo #{my_terminal.prompt}")
+    else
+      puts self.my_terminal.prompt
+    end
+    return 0
+  end
+
+end

data/lib/morpheus/cli/commands/standard/history_command.rb

@@ -0,0 +1,76 @@
+require 'optparse'
+require 'json'
+require 'morpheus/logging'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::HistoryCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'history'
+  set_command_hidden
+
+  # todo: support all the other :list options too, not just max
+  # AND start logging every terminal command, not just shell...
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name}"
+      # opts.on( '-m', '--max MAX', "Max Results" ) do |max|
+      #   options[:max] = max.to_i
+      # end
+      # opts.on( '-o', '--offset OFFSET', "Offset Results" ) do |offset|
+      #   options[:offset] = offset.to_i.abs
+      # end
+      # opts.on( '-s', '--search PHRASE', "Search Phrase" ) do |phrase|
+      #   options[:phrase] = phrase
+      # end
+      # opts.on( '-S', '--sort ORDER', "Sort Order" ) do |v|
+      #   options[:sort] = v
+      # end
+      # opts.on( '-D', '--desc', "Reverse Sort Order" ) do |v|
+      #   options[:direction] = "desc"
+      # end
+      opts.on( '-n', '--max-commands MAX', "Max Results. Default is 25" ) do |val|
+        options[:max] = val
+      end
+      opts.add_hidden_option('-n')
+      opts.on( nil, '--flush', "Flush history, purges entire shell history file." ) do |val|
+        options[:do_flush] = true
+      end
+      build_common_options(opts, options, [:list, :auto_confirm])
+      opts.footer = <<-EOT
+Print command history.
+The --flush option can be used to purge the history.
+
+Examples: 
+    history
+    history -m 100
+    history --flush
+
+EOT
+    end
+    raw_cmd = "#{command_name} #{args.join(' ')}"
+    optparse.parse!(args)
+    if args.count != 0
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+      return 1
+    end
+    if options[:do_flush]
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to flush your command history?")
+        return 9, "aborted command"
+      end
+      Morpheus::Cli::Shell.instance.flush_history
+      return 0
+    else
+      max_commands = options[:max] || 25
+      Morpheus::Cli::Shell.instance.print_history(max_commands)
+      last_cmd = Morpheus::Cli::Shell.instance.last_command
+      # log history, but not consecutive log entries
+      if last_cmd.nil? || last_cmd[:command] != raw_cmd
+        Morpheus::Cli::Shell.instance.log_history_command(raw_cmd)
+      end
+      return 0  
+    end
+  end
+
+end

data/lib/morpheus/cli/{log_level_command.rb → commands/standard/log_level_command.rb}

@@ -13,7 +13,7 @@ class Morpheus::Cli::LogLevelCommand
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus #{command_name} [debug|info|0|1]"
       #build_common_options(opts, options, [])
-      opts.on('-h', '--help', "Prints this help" ) do
+      opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
       end

data/lib/morpheus/cli/{man_command.rb → commands/standard/man_command.rb}

@@ -41,7 +41,7 @@ class Morpheus::Cli::ManCommand
         Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
         ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
       end
-      opts.on('-h', '--help', "Prints this help" ) do
+      opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
       end
@@ -184,7 +184,7 @@ EOT
         --noprofile                  Do not read and execute the personal initialization script .morpheus_profile
     -C, --nocolor                    Disable ANSI coloring
     -V, --debug                      Print extra output for debugging. 
-    -h, --help                       Prints this help
+    -h, --help                       Print this help
 
 ## COMMON OPTIONS
 

data/lib/morpheus/cli/commands/standard/rm_command.rb

@@ -0,0 +1,14 @@
+require 'morpheus/cli/cli_command'
+
+# This is for deleting files and directories!
+class Morpheus::Cli::RemoveFileCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :rm
+  set_command_hidden
+
+  def handle(args)
+    print_red_alert "#{command_name} is not yet supported"
+    return -1
+  end
+
+end

data/lib/morpheus/cli/commands/standard/set_prompt_command.rb

@@ -0,0 +1,54 @@
+require 'optparse'
+require 'json'
+require 'morpheus/logging'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::SetPromptCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'set-prompt'
+  set_command_hidden
+
+  def handle(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = "Usage: morpheus #{command_name} [prompt]"
+      opts.on('-h', '--help', "Print this help" ) do
+        puts opts
+        exit
+      end
+      variable_map = Morpheus::Cli::Echo.variable_map
+      formatted_variable_map = "    " + variable_map.keys.join(' ')
+      opts.footer = <<-EOT
+Customize your morpheus shell prompt.
+
+[prompt] is required. This is the string the terminal prints when you interact with it.
+
+Examples: 
+    set-prompt "morpheus $ "
+    set-prompt "%cyanmorpheus> "
+    set-prompt "[%magenta%remote%reset] %cyan%username> "
+    set-prompt "%green%username%reset@%remote morph %magenta> %reset"
+    set-prompt "%cyan%username%reset@%magenta%remote %cyanmorpheus> %reset"
+
+The available variables are:
+#{formatted_variable_map}
+
+The default prompt is: "%cyanmorpheus> %reset"
+The value may also be set through the enviroment variable MORPHEUS_PS1.
+EOT
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    # do it
+    self.my_terminal.prompt = args[0]
+    # Morpheus::Terminal.instance.prompt = args[0]
+    Morpheus::Cli::Shell.instance.recalculate_prompt()
+    Morpheus::Cli::Echo.recalculate_variable_map()
+    return 0
+  end
+
+end

data/lib/morpheus/cli/{ssl_verification_command.rb → commands/standard/ssl_verification_command.rb}

@@ -22,7 +22,7 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = usage
       #build_common_options(opts, options, [])
-      opts.on('-h', '--help', "Prints this help" ) do
+      opts.on('-h', '--help', "Print this help" ) do
         puts opts
         exit
       end

data/lib/morpheus/cli/commands/standard/tee_command.rb

@@ -0,0 +1,14 @@
+require 'morpheus/cli/cli_command'
+
+# This is for writing STDIN to files(s)
+class Morpheus::Cli::TeeCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :tee
+  set_command_hidden
+
+  def handle(args)
+    print_red_alert "#{command_name} is not yet supported"
+    return -1
+  end
+
+end

data/lib/morpheus/cli/credentials.rb

@@ -18,112 +18,183 @@ module Morpheus
         @appliance_url = appliance_url
       end
       
-      def request_credentials(opts = {})
-        #puts "request_credentials(#{opts})"
+      # request_credentials will fetch a credentials wallet (access_token, refresh_token, etc)
+      # By default this uses the saved credentials for the current appliance.
+      # If not logged in, it will prompt for username and password to
+      # authenticate with the /oauth/token API to receive an access_token.
+      # If :username and :password are passed, then
+      # Pass :remote_token to skip prompting and the auth api request.
+      # @param options - Hash of optional settings.
+      #   :username - Username for prompt.
+      #   :password - Password for prompt.
+      #   :remote_url - Use this url instead of the one from the current appliance. Credentials will not be saved.
+      #   :remote_token - Use this access_token, skip prompting and API request.
+      #   :remote_username - Username for authentication with --remote, skips saving credentials
+      #   :remote_password - Password for authentication with --remote, skips saving credentials
+      #   :test_only - Test only. Saved credentials will not be updated.
+      # @return Hash wallet like {"access_token":"ec68be138765...", "refresh_token":"ec68be138765..."} 
+      # or nil if unable to find credentials.
+      def request_credentials(options = {}, do_save=true)
+        #puts "request_credentials(#{options})"
         username = nil
         password = nil
-        access_token = nil
-        skip_save = false
+        wallet = nil
+
         
-        if opts[:remote_token]
+
+        if options[:remote_token]
+          # user passed in a token to login with.
+          # this should get token info from /oauth/token
+          # OR whoami should return other wallet info like access token or maybe just the expiration date
+          # for now, it just stores the access token without other wallet info
           begin
-            whoami_interface = Morpheus::WhoamiInterface.new(opts[:remote_token], nil, nil, @appliance_url)
+            whoami_interface = Morpheus::WhoamiInterface.new(options[:remote_token], nil, nil, @appliance_url)
+            if options[:dry_run]
+              print_dry_run whoami_interface.dry.get()
+              return nil
+            end
             whoami_response = whoami_interface.get()
-            if opts[:json]
+            if options[:json]
               print JSON.pretty_generate(whoami_response)
               print reset, "\n"
             end
-            access_token = opts[:remote_token]
+            # store mock /oauth/token  auth_interface.login() result
+            json_response = {'access_token' => options[:remote_token], 'token_type' => 'bearer'}
             username = whoami_response['user']['username']
-            unless skip_save
-              save_credentials(@appliance_name, access_token)
+            login_date = Time.now
+            expire_date = nil
+            if json_response['expires_in']
+              expire_date = login_date.to_i + json_response['expires_in'].to_i
             end
+            wallet = {
+              'username' => username, 
+              'login_date' => login_date.to_i,
+              'expire_date' => expire_date ? expire_date.to_i : nil,
+              'access_token' => json_response['access_token'], 
+              'refresh_token' => json_response['refresh_token'], 
+              'token_type' => json_response['token_type']
+            }
           rescue ::RestClient::Exception => e
             #raise e
             print_red_alert "Token not valid."
-            if opts[:debug] || opts[:debug]
-              print_rest_exception(e, opts)
+            if options[:debug] || options[:debug]
+              print_rest_exception(e, options)
             end
-            access_token = nil
+            wallet = nil
           end
         else
-        
-          if !opts[:remote_username].nil?
-            username = opts[:remote_username]
-            password = opts[:remote_password]
-            skip_save = opts[:remote_url] ? true : false
+          
+          # ok prompt for creds..
+          username = options['username'] || options[:username] || nil
+          password = options['password'] || options[:password] || nil
+          
+          if options[:remote_username]
+            username = options[:remote_username]
+            password = options[:remote_password]
+            if do_save == true
+              do_save = (options[:remote_url] ? false : true)
+            end
           else
-            access_token = load_saved_credentials
+            # maybe just if check if options[:test_only] != true
+            # if do_save == true
+            #   wallet = load_saved_credentials
+            # end  
           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"
-            end
-            if password.empty?
-              print "Password: #{required_blue_prompt} "
-              password = STDIN.noecho(&:gets).chomp!
-              print "\n"
-            else
-              print "Password: #{required_blue_prompt} \n"
+
+          if wallet.nil?
+            unless options[:quiet] || options[:no_prompt]
+              # if username.empty? || password.empty?
+                if options[:test_only]
+                  print "Test Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+                else
+                  print "Enter Morpheus Credentials for #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+                end
+              # end
+              if username.empty?
+                print "Username: #{required_blue_prompt} "
+                username = $stdin.gets.chomp!
+              else
+                print "Username: #{required_blue_prompt} #{username}\n"
+              end
+              if password.empty?
+                print "Password: #{required_blue_prompt} "
+                # wtf is this STDIN and $stdin and not my_terminal.stdin ?
+                password = STDIN.noecho(&:gets).chomp!
+                print "\n"
+              else
+                print "Password: #{required_blue_prompt} \n"
+              end
             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 username.empty? || password.empty?
+              print_red_alert "Username and password are required to login."
+              return nil
             end
-            access_token = json_response['access_token']
-            if access_token && access_token != ""
-              unless skip_save
-                save_credentials(@appliance_name, access_token)
+            begin
+              auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+              auth_interface.setopts(options)
+              if options[:dry_run]
+                print_dry_run auth_interface.dry.login(username, password)
+                return nil
               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)
-              json_response = JSON.parse(e.response.to_s)
-              error_msg = json_response['error_description'] || "Credentials not verified."
-              print_red_alert error_msg
-              if opts[:json]
-                json_response = JSON.parse(e.response.to_s)
+              json_response = auth_interface.login(username, password)
+              if options[:json]
                 print JSON.pretty_generate(json_response)
                 print reset, "\n"
               end
-            else
-              print_rest_exception(e, opts)
+              #wallet = json_response
+              login_date = Time.now
+              expire_date = nil
+              if json_response['expires_in']
+                expire_date = login_date.to_i + json_response['expires_in'].to_i
+              end
+              wallet = {
+                'username' => username, 
+                'login_date' => login_date.to_i,
+                'expire_date' => expire_date ? expire_date.to_i : nil,
+                'access_token' => json_response['access_token'], 
+                'refresh_token' => json_response['refresh_token'], 
+                'token_type' => json_response['token_type']
+              }
+
+            rescue ::RestClient::Exception => e
+              #raise e
+              if (e.response && e.response.code == 400)
+                json_response = JSON.parse(e.response.to_s)
+                error_msg = json_response['error_description'] || "Credentials not verified."
+                print_red_alert error_msg
+                if options[:json]
+                  json_response = JSON.parse(e.response.to_s)
+                  print JSON.pretty_generate(json_response)
+                  print reset, "\n"
+                end
+              else
+                print_rest_exception(e, options)
+              end
+              wallet = nil
             end
-            access_token = nil
-          end
 
+          end
         end
 
+        if do_save && @appliance_name
+
 
-        unless skip_save
           begin
-          # save pertinent session info to the appliance
+            # save pertinent session info to the appliance
+            save_credentials(@appliance_name, wallet)
             now = Time.now.to_i
             appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+            
+            if wallet && wallet['access_token']
+              save_credentials(@appliance_name, wallet)
+            else
+              clear_saved_credentials(@appliance_name)
+            end
             if appliance
-              if access_token
+              if wallet && wallet['access_token']
+                # save wallet to credentials file
+                save_credentials(@appliance_name, wallet)
+                # save appliances file
                 appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
                 appliance[:authenticated] = true
                 appliance[:username] = username
@@ -132,26 +203,37 @@ module Morpheus
                 appliance[:last_success_at] = now
                 ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
               else
+                # could be nice and not do this
+                #logout()
+                #save wallet to credentials file
+                clear_saved_credentials(@appliance_name)
                 now = Time.now.to_i
                 appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
                 appliance[:authenticated] = false
-                #appliance[:username] = username
+                old_username = appliance.delete(:username)
+                appliance[:last_logout_at] = Time.now.to_i
                 #appliance[:last_login_at] = now
                 #appliance[:error] = "Credentials not verified"
+                appliance.delete(:username)
                 ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+                if old_username
+                  print reset,"You have been automatically logged out. Goodbye #{old_username}!", reset, "\n"
+                end
               end
+
             end
           rescue => e
-            #puts "failed to update remote appliance config: (#{e.class}) #{e.message}"
+            Morpheus::Logging::DarkPrinter.puts "failed to update remote appliance config: (#{e.class}) #{e.message}"
+          ensure
+            #::Morpheus::Cli::Remote.recalculate_variable_map()
           end
         end
-
-        return access_token
+        
+        return wallet
       end
 
-      def login(opts = {})
-        clear_saved_credentials(@appliance_name)
-        request_credentials(opts)
+      def login(options = {}, do_save=true)
+        request_credentials(options, do_save)
       end
 
       def logout()
@@ -164,21 +246,123 @@ module Morpheus
           appliance[:last_logout_at] = Time.now.to_i
           ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
         end
+        ::Morpheus::Cli::Remote.recalculate_variable_map()
         true
       end
 
+      def use_refresh_token(options = {})
+        #puts "use_refresh_token(#{options})"
+        
+        wallet = load_saved_credentials
+
+        if wallet.nil?
+          print_red_alert yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
+          return nil
+        end
+
+        if wallet['refresh_token'].nil?
+          print_red_alert yellow,"No refresh token found for #{display_appliance(@appliance_name, @appliance_url)}",reset,"\n"
+          return nil
+        end
+
+
+        username = wallet['username']
+
+        begin
+          auth_interface.setopts(options)
+          auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+          if options[:dry_run]
+            print_dry_run auth_interface.dry.use_refresh_token(wallet['refresh_token'])
+            return nil
+          end
+          json_response = auth_interface.use_refresh_token(wallet['refresh_token'])
+          #wallet = json_response
+          login_date = Time.now
+          expire_date = nil
+          if json_response['expires_in']
+            expire_date = login_date.to_i + json_response['expires_in'].to_i
+          end
+          wallet = {
+            'username' => username, 
+            'login_date' => login_date.to_i,
+            'expire_date' => expire_date ? expire_date.to_i : nil,
+            'access_token' => json_response['access_token'], 
+            'refresh_token' => json_response['refresh_token'], 
+            'token_type' => json_response['token_type']
+          }
+          
+        rescue ::RestClient::Exception => e
+          #raise e
+          if (e.response && e.response.code == 400)
+            json_response = JSON.parse(e.response.to_s)
+            error_msg = json_response['error_description'] || "Refresh token not valid."
+            print_red_alert error_msg
+            if options[:json]
+              json_response = JSON.parse(e.response.to_s)
+              print JSON.pretty_generate(json_response)
+              print reset, "\n"
+            end
+          else
+            print_rest_exception(e, options)
+          end
+          wallet = nil
+        end
+
+        # save wallet to credentials file
+        save_credentials(@appliance_name, wallet)
+
+        begin
+        # save pertinent session info to the appliance
+          now = Time.now.to_i
+          appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+          if appliance
+            if wallet && wallet['access_token']
+              appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+              appliance[:authenticated] = true
+              appliance[:username] = username
+              appliance[:status] = "ready"
+              appliance[:last_login_at] = now
+              appliance[:last_success_at] = now
+              ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+            else
+              now = Time.now.to_i
+              appliance = ::Morpheus::Cli::Remote.load_remote(@appliance_name)
+              appliance[:authenticated] = false
+              #appliance[:username] = username
+              #appliance[:last_login_at] = now
+              #appliance[:error] = "Credentials not verified"
+              ::Morpheus::Cli::Remote.save_remote(@appliance_name, appliance)
+            end
+          end
+        rescue => e
+          Morpheus::Logging::DarkPrinter.puts "failed to update remote appliance config: (#{e.class}) #{e.message}"
+        end
+        
+        
+        return wallet
+      end
+
       def clear_saved_credentials(appliance_name)
         @@appliance_credentials_map = load_credentials_file || {}
-        @@appliance_credentials_map.delete(appliance_name)
+        @@appliance_credentials_map.delete(appliance_name.to_s)
+        @@appliance_credentials_map.delete(appliance_name.to_sym)
         Morpheus::Logging::DarkPrinter.puts "clearing credentials for #{appliance_name} from file #{credentials_file_path}" if Morpheus::Logging.debug?
         File.open(credentials_file_path, 'w') {|f| f.write @@appliance_credentials_map.to_yaml } #Store
+        ::Morpheus::Cli::Remote.recalculate_variable_map()
+        true
       end
 
       def load_saved_credentials(reload=false)
         if reload || !defined?(@@appliance_credentials_map) || @@appliance_credentials_map.nil?
           @@appliance_credentials_map = load_credentials_file || {}
         end
-        return @@appliance_credentials_map[@appliance_name]
+        # ok, we switched  symbols to strings, because symbols suck in yaml! need to support both
+        # also we switched from just a token (symbol) to a whole object of strings
+        wallet = @@appliance_credentials_map[@appliance_name.to_s] || @@appliance_credentials_map[@appliance_name.to_sym]
+        if wallet.is_a?(String)
+          wallet = {'access_token' => wallet}
+        end
+        return wallet
       end
 
       def load_credentials_file
@@ -195,14 +379,19 @@ module Morpheus
         File.join(Morpheus::Cli.home_directory, "credentials")
       end
 
-      def save_credentials(appliance_name, token)
-        # credential_map = appliance_credentials_map
+      # credentials wallet is {'access_token': '...', 'refresh_token': '...' 'expiration': '2019-01-01...'}
+      def save_credentials(appliance_name, wallet)
         # reloading file is better for now, otherwise you can lose credentials with multiple shells.
         credential_map = load_credentials_file || {}
-        if credential_map.nil?
-          credential_map = {}
+        
+        if wallet
+          credential_map[appliance_name.to_s] = wallet
+        else
+          # nil mean remove the damn thing
+          credential_map.delete(appliance_name.to_s)
         end
-        credential_map[appliance_name] = token
+        # always remove symbol, which was used pre 3.6.9
+        credential_map.delete(appliance_name.to_sym)
         begin
           fn = credentials_file_path
           if !Dir.exists?(File.dirname(fn))