fastlane 2.164.0 → 2.169.0

data/spaceship/lib/spaceship/connect_api/models/idfa_declaration.rb

@@ -28,13 +28,15 @@ module Spaceship
       # API
       #
 
-      def update(attributes: nil)
+      def update(client: nil, attributes: nil)
+        client ||= Spaceship::ConnectAPI
         attributes = reverse_attr_mapping(attributes)
-        Spaceship::ConnectAPI.patch_idfa_declaration(idfa_declaration_id: id, attributes: attributes)
+        client.patch_idfa_declaration(idfa_declaration_id: id, attributes: attributes)
       end
 
-      def delete!
-        Spaceship::ConnectAPI.delete_idfa_declaration(idfa_declaration_id: id)
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        client.delete_idfa_declaration(idfa_declaration_id: id)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/profile.rb

@@ -65,13 +65,15 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        resps = Spaceship::ConnectAPI.get_profiles(filter: filter, includes: includes).all_pages
+      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_profiles(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.create(name: nil, profile_type: nil, bundle_id_id: nil, certificate_ids: nil, device_ids: nil, template_name: nil)
-        resp = Spaceship::ConnectAPI.post_profiles(
+      def self.create(client: nil, name: nil, profile_type: nil, bundle_id_id: nil, certificate_ids: nil, device_ids: nil, template_name: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_profiles(
           bundle_id_id: bundle_id_id,
           certificates: certificate_ids,
           devices: device_ids,
@@ -84,13 +86,15 @@ module Spaceship
         return resp.to_models.first
       end
 
-      def fetch_all_devices(filter: {}, includes: nil, sort: nil)
-        resps = Spaceship::ConnectAPI.get_devices(profile_id: id, filter: filter, includes: includes).all_pages
+      def fetch_all_devices(client: nil, filter: {}, includes: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_devices(profile_id: id, filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def delete!
-        return Spaceship::ConnectAPI.delete_profile(profile_id: id)
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        return client.delete_profile(profile_id: id)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/reset_ratings_request.rb

@@ -18,8 +18,9 @@ module Spaceship
       # API
       #
 
-      def delete!(filter: {}, includes: nil, limit: nil, sort: nil)
-        Spaceship::ConnectAPI.delete_reset_ratings_request(reset_ratings_request_id: id)
+      def delete!(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        client.delete_reset_ratings_request(reset_ratings_request_id: id)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/sandbox_tester.rb

@@ -36,12 +36,14 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: 2000, sort: nil)
-        resps = Spaceship::ConnectAPI.get_sandbox_testers(filter: filter, includes: includes).all_pages
+      def self.all(client: nil, filter: {}, includes: nil, limit: 2000, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_sandbox_testers(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.create(first_name: nil, last_name: nil, email: nil, password: nil, confirm_password: nil, secret_question: nil, secret_answer: nil, birth_date: nil, app_store_territory: nil)
+      def self.create(client: nil, first_name: nil, last_name: nil, email: nil, password: nil, confirm_password: nil, secret_question: nil, secret_answer: nil, birth_date: nil, app_store_territory: nil)
+        client ||= Spaceship::ConnectAPI
         attributes = {
           firstName: first_name,
           lastName: last_name,
@@ -53,11 +55,12 @@ module Spaceship
           birthDate: birth_date,
           appStoreTerritory: app_store_territory
         }
-        return Spaceship::ConnectAPI.post_sandbox_tester(attributes: attributes).first
+        return client.post_sandbox_tester(attributes: attributes).first
       end
 
-      def delete!
-        Spaceship::ConnectAPI.delete_sandbox_tester(sandbox_tester_id: id)
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        client.delete_sandbox_tester(sandbox_tester_id: id)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/territory.rb

@@ -18,8 +18,9 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: 180, sort: nil)
-        resps = Spaceship::ConnectAPI.get_territories(filter: {}, includes: nil, limit: nil, sort: nil).all_pages
+      def self.all(client: nil, filter: {}, includes: nil, limit: 180, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_territories(filter: {}, includes: nil, limit: nil, sort: nil).all_pages
         return resps.flat_map(&:to_models)
       end
     end

data/spaceship/lib/spaceship/connect_api/models/user.rb

@@ -38,13 +38,15 @@ module Spaceship
       # API
       #
 
-      def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        resps = Spaceship::ConnectAPI.get_users(filter: filter, includes: includes).all_pages
+      def self.all(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_users(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.find(email: nil, includes: nil)
-        return all(filter: { email: email }, includes: includes)
+      def self.find(client: nil, email: nil, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        return all(client: client, filter: { email: email }, includes: includes)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/user_invitation.rb

@@ -42,17 +42,20 @@ module Spaceship
       # Managing invitations
       #
 
-      def self.all(filter: {}, includes: nil, sort: nil)
-        resps = Spaceship::ConnectAPI.get_user_invitations(filter: filter, includes: includes, sort: sort).all_pages
+      def self.all(client: nil, filter: {}, includes: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_user_invitations(filter: filter, includes: includes, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
 
-      def self.find(email: nil, includes: nil)
-        return all(filter: { email: email }, includes: includes)
+      def self.find(client: nil, email: nil, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        return all(client: client, filter: { email: email }, includes: includes)
       end
 
-      def delete!
-        Spaceship::ConnectAPI.delete_user_invitation(user_invitation_id: id)
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        client.delete_user_invitation(user_invitation_id: id)
       end
     end
   end

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

@@ -44,20 +44,23 @@ module Spaceship
 
       # Initializes client with Apple's App Store Connect JWT auth key.
       #
-      # This method will automatically use the key id, issuer id, and filepath from environment
+      # This method will automatically use the arguments from environment
       # variables if not given.
       #
-      # All three parameters are needed to authenticate.
+      # The key_id, issuer_id and either filepath or key are needed to authenticate.
       #
       # @param key_id (String) (optional): The key id
       # @param issuer_id (String) (optional): The issuer id
       # @param filepath (String) (optional): The filepath
+      # @param key (String) (optional): The key
+      # @param duration (Integer) (optional): How long this session should last
+      # @param in_house (Boolean) (optional): Whether this session is an Enterprise one
       #
       # @raise InvalidUserCredentialsError: raised if authentication failed
       #
       # @return (Spaceship::ConnectAPI::Client) The client the login method was called for
-      def auth(key_id: nil, issuer_id: nil, filepath: nil)
-        @client = ConnectAPI::Client.auth(key_id: key_id, issuer_id: issuer_id, filepath: filepath)
+      def auth(key_id: nil, issuer_id: nil, filepath: nil, key: nil, duration: nil, in_house: nil)
+        @client = ConnectAPI::Client.auth(key_id: key_id, issuer_id: issuer_id, filepath: filepath, key: key, duration: duration, in_house: in_house)
       end
 
       # Authenticates with Apple's web services. This method has to be called once

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

@@ -890,6 +890,77 @@ module Spaceship
           tunes_request_client.post("appStoreVersionReleaseRequests", body)
         end
 
+        #
+        # customAppUsers
+        #
+
+        def get_custom_app_users(app_id: nil, filter: nil, 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}/customAppUsers", params)
+        end
+
+        def post_custom_app_user(app_id: nil, apple_id: nil)
+          body = {
+              data: {
+                  type: "customAppUsers",
+                  attributes: {
+                    appleId: apple_id
+                  },
+                  relationships: {
+                      app: {
+                          data: {
+                              type: "apps",
+                              id: app_id
+                          }
+                      }
+                  }
+              }
+          }
+
+          tunes_request_client.post("customAppUsers", body)
+        end
+
+        def delete_custom_app_user(custom_app_user_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("customAppUsers/#{custom_app_user_id}", params)
+        end
+
+        #
+        # customOrganizationUsers
+        #
+
+        def get_custom_app_organization(app_id: nil, filter: nil, 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}/customAppOrganizations", params)
+        end
+
+        def post_custom_app_organization(app_id: nil, device_enrollment_program_id: nil, name: nil)
+          body = {
+              data: {
+                  type: "customAppOrganizations",
+                  attributes: {
+                    deviceEnrollmentProgramId: device_enrollment_program_id,
+                    name: name
+                  },
+                  relationships: {
+                      app: {
+                          data: {
+                              type: "apps",
+                              id: app_id
+                          }
+                      }
+                  }
+              }
+          }
+
+          tunes_request_client.post("customAppOrganizations", body)
+        end
+
+        def delete_custom_app_organization(custom_app_organization_id: nil)
+          params = tunes_request_client.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+          tunes_request_client.delete("customAppOrganizations/#{custom_app_organization_id}", params)
+        end
+
         #
         # idfaDeclarations
         #

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