morpheus-cli 3.3.1.3 → 3.3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6dca5394d3b291c04ad94c20fd9070c3edf671c1
4
- data.tar.gz: 0ff1d952e7bb43abab664b76070fa6e3caf0040b
3
+ metadata.gz: a23c45d977fafe0f6d89214d6785de7c9a94718e
4
+ data.tar.gz: 33fea09ecb5ac3b197cbe3794e785b15e610c214
5
5
  SHA512:
6
- metadata.gz: 180055da960a32d3f91d62c0e14d3b2f17bff1d62583bed8996e1c293f032813e4a8cce9b31b61516ab633cbc4bbc727b75eeb3acaf8cc3761f156113984b648
7
- data.tar.gz: 81f35079f2e9bb2996326aa3cc2b6a054985618202c9dfd50730f556ade6a5111994c596614f4a5061d74aceeba021bff4f5ee5bf591fd30f6920cd59e73bef0
6
+ metadata.gz: 1e20f8ab9732cebfaf83f7ac06d52cb9baf95e979c2efe4cde68cf6e50a3d97371c23bab1c97eb2096d6dcf82b33919be8c8854113f84d9b82cac97ab7953f2e
7
+ data.tar.gz: a04eba1bc86c24b88f144e272ba3d0bf6182296460a093097ab39a66b3924bed03e1bd3964909678db2238e357c840f553628b767c3cc652c01ad36a5d833e96
@@ -628,16 +628,19 @@ module Morpheus
628
628
  # this prompts for username, password without options[:no_prompt]
629
629
  # used saved credentials please
630
630
  @api_credentials = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url)
631
- @access_token = @api_credentials.load_saved_credentials()
632
- if @access_token.to_s.empty?
633
- unless options[:no_prompt]
634
- @access_token = @api_credentials.request_credentials(options)
631
+ if options[:remote_token]
632
+ @access_token = options[:remote_token]
633
+ else
634
+ @access_token = @api_credentials.load_saved_credentials()
635
+ if @access_token.to_s.empty?
636
+ unless options[:no_prompt]
637
+ @access_token = @api_credentials.request_credentials(options)
638
+ end
639
+ end
640
+ # bail if we got nothing still
641
+ unless options[:skip_verify_access_token]
642
+ verify_access_token!
635
643
  end
636
- end
637
-
638
- # bail if we got nothing still
639
- unless options[:skip_verify_access_token]
640
- verify_access_token!
641
644
  end
642
645
 
643
646
  # ok, connect to the appliance.. actually this just instantiates an ApiClient
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Morpheus
3
3
  module Cli
4
- VERSION = "3.3.1.3"
4
+ VERSION = "3.3.1.4"
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: morpheus-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.1.3
4
+ version: 3.3.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Estes
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2018-03-31 00:00:00.000000000 Z
14
+ date: 2018-04-06 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: bundler