Merge pull request #356 from UffizziCloud/feature/347_improve_auth_logic

[347] improved auth logic

lib/uffizzi/auth_helper.rb

@@ -4,7 +4,7 @@ module Uffizzi
   module AuthHelper
     class << self
       def signed_in?
-        config_data_exists? || Uffizzi::Token.exists?
+        config_data_exists? && authorized?
       end
 
       def sign_out
@@ -16,13 +16,25 @@ def sign_out
         Uffizzi::Token.delete if Uffizzi::Token.exists?
       end
 
+      def check_login(project_option)
+        raise Uffizzi::Error.new('You are not logged in. Run `uffizzi login`.') unless signed_in?
+        raise Uffizzi::Error.new('This command needs project to be set in config file') unless project_set?(project_option)
+      end
+
       private
 
       def config_data_exists?
         ConfigFile.exists? &&
-          ConfigFile.option_has_value?(:account) &&
-          ConfigFile.option_has_value?(:cookie) &&
-          ConfigFile.option_has_value?(:server)
+          ConfigFile.option_has_value?(:server) &&
+          ConfigFile.option_has_value?(:account)
+      end
+
+      def authorized?
+        ConfigFile.option_has_value?(:cookie) || Uffizzi::Token.exists?
+      end
+
+      def project_set?(project_option)
+        !project_option.nil? || (Uffizzi::ConfigFile.exists? && Uffizzi::ConfigFile.option_has_value?(:project))
       end
     end
   end

lib/uffizzi/cli/account.rb

@@ -25,7 +25,7 @@ def set_default(account_name)
     private
 
     def run(command, account_name = nil)
-      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       case command
       when 'list'

lib/uffizzi/cli/cluster.rb

@@ -6,7 +6,6 @@
 require 'uffizzi/auth_helper'
 require 'uffizzi/helpers/config_helper'
 require 'uffizzi/services/preview_service'
-require 'uffizzi/services/command_service'
 require 'uffizzi/services/cluster_service'
 require 'uffizzi/services/kubeconfig_service'
 require 'uffizzi/services/cluster/disconnect_service'
@@ -65,9 +64,7 @@ def disconnect
 
     def run(command, command_args = {})
       Uffizzi.ui.output_format = options[:output]
