fastlane 2.165.0 → 2.170.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 delete_beta_group(group_id: nil)
+          raise "group_id is nil" if group_id.nil?
+
+          test_flight_request_client.delete("betaGroups/#{group_id}")
+        end
+
+        def get_builds_for_beta_group(group_id: nil)
+          raise "group_id is nil" if group_id.nil?
+
+          test_flight_request_client.get("betaGroups/#{group_id}/builds")
+        end
+
         #
         # betaTesters
         #

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/tunes/iap_detail.rb

@@ -242,7 +242,7 @@ module Spaceship
       # @return ([Spaceship::Tunes::PricingInfo]) An array of pricing infos from the same tier
       def world_wide_pricing_info
         client
-          .pricing_tiers
+          .pricing_tiers(application.apple_id)
           .find { |p| p.tier_stem == pricing_intervals.first[:tier].to_s }
           .pricing_info
       end

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

@@ -704,9 +704,9 @@ module Spaceship
     #     ...
     # }, {
     # ...
-    def pricing_tiers
+    def pricing_tiers(app_id)
       @pricing_tiers ||= begin
-        r = request(:get, 'ra/apps/pricing/matrix')
+        r = request(:get, "ra/apps/#{app_id}/iaps/pricing/matrix")
         data = parse_response(r, 'data')['pricingTiers']
         data.map { |tier| Spaceship::Tunes::PricingTier.factory(tier) }
       end

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -134,18 +134,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 +277,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 +294,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 +319,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/supply/lib/supply.rb

@@ -16,7 +16,7 @@ module Supply
   end
 
   AVAILABLE_METADATA_FIELDS = %w(title short_description full_description video)
-  IMAGES_TYPES = %w(featureGraphic icon promoGraphic tvBanner)
+  IMAGES_TYPES = %w(featureGraphic icon tvBanner) # https://developers.google.com/android-publisher/api-ref/rest/v3/AppImageType
   SCREENSHOT_TYPES = %w(phoneScreenshots sevenInchScreenshots tenInchScreenshots tvScreenshots wearScreenshots)
 
   IMAGES_FOLDER_NAME = "images"

data/supply/lib/supply/options.rb

@@ -49,7 +49,7 @@ module Supply
                                      end),
         FastlaneCore::ConfigItem.new(key: :rollout,
                                      short_option: "-r",
-                                     description: "The percentage of the user fraction when uploading to the rollout track",
+                                     description: "The percentage of the user fraction when uploading to the rollout track (setting to 1 will complete the rollout)",
                                      optional: true,
                                      verify_block: proc do |value|
                                        min = 0.0

data/supply/lib/supply/uploader.rb

@@ -192,9 +192,10 @@ module Supply
       release = releases.first
       track_to = client.tracks(Supply.config[:track_promote_to]).first
 
-      if Supply.config[:rollout]
+      rollout = (Supply.config[:rollout] || 0).to_f
+      if rollout > 0 && rollout < 1
         release.status = Supply::ReleaseStatus::IN_PROGRESS
-        release.user_fraction = Supply.config[:rollout]
+        release.user_fraction = rollout
       else
         release.status = Supply::ReleaseStatus::COMPLETED
         release.user_fraction = nil

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.165.0
+  version: 2.170.0
 platform: ruby
 authors:
+- Jimmy Dee
+- Aaron Brager
 - Jorge Revuelta H
-- Matthew Ellis
-- Felix Krause
 - Josh Holtz
-- Danielle Tomlinson
-- Jérôme Lacoste
-- Kohki Miki
-- Maksym Grebenets
-- Aaron Brager
-- Jimmy Dee
-- Max Ott
-- Luka Mirosevic
-- Manu Wallner
 - Jan Piotrowski
 - Stefan Natchev
-- Andrew McBurney
-- Fumiya Nakamura
 - Iulian Onofrei
-- Olivier Halligon
+- Jérôme Lacoste
+- Helmut Januschka
+- Luka Mirosevic
+- Matthew Ellis
+- Maksym Grebenets
+- Andrew McBurney
+- Manu Wallner
 - Joshua Liebowitz
+- Felix Krause
+- Kohki Miki
+- Olivier Halligon
 - Daniel Jankowski
-- Helmut Januschka
+- Max Ott
+- Danielle Tomlinson
+- Fumiya Nakamura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1207,6 +1207,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,10 +1620,17 @@ 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_data_usage_data_protection.rb.swp
 - spaceship/lib/spaceship/connect_api/models/.app_store_version_submission.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
@@ -1829,7 +1837,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and