fastlane 2.168.0 → 2.173.0

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -214,6 +214,18 @@ module Spaceship
           test_flight_request_client.post("betaGroups", body)
         end
 
+        def patch_group(group_id: nil, attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              id: group_id,
+              type: "betaGroups"
+            }
+          }
+
+          test_flight_request_client.patch("betaGroups/#{group_id}", body)
+        end
+
         def delete_beta_group(group_id: nil)
           raise "group_id is nil" if group_id.nil?
 

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

@@ -200,6 +200,109 @@ module Spaceship
           tunes_request_client.patch("apps/#{app_id}", body)
         end
 
+        #
+        # appDataUsage
+        #
+
+        def get_app_data_usages(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("apps/#{app_id}/dataUsages", params)
+        end
+
+        def post_app_data_usage(app_id:, app_data_usage_category_id: nil, app_data_usage_protection_id: nil, app_data_usage_purpose_id: nil)
+          raise "app_id is required " if app_id.nil?
+
+          relationships = {
+            app: {
+              data: {
+                type: "apps",
+                id: app_id
+              }
+            }
+          }
+
+          if app_data_usage_category_id
+            relationships[:category] = {
+              data: {
+                type: "appDataUsageCategories",
+                id: app_data_usage_category_id
+              }
+            }
+          end
+
+          if app_data_usage_protection_id
+            relationships[:dataProtection] = {
+              data: {
+                type: "appDataUsageDataProtections",
+                id: app_data_usage_protection_id
+              }
+            }
+          end
+
+          if app_data_usage_purpose_id
+            relationships[:purpose] = {
+              data: {
+                type: "appDataUsagePurposes",
+                id: app_data_usage_purpose_id
+              }
+            }
+          end
+
+          body = {
+            data: {
+              type: "appDataUsages",
+              relationships: relationships
+            }
+          }
+
+          tunes_request_client.post("appDataUsages", body)
+        end
+
+        def delete_app_data_usage(app_data_usage_id: nil)
+          tunes_request_client.delete("appDataUsages/#{app_data_usage_id}")
+        end
+
+        #
+        # appDataUsageCategory
+        #
+
+        def get_app_data_usage_categories(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appDataUsageCategories", params)
+        end
+
+        #
+        # appDataUsagePurpose
+        #
+
+        def get_app_data_usage_purposes(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = tunes_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          tunes_request_client.get("appDataUsagePurposes", params)
+        end
+
+        #
+        # appDataUsagesPublishState
+        #
+
+        def get_app_data_usages_publish_state(app_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.get("apps/#{app_id}/dataUsagePublishState", params)
+        end
+
+        def patch_app_data_usages_publish_state(app_data_usages_publish_state_id: nil, published: nil)
+          body = {
+            data: {
+              type: "appDataUsagesPublishState",
+              id: app_data_usages_publish_state_id,
+              attributes: {
+                published: published
+              }
+            }
+          }
+
+          tunes_request_client.patch("appDataUsagesPublishState/#{app_data_usages_publish_state_id}", body)
+        end
+
         #
         # appPreview
         #

data/spaceship/lib/spaceship/errors.rb

@@ -43,6 +43,25 @@ module Spaceship
     end
   end
 
+  # Raised when 429 is received from App Store Connect
+  class TooManyRequestsError < BasicPreferredInfoError
+    attr_reader :retry_after
+    attr_reader :rate_limit_user
+
+    def initialize(resp_hash)
+      headers = resp_hash[:response_headers] || {}
+      @retry_after = (headers['retry-after'] || 60).to_i
+      @rate_limit_user = headers['x-daiquiri-rate-limit-user']
+      message = 'Apple 429 detected'
+      message += " - #{rate_limit_user}" if rate_limit_user
+      super(message)
+    end
+
+    def show_github_issues
+      false
+    end
+  end
+
   class UnexpectedResponse < StandardError
     attr_reader :error_info
 

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -4,6 +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"
       # 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"]
@@ -134,18 +135,20 @@ 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)
         # 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)
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code)
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode, should_request_code)
       elsif sms_automatically_sent(response) # sms fallback, code was automatically sent
         fallback_number = response.body["trustedPhoneNumbers"].first
         phone_number = fallback_number["numberWithDialCode"]
         phone_id = fallback_number["id"]
+        push_mode = fallback_number['pushMode']
 
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, false)
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode, false)
       elsif sms_fallback(response) # sms fallback but code wasn't sent bec > 1 phone number
         code_type = 'phone'
         body = request_two_factor_code_from_phone_choose(response.body["trustedPhoneNumbers"], code_length)
@@ -275,6 +278,15 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
       end
     end
 
+    def push_mode_from_masked_number(phone_numbers, masked_number)
+      phone_numbers.each do |phone|
+        return phone['pushMode'] if phone['numberWithDialCode'] == masked_number
+      end
+
+      # If no pushMode was supplied, assume sms
+      return "sms"
+    end
+
     def request_two_factor_code_from_phone_choose(phone_numbers, code_length)
       puts("Please select a trusted phone number to send code to:")
 
@@ -283,18 +295,19 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
       end
       chosen = choose_phone_number(available)
       phone_id = phone_id_from_masked_number(phone_numbers, chosen)
+      push_mode = push_mode_from_masked_number(phone_numbers, chosen)
 