-      raise Uffizzi::Error.new('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      raise Uffizzi::Error.new('This command needs project to be set in config file') unless CommandService.project_set?(options)
-
+      Uffizzi::AuthHelper.check_login(options[:project])
       project_slug = options[:project].nil? ? ConfigFile.read_option(:project) : options[:project]
 
       case command
@@ -335,7 +332,6 @@ def handle_succeed_create_response(cluster_data)
     end
 
     def save_kubeconfig(kubeconfig, kubeconfig_path)
-      kubeconfig_path = kubeconfig_path.nil? ? KubeconfigService.default_path : kubeconfig_path
       is_update_current_context = options[:'update-current-context']
 
       KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
@@ -354,6 +350,8 @@ def save_kubeconfig(kubeconfig, kubeconfig_path)
           merged_kubeconfig
         end
       end
+
+      Uffizzi.ui.say("Kubeconfig was updated by the path: #{kubeconfig_path}") if is_update_current_context
     end
 
     def update_clusters_config(id, params)

lib/uffizzi/cli/dev.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'uffizzi/services/command_service'
 require 'uffizzi/services/cluster_service'
 require 'uffizzi/services/dev_service'
 require 'uffizzi/services/kubeconfig_service'
+require 'uffizzi/auth_helper'
 
 module Uffizzi
   class Cli::Dev < Thor
@@ -14,10 +14,10 @@ class Cli::Dev < Thor
     method_option :'default-repo', type: :string
     method_option :kubeconfig, type: :string
     def start(config_path = 'skaffold.yaml')
+      Uffizzi::AuthHelper.check_login(options[:project])
       DevService.check_skaffold_existence
       DevService.check_running_daemon if options[:quiet]
       DevService.check_skaffold_config_existence(config_path)
-      check_login
       cluster_id, cluster_name = start_create_cluster
       kubeconfig = wait_cluster_creation(cluster_name)
 
@@ -49,11 +49,6 @@ def stop
 
     private
 
-    def check_login
-      raise Uffizzi::Error.new('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      raise Uffizzi::Error.new('This command needs project to be set in config file') unless CommandService.project_set?(options)
-    end
-
     def start_create_cluster
       cluster_name = ClusterService.generate_name
       creation_source = ClusterService::MANUAL_CREATION_SOURCE

lib/uffizzi/cli/preview.rb

@@ -3,7 +3,6 @@
 require 'uffizzi'
 require 'uffizzi/auth_helper'
 require 'uffizzi/services/preview_service'
-require 'uffizzi/services/command_service'
 require 'uffizzi/services/github_service'
 
 module Uffizzi
@@ -55,8 +54,7 @@ def events(deployment_name)
 
     def run(command, file_path: nil, deployment_name: nil)
       Uffizzi.ui.output_format = options[:output]
-      raise Uffizzi::Error.new('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      raise Uffizzi::Error.new('This command needs project to be set in config file') unless CommandService.project_set?(options)
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       project_slug = options[:project].nil? ? ConfigFile.read_option(:project) : options[:project]
 

lib/uffizzi/cli/preview/service.rb

@@ -4,16 +4,14 @@
 require 'uffizzi/auth_helper'
 require 'uffizzi/response_helper'
 require 'uffizzi/services/preview_service'
-require 'uffizzi/services/command_service'
 
 module Uffizzi
   class Cli::Preview::Service < Thor
     include ApiClient
 
     desc 'logs [LOGS_TYPE] [DEPLOYMENT_ID] [CONTAINER_NAME]', 'Show the logs for a container service of a preview'
     def logs(logs_type, deployment_name, container_name = args)
-      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      return Uffizzi.ui.say('This command needs project to be set in config file') unless CommandService.project_set?(options)
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       deployment_id = PreviewService.read_deployment_id(deployment_name)
       response = service_logs_response(logs_type, deployment_id, container_name)
@@ -28,8 +26,7 @@ def logs(logs_type, deployment_name, container_name = args)
 
     desc 'list [DEPLOYMENT_ID]', 'List the container services of a given compose environment (preview)'
     def list(deployment_name)
-      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      return Uffizzi.ui.say('This command needs project to be set in config file') unless CommandService.project_set?(options)
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       project_slug = options[:project].nil? ? ConfigFile.read_option(:project) : options[:project]
       server = ConfigFile.read_option(:server)

lib/uffizzi/cli/project.rb

@@ -55,7 +55,7 @@ def delete(project_slug)
     private
 
     def run(command, project_slug: nil)
-      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       case command
       when 'list'

lib/uffizzi/cli/project/compose.rb

@@ -5,7 +5,6 @@
 require 'uffizzi/response_helper'
 require 'uffizzi/services/compose_file_service'
 require 'uffizzi/services/env_variables_service'
-require 'uffizzi/services/command_service'
 
 module Uffizzi
   class Cli::Project::Compose < Thor
@@ -29,8 +28,7 @@ def describe
     private
 
     def run(command)
-      return Uffizzi.ui.say('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
-      return Uffizzi.ui.say('This command needs project to be set in config file') unless CommandService.project_set?(options)
+      Uffizzi::AuthHelper.check_login(options[:project])
 
       project_slug = options[:project].nil? ? ConfigFile.read_option(:project) : options[:project]
       file_path = options[:file]

test/uffizzi/cli/account_test.rb

@@ -5,6 +5,7 @@
 class AccountTest < Minitest::Test
   def setup
     @account = Uffizzi::Cli::Account.new
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
 
     sign_in
   end

test/uffizzi/cli/cluster_test.rb

@@ -11,7 +11,7 @@ def setup
     Uffizzi.stubs(:prompt).returns(@mock_prompt)
 
     sign_in
-    Uffizzi::ConfigFile.write_option(:project, 'dbp')
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
     @project_slug = Uffizzi::ConfigFile.read_option(:project)
     ENV['GITHUB_OUTPUT'] = '/tmp/.env'
     ENV['GITHUB_ACTIONS'] = 'true'

test/uffizzi/cli/dev_test.rb

@@ -11,7 +11,7 @@ def setup
     Uffizzi.stubs(:prompt).returns(@mock_prompt)
 
     sign_in
-    Uffizzi::ConfigFile.write_option(:project, 'dbp')
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
     @project_slug = Uffizzi::ConfigFile.read_option(:project)
     tmp_dir_name = (Time.now.utc.to_f * 100_000).to_i
     @kubeconfig_path = "/tmp/test/#{tmp_dir_name}/test-kubeconfig.yaml"

test/uffizzi/cli/preview/service_test.rb

@@ -7,7 +7,7 @@ def setup
     @service = Uffizzi::Cli::Preview::Service.new
 
     sign_in
-    Uffizzi::ConfigFile.write_option(:project, 'dbp')
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
     @project_slug = Uffizzi::ConfigFile.read_option(:project)
   end
 

test/uffizzi/cli/preview_test.rb

@@ -7,7 +7,7 @@ def setup
     @preview = Uffizzi::Cli::Preview.new
 
     sign_in
-    Uffizzi::ConfigFile.write_option(:project, 'dbp')
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
     @project_slug = Uffizzi::ConfigFile.read_option(:project)
     ENV.delete('IMAGE')
     ENV.delete('CONFIG_SOURCE')

test/uffizzi/cli/project/compose_test.rb

@@ -7,7 +7,7 @@ def setup
     @compose = Uffizzi::Cli::Project::Compose.new
 
     sign_in
-    Uffizzi::ConfigFile.write_option(:project, 'dbp')
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
     @project_slug = Uffizzi::ConfigFile.read_option(:project)
     ENV.delete('IMAGE')
     ENV.delete('CONFIG_SOURCE')

test/uffizzi/cli/project_test.rb

@@ -5,6 +5,7 @@
 class ProjectsTest < Minitest::Test
   def setup
     @project = Uffizzi::Cli::Project.new
+    Uffizzi::ConfigFile.write_option(:project, 'uffizzi')
 
     sign_in
   end