abt-cli 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1631b9069ca5094ba301eb3ccc5cf42da8e48a85b2678e8499cea1e9e4551c
-  data.tar.gz: cd9dc57e8a6276de5a2bca61e59fb537bc8887901615d7ec86f2c4a59145f76c
+  metadata.gz: f61e3ba3cf1e1f6b5b69502861814a80b763849a7a9e8d654a593b55bf53b1bb
+  data.tar.gz: 497d18071f5a32cc4df92d2075a097452ffa2ffbf7f97ab98916678e6c92fa31
 SHA512:
-  metadata.gz: bdca57213f85db7a3604ac1a5ed50a16a2918fded5b3b3e090e52aeb184414345d7609f08ef5145f205cf3fb9f1576f9e0aaa6b25a2e41684cfd506bed19e851
-  data.tar.gz: d7eb95a22516aa0f894262e0a1b52ee659736b88775936040a87db03260711e12dbc6764674799b5d2f8bdb86cb14495f01440a0703d300759c3482db17a810a
+  metadata.gz: fa028736b67c70cd694a6e75665136e7829865d7afe66828262eae903aa553d5dc92478957e9e36526669f96fde1aa42ccab0036e2c1319f6db6cc47cfd033e4
+  data.tar.gz: 01af79206699568177e2548cd2662012f63ea996c6289a7dc49795fb99f06ff157692a51df444505336c3851a1f562a63fef659ca046e03579e11123b1e8a7ba

data/bin/abt

@@ -1,12 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'dry-inflector'
-require 'faraday'
-require 'oj'
-require 'open3'
-require 'stringio'
-
 require_relative '../lib/abt.rb'
 
 begin

data/lib/abt.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require 'dry-inflector'
+require 'faraday'
+require 'oj'
+require 'open3'
+require 'stringio'
+
 Dir.glob("#{File.dirname(File.absolute_path(__FILE__))}/abt/*.rb").sort.each do |file|
   require file
 end

data/lib/abt/git_config.rb

@@ -4,13 +4,17 @@ module Abt
   class GitConfig
     attr_reader :namespace, :scope
 
+    LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND = 'git config --local -l'
+
     def self.local_available?
-      @local_available ||= begin
-        status = nil
-        Open3.popen3('git config --local -l') do |_i, _o, _e, thread|
-          status = thread.value
+      return @local_available if instance_variables.include?(:@local_available)
+
+      @local_available = begin
+        success = false
+        Open3.popen3(LOCAL_CONFIG_AVAILABLE_CHECK_COMMAND) do |_i, _o, _e, thread|
+          success = thread.value.success?
         end
-        status.success?
+        success
       end
     end
 

data/lib/abt/providers/devops/api.rb

@@ -6,13 +6,16 @@ module Abt
       class Api
         VERBS = %i[get post put].freeze
 
-        attr_reader :organization_name, :project_name, :username, :access_token
+        CONDITIONAL_ACCESS_POLICY_ERROR_CODE = 'VS403463'
 
-        def initialize(organization_name:, project_name:, username:, access_token:)
+        attr_reader :organization_name, :project_name, :username, :access_token, :cli
+
+        def initialize(organization_name:, project_name:, username:, access_token:, cli:)
           @organization_name = organization_name
           @project_name = project_name
           @username = username
           @access_token = access_token
+          @cli = cli
         end
 
         VERBS.each do |verb|
@@ -50,6 +53,8 @@ module Abt
             encoded_response_body = response.body.force_encoding('utf-8')
             raise error_class, "Code: #{response.status}, body: #{encoded_response_body}"
           end
+        rescue Abt::HttpError::ForbiddenError => e
+          handle_denied_by_conditional_access_policy!(e)
         end
 
         def base_url
@@ -71,6 +76,19 @@ module Abt
             connection.headers['Accept'] = 'application/json; api-version=6.0'
           end
         end
+
+        private
+
+        def handle_denied_by_conditional_access_policy!(exception)
+          raise exception unless exception.message.include?(CONDITIONAL_ACCESS_POLICY_ERROR_CODE)
+
+          cli.abort <<~TXT
+            Access denied by conditional access policy.
+            Try logging into the board using the URL below, then retry the command.
+
+            #{base_url}
+          TXT
+        end
       end
     end
   end

data/lib/abt/providers/devops/base_command.rb

@@ -89,7 +89,8 @@ module Abt
           Abt::Providers::Devops::Api.new(organization_name: organization_name,
                                           project_name: project_name,
                                           username: config.username_for_organization(organization_name),
-                                          access_token: config.access_token_for_organization(organization_name))
+                                          access_token: config.access_token_for_organization(organization_name),
+                                          cli: cli)
         end
       end
     end

data/lib/abt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Abt
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abt-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Jesper Sørensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector