fastlane 2.172.0 → 2.177.0

data/spaceship/lib/spaceship/connect_api/token.rb

@@ -40,7 +40,7 @@ module Spaceship
         self.create(json)
       end
 
-      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, is_key_content_base64: false, duration: nil, in_house: nil)
+      def self.create(key_id: nil, issuer_id: nil, filepath: nil, key: nil, is_key_content_base64: false, duration: nil, in_house: nil, **)
         key_id ||= ENV['SPACESHIP_CONNECT_API_KEY_ID']
         issuer_id ||= ENV['SPACESHIP_CONNECT_API_ISSUER_ID']
         filepath ||= ENV['SPACESHIP_CONNECT_API_KEY_FILEPATH']

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -381,6 +381,11 @@ module Spaceship
           tunes_request_client.post("appPreviewSets", body)
         end
 
+        def delete_app_preview_set(app_preview_set_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appPreviewSets/#{app_preview_set_id}", params)
+        end
+
         def patch_app_preview_set_previews(app_preview_set_id: nil, app_preview_ids: nil)
           app_preview_ids ||= []
 
@@ -515,6 +520,11 @@ module Spaceship
           tunes_request_client.patch("appScreenshotSets/#{app_screenshot_set_id}/relationships/appScreenshots", body)
         end
 
+        def delete_app_screenshot_set(app_screenshot_set_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("appScreenshotSets/#{app_screenshot_set_id}", params)
+        end
+
         #
         # appScreenshots
         #
@@ -757,6 +767,11 @@ module Spaceship
           tunes_request_client.get("appStoreVersions/#{app_store_version_id}/appStoreVersionLocalizations", params)
         end
 
+        def get_app_store_version_localization(app_store_version_localization_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("appStoreVersionLocalizations/#{app_store_version_localization_id}", params)
+        end
+
         def post_app_store_version_localization(app_store_version_id: nil, attributes: {})
           body = {
             data: {

data/spaceship/lib/spaceship/playground.rb

@@ -13,8 +13,8 @@ module Spaceship
       rescue Gem::LoadError
         puts("Could not find gem 'pry'".red)
         puts("")
-        puts("If you installed spaceship using `sudo gem install spaceship` run")
-        puts("  sudo gem install pry".yellow)
+        puts("If you installed spaceship using `gem install spaceship` run")
+        puts("  gem install pry".yellow)
         puts("to install the missing gem")
         puts("")
         puts("If you use a Gemfile add this to your Gemfile:")

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -579,10 +579,10 @@ module Spaceship
       }
 
       r = request(:post) do |req|
-        req.url("https://analytics.itunes.apple.com/analytics/api/v1/data/time-series")
+        req.url("https://appstoreconnect.apple.com/analytics/api/v1/data/time-series")
         req.body = data.to_json
         req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Requested-By'] = 'analytics.itunes.apple.com'
+        req.headers['X-Requested-By'] = 'appstoreconnect.apple.com'
       end
 
       data = parse_response(r)

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -4,7 +4,7 @@ require_relative 'tunes/tunes_client'
 module Spaceship
   class Client
     def handle_two_step_or_factor(response)
-      raise "2FA can only be performed in interactive mode" if ENV["FASTLANE_IS_INTERACTIVE"] == "false"
+      raise "2FA can only be performed in interactive mode" if ENV["SPACESHIP_ONLY_ALLOW_INTERACTIVE_2FA"] == "true" && ENV["FASTLANE_IS_INTERACTIVE"] == "false"
       # extract `x-apple-id-session-id` and `scnt` from response, to be used by `update_request_headers`
       @x_apple_id_session_id = response["x-apple-id-session-id"]
       @scnt = response["scnt"]
@@ -135,7 +135,7 @@ module Spaceship
 
         phone_number = env_2fa_sms_default_phone_number
         phone_id = phone_id_from_number(response.body["trustedPhoneNumbers"], phone_number)
-        push_mode = push_mode_from_masked_number(response.body["trustedPhoneNumbers"], phone_number)
+        push_mode = push_mode_from_number(response.body["trustedPhoneNumbers"], phone_number)
         # don't request sms if no trusted devices and env default is the only trusted number,
         # code was automatically sent
         should_request_code = !sms_automatically_sent(response)
@@ -234,34 +234,8 @@ module Spaceship
     end
 
     def phone_id_from_number(phone_numbers, phone_number)
-      characters_to_remove_from_phone_numbers = ' \-()"'
-
-      # start with e.g. +49 162 1234585 or +1-123-456-7866
-      phone_number = phone_number.tr(characters_to_remove_from_phone_numbers, '')
-      # cleaned: +491621234585 or +11234567866
-
       phone_numbers.each do |phone|
-        # rubocop:disable Style/AsciiComments
-        # start with: +49 •••• •••••85 or +1 (•••) •••-••66
-        number_with_dialcode_masked = phone['numberWithDialCode'].tr(characters_to_remove_from_phone_numbers, '')
-        # cleaned: +49•••••••••85 or +1••••••••66
-        # rubocop:enable Style/AsciiComments
-
-        maskings_count = number_with_dialcode_masked.count('•') # => 9 or 8
-        pattern = /^([0-9+]{2,4})([•]{#{maskings_count}})([0-9]{2})$/
-        # following regex: range from maskings_count-2 because sometimes the masked number has 1 or 2 dots more than the actual number
-        # e.g. https://github.com/fastlane/fastlane/issues/14969
-        replacement = "\\1([0-9]{#{maskings_count - 2},#{maskings_count}})\\3"
-        number_with_dialcode_regex_part = number_with_dialcode_masked.gsub(pattern, replacement)
-        # => +49([0-9]{8,9})85 or +1([0-9]{7,8})66
-
-        backslash = '\\'
-        number_with_dialcode_regex_part = backslash + number_with_dialcode_regex_part
-        number_with_dialcode_regex = /^#{number_with_dialcode_regex_part}$/
-        # => /^\+49([0-9]{8})85$/ or /^\+1([0-9]{7,8})66$/
-
-        return phone['id'] if phone_number =~ number_with_dialcode_regex
-        # +491621234585 matches /^\+49([0-9]{8})85$/
+        return phone['id'] if match_phone_to_masked_phone(phone_number, phone['numberWithDialCode'])
       end
 
       # Handle case of phone_number not existing in phone_numbers because ENV var is wrong or matcher is broken
@@ -272,6 +246,45 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
 )
     end
 
+    def push_mode_from_number(phone_numbers, phone_number)
+      phone_numbers.each do |phone|
+        return phone['pushMode'] if match_phone_to_masked_phone(phone_number, phone['numberWithDialCode'])
+      end
+
+      # If no pushMode was supplied, assume sms
+      return "sms"
+    end
+
+    def match_phone_to_masked_phone(phone_number, masked_number)
+      characters_to_remove_from_phone_numbers = ' \-()"'
+
+      # start with e.g. +49 162 1234585 or +1-123-456-7866
+      phone_number = phone_number.tr(characters_to_remove_from_phone_numbers, '')
+      # cleaned: +491621234585 or +11234567866
+
+      # rubocop:disable Style/AsciiComments
+      # start with: +49 •••• •••••85 or +1 (•••) •••-••66
+      number_with_dialcode_masked = masked_number.tr(characters_to_remove_from_phone_numbers, '')
+      # cleaned: +49•••••••••85 or +1••••••••66
+      # rubocop:enable Style/AsciiComments
+
+      maskings_count = number_with_dialcode_masked.count('•') # => 9 or 8
+      pattern = /^([0-9+]{2,4})([•]{#{maskings_count}})([0-9]{2})$/
+      # following regex: range from maskings_count-2 because sometimes the masked number has 1 or 2 dots more than the actual number
+      # e.g. https://github.com/fastlane/fastlane/issues/14969
+      replacement = "\\1([0-9]{#{maskings_count - 2},#{maskings_count}})\\3"
+      number_with_dialcode_regex_part = number_with_dialcode_masked.gsub(pattern, replacement)
+      # => +49([0-9]{8,9})85 or +1([0-9]{7,8})66
+
+      backslash = '\\'
+      number_with_dialcode_regex_part = backslash + number_with_dialcode_regex_part
+      number_with_dialcode_regex = /^#{number_with_dialcode_regex_part}$/
+      # => /^\+49([0-9]{8})85$/ or /^\+1([0-9]{7,8})66$/
+
+      return phone_number =~ number_with_dialcode_regex
+      # +491621234585 matches /^\+49([0-9]{8})85$/
+    end
+
     def phone_id_from_masked_number(phone_numbers, masked_number)
       phone_numbers.each do |phone|
         return phone['id'] if phone['numberWithDialCode'] == masked_number

data/spaceship/lib/spaceship/upgrade_2fa_later_client.rb

@@ -0,0 +1,91 @@
+require_relative 'globals'
+require_relative 'tunes/tunes_client'
+
+module Spaceship
+  class Client
+    def try_upgrade_2fa_later(response)
+      if ENV['SPACESHIP_SKIP_2FA_UPGRADE'].nil?
+        return false
+      end
+
+      puts("This account is being prompted to upgrade to 2FA")
+      puts("Attempting to automatically bypass the upgrade until a later date")
+      puts("To disable this, remove SPACESHIP_SKIP_2FA_UPGRADE=1 environment variable")
+
+      # Get URL that requests a repair and gets the widget key
+      widget_key_location = response.headers['location']
+      uri    = URI.parse(widget_key_location)
+      params = CGI.parse(uri.query)
+
+      widget_key = params.dig('widgetKey', 0)
+      if widget_key.nil?
+        STDERR.puts("Couldn't find widgetKey to continue with requests")
+        return false
+      end
+
+      # Step 1 - Request repair
+      response_repair = request(:get) do |req|
+        req.url(widget_key_location)
+      end
+
+      # Step 2 - Request repair options
+      response_repair_options = request(:get) do |req|
+        req.url("https://appleid.apple.com/account/manage/repair/options")
+
+        req.headers['scnt'] = response_repair.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Session-Token'] = response.headers['X-Apple-Repair-Session-Token']
+
+        req.headers['X-Apple-Skip-Repair-Attributes'] = '[]'
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json, text/javascript'
+      end
+
+      # Step 3 - Request setup later
+      request(:get) do |req|
+        req.url("https://appleid.apple.com/account/security/upgrade/setuplater")
+
+        req.headers['scnt'] = response_repair_options.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Session-Token'] = response_repair_options.headers['x-apple-session-token']
+        req.headers['X-Apple-Skip-Repair-Attributes'] = '[]'
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json, text/javascript'
+      end
+
+      # Step 4 - Post complete
+      response_repair_complete = request(:post) do |req|
+        req.url("https://idmsa.apple.com/appleauth/auth/repair/complete")
+
+        req.body = ''
+        req.headers['scnt'] = response.headers['scnt']
+        req.headers['X-Apple-Id-Session-Id'] = response.headers['X-Apple-Id-Session-Id']
+        req.headers['X-Apple-Repair-Session-Token'] = response_repair_options.headers['X-Apple-Session-Token']
+
+        req.headers['X-Apple-Widget-Key'] = widget_key
+
+        req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'XMLHttpRequest'
+        req.headers['Accept'] = 'application/json;charset=utf-8'
+      end
+
+      if response_repair_complete.status == 204
+        return true
+      else
+        STDERR.puts("Failed with status code of #{response_repair_complete.status}")
+        return false
+      end
+    rescue => error
+      STDERR.puts(error.backtrace)
+      STDERR.puts("Failed to bypass 2FA upgrade")
+      STDERR.puts("To disable this from trying again, set SPACESHIP_SKIP_UPGRADE_2FA_LATER=1")
+      return false
+    end
+  end
+end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.172.0
+  version: 2.177.0
 platform: ruby
 authors:
+- Kohki Miki
+- Jan Piotrowski
+- Jimmy Dee
 - Andrew McBurney
-- Olivier Halligon
-- Felix Krause
 - Daniel Jankowski
-- Danielle Tomlinson
-- Jimmy Dee
-- Max Ott
-- Stefan Natchev
-- Maksym Grebenets
-- Jérôme Lacoste
-- Jan Piotrowski
-- Jorge Revuelta H
-- Kohki Miki
-- Aaron Brager
 - Luka Mirosevic
-- Josh Holtz
 - Iulian Onofrei
 - Helmut Januschka
-- Joshua Liebowitz
-- Fumiya Nakamura
+- Maksym Grebenets
 - Matthew Ellis
+- Max Ott
+- Danielle Tomlinson
+- Aaron Brager
+- Josh Holtz
+- Fumiya Nakamura
+- Olivier Halligon
+- Jérôme Lacoste
+- Joshua Liebowitz
+- Stefan Natchev
+- Felix Krause
+- Jorge Revuelta H
 - Manu Wallner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -477,6 +477,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: naturally
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -969,7 +983,6 @@ files:
 - deliver/lib/deliver/loader.rb
 - deliver/lib/deliver/module.rb
 - deliver/lib/deliver/options.rb
-- deliver/lib/deliver/queue_worker.rb
 - deliver/lib/deliver/runner.rb
 - deliver/lib/deliver/setup.rb
 - deliver/lib/deliver/submit_for_review.rb
@@ -999,7 +1012,6 @@ files:
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
 - fastlane/lib/fastlane/actions/.git_commit.rb.swp
-- fastlane/lib/fastlane/actions/.update_fastlane.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1410,6 +1422,7 @@ files:
 - fastlane_core/lib/fastlane_core/print_table.rb
 - fastlane_core/lib/fastlane_core/project.rb
 - fastlane_core/lib/fastlane_core/provisioning_profile.rb
+- fastlane_core/lib/fastlane_core/queue_worker.rb
 - fastlane_core/lib/fastlane_core/string_filters.rb
 - fastlane_core/lib/fastlane_core/swag.rb
 - fastlane_core/lib/fastlane_core/tag_version.rb
@@ -1452,10 +1465,12 @@ files:
 - gym/lib/assets/GymfileTemplate.swift
 - gym/lib/assets/wrap_xcodebuild/xcbuild-safe.sh
 - gym/lib/gym.rb
+- gym/lib/gym/.runner.rb.swp
 - gym/lib/gym/code_signing_mapping.rb
 - gym/lib/gym/commands_generator.rb
 - gym/lib/gym/detect_values.rb
 - gym/lib/gym/error_handler.rb
+- gym/lib/gym/generators/.package_command_generator_xcode7.rb.swp
 - gym/lib/gym/generators/README.md
 - gym/lib/gym/generators/build_command_generator.rb
 - gym/lib/gym/generators/package_command_generator.rb
@@ -1804,6 +1819,7 @@ files:
 - spaceship/lib/spaceship/tunes/version_set.rb
 - spaceship/lib/spaceship/two_step_or_factor_client.rb
 - spaceship/lib/spaceship/ui.rb
+- spaceship/lib/spaceship/upgrade_2fa_later_client.rb
 - supply/README.md
 - supply/lib/supply.rb
 - supply/lib/supply/apk_listing.rb