Auth fix (#141)

* Skip 2FA enable prompt for accounts that did not yet enable it
* Update rubocop to support Ruby 2.6

Author: lpusok

.rubocop.yml

@@ -3,3 +3,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
     - '_tmp/**/*'
+
+Style/FrozenStringLiteralComment:
+  Enabled: False
+
+Style/NumericPredicate:
+  Exclude:
+    - 'lib/autoprovision/portal/profile_client.rb'

.rubocop_todo.yml

@@ -1,12 +1,58 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-02-19 13:51:31 +0100 using RuboCop version 0.58.2.
+# on 2021-02-08 17:52:56 +0100 using RuboCop version 0.61.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 33
+# Offense count: 42
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/AlignHash:
+  Exclude:
+    - 'lib/autoprovision/portal/app_client.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/autoprovision/auth_data.rb'
+    - 'lib/autoprovision/certificate_helper.rb'
+    - 'lib/autoprovision/device.rb'
+    - 'lib/autoprovision/portal/app_client.rb'
+    - 'lib/autoprovision/portal/common.rb'
+    - 'lib/autoprovision/portal/device_client.rb'
+    - 'lib/autoprovision/project_helper.rb'
+    - 'log/log.rb'
+    - 'params.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Exclude:
+    - 'main.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'log/log.rb'
+    - 'main.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingBlankLines:
+  Exclude:
+    - 'main.rb'
+
+# Offense count: 32
 Metrics/AbcSize:
   Max: 65
 
@@ -25,8 +71,8 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 18
 
-# Offense count: 36
-# Configuration parameters: CountComments.
+# Offense count: 35
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 61
 
@@ -35,7 +81,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 8
 
-# Offense count: 13
+# Offense count: 14
 Metrics/PerceivedComplexity:
   Max: 22
 
@@ -45,13 +91,6 @@ Style/BlockComments:
   Exclude:
     - 'spec/spec_helper.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: each, for
-Style/For:
-  Exclude:
-    - 'lib/autoprovision/device.rb'
-
 # Offense count: 1
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -65,7 +104,7 @@ Style/IfUnlessModifier:
     - 'lib/autoprovision/certificate_helper.rb'
     - 'lib/autoprovision/profile_helper.rb'
 
-# Offense count: 4
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
@@ -74,9 +113,18 @@ Style/RescueStandardError:
     - 'lib/autoprovision/portal/device_client.rb'
     - 'lib/autoprovision/portal/profile_client.rb'
     - 'lib/autoprovision/profile_helper.rb'
+    - 'main.rb'
     - 'step.rb'
 
-# Offense count: 229
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Exclude:
+    - 'main.rb'
+
+# Offense count: 231
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:

Gemfile

@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'fastlane'
+gem 'fastlane', '2.173.0'
 gem 'openssl'
 gem 'plist'
 gem 'xcodeproj'
 
 group :test do
   gem 'rspec'
-  gem 'rubocop', '0.58.2'
+  gem 'rubocop', '0.61.1'
 end

Gemfile.lock

@@ -1,23 +1,24 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    artifactory (3.0.15)
+    ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.382.0)
-    aws-sdk-core (3.109.1)
+    aws-partitions (1.424.0)
+    aws-sdk-core (3.112.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.42.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.88.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
@@ -31,24 +32,28 @@ GEM
     declarative (0.0.20)
     declarative-option (0.1.0)
     diff-lcs (1.4.4)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.0.0)
-    excon (0.76.0)
-    faraday (1.0.1)
+    emoji_regex (3.2.1)
+    excon (0.79.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-net_http (1.0.1)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.163.0)
+    fastimage (2.2.2)
+    fastlane (2.173.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
+      artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
@@ -91,20 +96,35 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
+    google-apis-core (0.2.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.14)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      rexml
+      signet (~> 0.14)
+      webrick
+    google-apis-iamcredentials_v1 (0.1.0)
+      google-apis-core (~> 0.1)
+    google-apis-storage_v1 (0.1.0)
+      google-apis-core (~> 0.1)
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.4.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
+    google-cloud-storage (1.30.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.14.0)
+    googleauth (0.15.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -117,56 +137,58 @@ GEM
     httpclient (2.8.3)
     jaro_winkler (1.5.4)
     jmespath (1.4.0)
-    json (2.3.1)
+    json (2.5.1)
     jwt (2.2.2)
     memoist (0.16.2)
-    mini_magick (4.10.1)
+    mini_magick (4.11.0)
     mini_mime (1.0.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    naturally (2.2.0)
+    naturally (2.2.1)
     openssl (2.2.0)
     os (1.1.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
-    plist (3.5.0)
-    powerpack (0.1.2)
+    plist (3.6.0)
+    powerpack (0.1.3)
     public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.4)
     rouge (2.0.7)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.3)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.58.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (0.61.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     security (0.1.3)
-    signet (0.14.0)
+    signet (0.14.1)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
@@ -186,7 +208,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.4.1)
+    webrick (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -196,18 +219,18 @@ GEM
       nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastlane
+  fastlane (= 2.173.0)
   openssl
   plist
   rspec
-  rubocop (= 0.58.2)
+  rubocop (= 0.61.1)
   xcodeproj
 
 BUNDLED WITH

lib/autoprovision/portal/auth_client.rb

@@ -5,6 +5,7 @@ module Portal
   class AuthClient
     def self.login(username, password, two_factor_session = nil, team_id = nil)
       ENV['FASTLANE_SESSION'] = two_factor_session unless two_factor_session.to_s.empty?
+      ENV['SPACESHIP_SKIP_2FA_UPGRADE'] = '1'
 
       client = Spaceship::Portal.login(username, password)