-      request_two_factor_code_from_phone(phone_id, chosen, code_length)
+      request_two_factor_code_from_phone(phone_id, chosen, code_length, push_mode)
     end
 
     # this is used in two places: after choosing a phone number and when a phone number is set via ENV var
-    def request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code = true)
+    def request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode = "sms", should_request_code = true)
       if should_request_code
         # Request code
         r = request(:put) do |req|
           req.url("https://idmsa.apple.com/appleauth/auth/verify/phone")
           req.headers['Content-Type'] = 'application/json'
-          req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+          req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => push_mode }.to_json
           update_request_headers(req)
         end
 
@@ -307,7 +320,7 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
 
       code = ask_for_2fa_code("Please enter the #{code_length} digit code you received at #{phone_number}:")
 
-      return { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+      return { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => push_mode }.to_json
     end
 
     def store_session

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.168.0
+  version: 2.173.0
 platform: ruby
 authors:
 - Aaron Brager
-- Danielle Tomlinson
 - Matthew Ellis
-- Joshua Liebowitz
-- Felix Krause
+- Jan Piotrowski
+- Maksym Grebenets
+- Fumiya Nakamura
+- Jorge Revuelta H
+- Jérôme Lacoste
+- Max Ott
 - Manu Wallner
+- Luka Mirosevic
 - Daniel Jankowski
-- Iulian Onofrei
+- Helmut Januschka
 - Josh Holtz
-- Jérôme Lacoste
-- Fumiya Nakamura
-- Andrew McBurney
-- Max Ott
-- Jan Piotrowski
-- Jorge Revuelta H
+- Joshua Liebowitz
 - Stefan Natchev
-- Luka Mirosevic
 - Jimmy Dee
-- Maksym Grebenets
-- Kohki Miki
-- Helmut Januschka
+- Iulian Onofrei
+- Andrew McBurney
 - Olivier Halligon
+- Kohki Miki
+- Felix Krause
+- Danielle Tomlinson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -253,6 +253,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: artifactory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -679,14 +693,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -945,6 +959,7 @@ files:
 - deliver/lib/deliver.rb
 - deliver/lib/deliver/app_screenshot.rb
 - deliver/lib/deliver/app_screenshot_iterator.rb
+- deliver/lib/deliver/app_screenshot_validator.rb
 - deliver/lib/deliver/commands_generator.rb
 - deliver/lib/deliver/detect_values.rb
 - deliver/lib/deliver/download_screenshots.rb
@@ -983,7 +998,6 @@ files:
 - fastlane/lib/fastlane/.erb_template_helper.rb.swp
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
-- fastlane/lib/fastlane/actions/.download_dsyms.rb.swp
 - fastlane/lib/fastlane/actions/.git_commit.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
@@ -1033,6 +1047,7 @@ files:
 - fastlane/lib/fastlane/actions/create_app_online.rb
 - fastlane/lib/fastlane/actions/create_keychain.rb
 - fastlane/lib/fastlane/actions/create_pull_request.rb
+- fastlane/lib/fastlane/actions/create_xcframework.rb
 - fastlane/lib/fastlane/actions/danger.rb
 - fastlane/lib/fastlane/actions/debug.rb
 - fastlane/lib/fastlane/actions/default_platform.rb
@@ -1056,6 +1071,7 @@ files:
 - fastlane/lib/fastlane/actions/docs/upload_to_testflight.md
 - fastlane/lib/fastlane/actions/dotgpg_environment.rb
 - fastlane/lib/fastlane/actions/download.rb
+- fastlane/lib/fastlane/actions/download_app_privacy_details_from_app_store.rb
 - fastlane/lib/fastlane/actions/download_dsyms.rb
 - fastlane/lib/fastlane/actions/download_from_play_store.rb
 - fastlane/lib/fastlane/actions/dsym_zip.rb
@@ -1207,6 +1223,7 @@ files:
 - fastlane/lib/fastlane/actions/update_project_team.rb
 - fastlane/lib/fastlane/actions/update_urban_airship_configuration.rb
 - fastlane/lib/fastlane/actions/update_url_schemes.rb
+- fastlane/lib/fastlane/actions/upload_app_privacy_details_to_app_store.rb
 - fastlane/lib/fastlane/actions/upload_symbols_to_crashlytics.rb
 - fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb
 - fastlane/lib/fastlane/actions/upload_to_app_store.rb
@@ -1619,13 +1636,16 @@ files:
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
-- spaceship/lib/spaceship/connect_api/models/.app.rb.swp
-- spaceship/lib/spaceship/connect_api/models/.app_screenshot.rb.swp
 - spaceship/lib/spaceship/connect_api/models/.app_store_version_submission.rb.swp
-- spaceship/lib/spaceship/connect_api/models/.build.rb.swp
 - spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
 - spaceship/lib/spaceship/connect_api/models/app_category.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usage.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usage_category.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usage_data_protection.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usage_grouping.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usage_purposes.rb
+- spaceship/lib/spaceship/connect_api/models/app_data_usages_publish_state.rb
 - spaceship/lib/spaceship/connect_api/models/app_info.rb
 - spaceship/lib/spaceship/connect_api/models/app_info_localization.rb
 - spaceship/lib/spaceship/connect_api/models/app_preview.rb
@@ -1783,6 +1803,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
@@ -1832,7 +1853,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and