brightbox-cli 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f27bf83c2b327b366e844aeb2a3d3f6734689870
-  data.tar.gz: 8184ccc9096fbc3117807938aca84b0c71224d49
+  metadata.gz: 64b6a83d3028b61fae3934610acd34693072a1ba
+  data.tar.gz: 3aaca9503b8091d98c4e896b733bbf4e50dc3434
 SHA512:
-  metadata.gz: 961e3af440fb8e7614d47f52d60ab5ec05af1563a07e28f702f78dc25414016252b14aa580ee16c009844f9db2be737b3c7bef1418ee9db7e20eac55383dd8e8
-  data.tar.gz: 0c61aef7964334ececb2cd7c57351fec449a20638bbc30238badeaf4ca051fe076fcd8165d3445b23f3ebb602bd2adcbb31a6488b9e639717d20e546bab0d47b
+  metadata.gz: 44ceff7d8ffe9093fc1237ac5838664a961b8c704ea55569b107109f924251bcb8cb36ac7932b7ca5f06619e1c33c3251a35ad28354e4ec51d6cc192e2b13dd0
+  data.tar.gz: 6c57722ae172093641fedae161d45c0520811f495c29407718d1839dd3eb0fee64e83f626243c8cfe9f5a2eb0cd0694052fabf7315c4400db416f7134d59f41f

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### v2.3.2 / 2015-10-26
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.3.1...v2.3.2)
+
+Bug fixes:
+
+* Fix issue when `login` command prompt twice for password (or prompt once even
+  when already supplied) due to reusing cached but expired refresh token.
+
 ### v2.3.1 / 2015-10-26
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.3.0...v2.3.1)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (2.3.1)
+    brightbox-cli (2.3.2)
       fog-brightbox (>= 0.9.0)
       gli (~> 2.12.0)
       highline (~> 1.6.0)

data/lib/brightbox-cli/config/authentication_tokens.rb

@@ -224,15 +224,35 @@ module Brightbox
           f.write token
         end
         # Move process version into place
+        debug "Saving #{token} to #{filename}"
         FileUtils.mv filename + ".#{$PID}", filename
       end
 
       def cached_access_token
         File.open(access_token_filename, "r") { |fl| fl.read.chomp }
+      rescue Errno::ENOENT
+        nil
       end
 
       def cached_refresh_token
         File.open(refresh_token_filename, "r") { |fl| fl.read.chomp }
+      rescue Errno::ENOENT
+        nil
+      end
+
+      def remove_cached_tokens!
+        remove_access_token!
+        remove_refresh_token!
+      end
+
+      def remove_access_token!
+        @access_token = nil
+        FileUtils.rm(access_token_filename) if File.exist?(access_token_filename)
+      end
+
+      def remove_refresh_token!
+        @refresh_token = nil
+        FileUtils.rm(refresh_token_filename) if File.exist?(refresh_token_filename)
       end
 
       private

data/lib/brightbox-cli/config/sections.rb

@@ -33,14 +33,16 @@ module Brightbox
 
         dirty!
 
-        self.client_name = client_alias
+        self.client_name = config_alias
+
+        debug "Using #{client_name}"
 
         # Renew tokens via config...
         #
         # Part of the "login" behaviour is to always refresh them
         #
         begin
-          flush_access_token!
+          remove_cached_tokens!
           renew_tokens(:client_name => config_alias, :password => password)
         rescue => e
           error "Something went wrong trying to refresh new tokens #{e.message}"

data/lib/brightbox-cli/config.rb

@@ -85,9 +85,9 @@ module Brightbox
     #
     def debug_tokens
       if ENV["DEBUG"]
-        debug "Access token: #{access_token}"
+        debug "Access token: #{access_token} (#{cached_access_token})"
         if using_application?
-          debug "Refresh token: #{refresh_token}"
+          debug "Refresh token: #{refresh_token} (#{cached_refresh_token}))"
         else
           debug "Refresh token: <NOT EXPECTED FOR CLIENT>"
         end

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "2.3.1" unless defined?(Brightbox::VERSION)
+  VERSION = "2.3.2" unless defined?(Brightbox::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - John Leach