Merge branch 'develop'

UffizziCloud · Aug 15, 2023 · df05d7a · df05d7a
2 parents 23f6d2e + aa90396
commit df05d7a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.0.19)
+    uffizzi-cli (2.0.20)
       activesupport
       awesome_print
       faker

diff --git a/lib/uffizzi/auth_helper.rb b/lib/uffizzi/auth_helper.rb
@@ -10,6 +10,7 @@ def signed_in?
       def sign_out
         Uffizzi::ConfigFile.unset_option(:cookie)
         Uffizzi::ConfigFile.unset_option(:account)
+        Uffizzi::ConfigFile.unset_option(:project)
         Uffizzi::Token.delete if Uffizzi::Token.exists?
       end
 

diff --git a/lib/uffizzi/cli/login.rb b/lib/uffizzi/cli/login.rb
@@ -20,23 +20,14 @@ def initialize(options)
     end
 
     def run
-      logout
+      AuthHelper.sign_out if AuthHelper.signed_in?
       return perform_email_login if @options[:email]
 
       perform_browser_login
     end
 
     private
 
-    def logout
-      return unless Uffizzi::AuthHelper.signed_in?
-
-      server = ConfigFile.read_option(:server)
-      destroy_session(server)
-
-      AuthHelper.sign_out
-    end
-
     def perform_email_login
       Uffizzi.ui.say('Login to Uffizzi server.')
       username =  Uffizzi::LoginHelper.set_username(@options)

diff --git a/lib/uffizzi/version.rb b/lib/uffizzi/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.0.19'
+  VERSION = '2.0.20'
 end
diff --git a/test/support/auth_support.rb b/test/support/auth_support.rb
@@ -20,5 +20,6 @@ def prepare_config_data(account, cookie)
   def sign_out
     Uffizzi::ConfigFile.unset_option(:cookie)
     Uffizzi::ConfigFile.unset_option(:account)
+    Uffizzi::ConfigFile.unset_option(:project)
   end
 end
diff --git a/test/uffizzi/cli/logout_test.rb b/test/uffizzi/cli/logout_test.rb
@@ -9,8 +9,10 @@ def setup
   end
 
   def test_logout_success
+    Uffizzi::ConfigFile.write_option(:project, 'default')
     assert(Uffizzi::ConfigFile.option_has_value?(:cookie))
     assert(Uffizzi::ConfigFile.option_has_value?(:account))
+    assert(Uffizzi::ConfigFile.option_has_value?(:project))
 
     stubbed_uffizzi_logout = stub_uffizzi_logout
 
@@ -20,6 +22,7 @@ def test_logout_success
 
     refute(Uffizzi::ConfigFile.option_has_value?(:cookie))
     refute(Uffizzi::ConfigFile.option_has_value?(:account))
+    refute(Uffizzi::ConfigFile.option_has_value?(:project))
   end
 
   def test_logout_when_not_logged_in