fastlane 2.13.0 → 2.14.0

data/spaceship/lib/spaceship/client.rb

@@ -8,6 +8,7 @@ require 'spaceship/helper/net_http_generic_request'
 require 'spaceship/helper/plist_middleware'
 require 'spaceship/ui'
 require 'tmpdir'
+require 'cgi'
 
 Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
 
@@ -78,8 +79,8 @@ module Spaceship
 
         [
           "Apple provided the following error info:",
-          @error_info['resultString'],
-          @error_info['userString']
+          CGI.unescapeHTML(@error_info['resultString']),
+          CGI.unescapeHTML(@error_info['userString'])
         ].compact.uniq # sometimes 'resultString' and 'userString' are the same value
       end
     end

data/spaceship/lib/spaceship/du/du_client.rb

@@ -15,49 +15,59 @@ module Spaceship
     #####################################################
 
     def upload_screenshot(app_version, upload_file, content_provider_id, sso_token_for_image, device, is_messages)
-      upload_file(app_version, upload_file, '/upload/image', content_provider_id, sso_token_for_image, screenshot_picture_type(device, is_messages))
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: screenshot_picture_type(device, is_messages))
+    end
+
+    def upload_purchase_review_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
+      upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.SortedScreenShot')
     end
 
     def upload_large_icon(app_version, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_version, upload_file, '/upload/image', content_provider_id, sso_token_for_image, 'MZPFT.LargeApplicationIcon')
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.LargeApplicationIcon')
     end
 
     def upload_watch_icon(app_version, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_version, upload_file, '/upload/image', content_provider_id, sso_token_for_image, 'MZPFT.GizmoAppIcon')
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.GizmoAppIcon')
     end
 
     def upload_geojson(app_version, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_version, upload_file, '/upload/geo-json', content_provider_id, sso_token_for_image)
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/geo-json', content_provider_id: content_provider_id, sso_token: sso_token_for_image)
     end
 
     def upload_trailer(app_version, upload_file, content_provider_id, sso_token_for_video)
-      upload_file(app_version, upload_file, '/upload/purple-video', content_provider_id, sso_token_for_video)
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/purple-video', content_provider_id: content_provider_id, sso_token: sso_token_for_video)
     end
 
     def upload_trailer_preview(app_version, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_version, upload_file, '/upload/app-screenshot-image', content_provider_id, sso_token_for_image)
+      upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/app-screenshot-image', content_provider_id: content_provider_id, sso_token: sso_token_for_image)
     end
 
     private
 
-    def upload_file(app_version, upload_file, path, content_provider_id, sso_token, du_validation_rule_set = nil)
+    def upload_file(app_version: nil, upload_file: nil, path: nil, content_provider_id: nil, sso_token: nil, du_validation_rule_set: nil, app_id: nil)
       raise "File #{upload_file.file_path} is empty" if upload_file.file_size == 0
 
-      version = app_version.version
-      app_id = app_version.application.apple_id
-      app_type = app_version.app_type
-
-      referrer = app_version.application.url
+      if app_id
+        app_id = app_id
+        app_type = nil
+        version = nil
+        referrer = nil
+      else
+        version = app_version.version
+        app_id = app_version.application.apple_id
+        app_type = app_version.app_type
+        referrer = app_version.application.url
+      end
 
       r = request(:post) do |req|
         req.url "#{self.class.hostname}#{path}"
         req.body = upload_file.bytes
         req.headers['Accept'] = 'application/json, text/plain, */*'
         req.headers['Content-Type'] = upload_file.content_type
-        req.headers['X-Apple-Upload-Referrer'] = referrer
-        req.headers['Referrer'] = referrer
+        req.headers['X-Apple-Upload-Referrer'] = referrer if referrer
+        req.headers['Referrer'] = referrer if referrer
         req.headers['X-Apple-Upload-AppleId'] = app_id
-        req.headers['X-Apple-Jingle-Correlation-Key'] = "#{app_type}:AdamId=#{app_id}:Version=#{version}"
+        req.headers['X-Apple-Jingle-Correlation-Key'] = "#{app_type}:AdamId=#{app_id}:Version=#{version}" if app_type
         req.headers['X-Apple-Upload-itctoken'] = sso_token
         req.headers['X-Apple-Upload-ContentProviderId'] = content_provider_id
         req.headers['X-Original-Filename'] = upload_file.file_name
@@ -67,7 +77,7 @@ module Spaceship
       end
 
       if r.status == 500 and r.body.include?("Server Error")
-        return upload_file(app_version, upload_file, path, content_provider_id, sso_token, du_validation_rule_set)
+        return upload_file(app_version: app_version, upload_file: upload_file, path: path, content_provider_id: content_provider_id, sso_token: sso_token, du_validation_rule_set: du_validation_rule_set, app_id: app_id)
       end
 
       parse_upload_response(r)

data/spaceship/lib/spaceship/portal/app.rb

@@ -103,7 +103,7 @@ module Spaceship
         # @return (App) The app you're looking for. This is nil if the app can't be found.
         def find(bundle_id, mac: false)
           all(mac: mac).find do |app|
-            app.bundle_id == bundle_id
+            return app if app.bundle_id.casecmp(bundle_id) == 0
           end
         end
       end

data/spaceship/lib/spaceship/portal/person.rb

@@ -0,0 +1,53 @@
+module Spaceship
+  module Portal
+    class Person < PortalBase
+      # @return (String) Person Id
+      attr_accessor :person_id
+
+      # @return (String) First name
+      attr_accessor :firstname
+
+      # @return (String) Last name
+      attr_accessor :lastname
+
+      # @return (String) Email Address
+      attr_accessor :email_address
+
+      # @return (String) Developer status (active, inactive)
+      attr_accessor :developer_status
+
+      # @return (String) Joined Date
+      attr_accessor :joined
+
+      # @return (String) Id in Team scope
+      attr_accessor :team_member_id
+
+      # @return (String) Role (member, admin or agent)
+      attr_accessor :type
+
+      attr_mapping(
+        'personId' => :person_id,
+        'firstName' => :firstname,
+        'lastName' => :lastname,
+        'email' => :email_address,
+        'developerStatus' => :developer_status,
+        'dateJoined' => :joined,
+        'teamMemberId' => :team_member_id
+      )
+
+      class << self
+        def factory(attrs)
+          self.new(attrs)
+        end
+      end
+
+      def remove!
+        client.team_remove_member!(team_member_id)
+      end
+
+      def change_role(role)
+        client.team_set_role(team_member_id, role)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/portal/persons.rb

@@ -0,0 +1,49 @@
+module Spaceship
+  module Portal
+    class Persons < PortalBase
+      class << self
+        def all
+          members = client.team_members
+          all_members = []
+          member = factory_member(members["members"], "member")
+          admins = factory_member(members["admins"], "admin")
+          agent  = factory_member(members["agent"], "agent")
+
+          all_members.concat(member)
+          all_members.concat(admins)
+          all_members << agent
+
+          return all_members
+        end
+
+        def factory_member(members, type)
+          if members.kind_of?(Hash)
+            attrs = members
+            attrs[:type] = type
+            return Spaceship::Portal::Person.factory(attrs)
+          end
+          final_members = []
+          members.each do |member|
+            attrs = member
+            attrs[:type] = type
+            final_members << Spaceship::Portal::Person.factory(attrs)
+          end
+          return final_members
+        end
+
+        def find(email)
+          all.each do |member|
+            if member.email_address == email
+              return member
+            end
+          end
+          return nil
+        end
+
+        def invite(email, role)
+          client.team_invite(email, role)
+        end
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/portal/portal.rb

@@ -6,3 +6,5 @@ require 'spaceship/portal/certificate'
 require 'spaceship/portal/device'
 require 'spaceship/portal/provisioning_profile'
 require 'spaceship/portal/portal_client'
+require 'spaceship/portal/persons'
+require 'spaceship/portal/person'

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -236,6 +236,62 @@ module Spaceship
       parse_response(r)
     end
 
+    #####################################################
+    # @!group Team
+    #####################################################
+    def team_members
+      response = request(:post) do |req|
+        req.url "/services-account/#{PROTOCOL_VERSION}/account/getTeamMembers"
+        req.body = {
+          teamId: team_id
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+      parse_response(response)
+    end
+
+    def team_set_role(team_member_id, role)
+      ensure_csrf(Spaceship::Portal::Persons)
+      response = request(:post) do |req|
+        req.url "/services-account/#{PROTOCOL_VERSION}/account/setTeamMemberRoles"
+        req.body = {
+          teamId: team_id,
+          role: role,
+          teamMemberIds: [team_member_id]
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+      parse_response(response)
+    end
+
+    def team_remove_member!(team_member_id)
+      ensure_csrf(Spaceship::Portal::Persons)
+      response = request(:post) do |req|
+        req.url "/services-account/#{PROTOCOL_VERSION}/account/removeTeamMembers"
+        req.body = {
+          teamId: team_id,
+          teamMemberIds: [team_member_id]
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+      parse_response(response)
+    end
+
+    def team_invite(email, role)
+      ensure_csrf(Spaceship::Portal::Persons)
+      response = request(:post) do |req|
+        req.url "/services-account/#{PROTOCOL_VERSION}/account/sendInvites"
+        req.body = {
+          invites: [
+            { recipientEmail: email, recipientRole: role }
+          ],
+          teamId: team_id
+        }.to_json
+        req.headers['Content-Type'] = 'application/json'
+      end
+      parse_response(response)
+    end
+
     #####################################################
     # @!group Devices
     #####################################################
@@ -427,20 +483,23 @@ module Spaceship
       parse_response(r)
     end
 
-    def repair_provisioning_profile!(profile_id, name, distribution_method, app_id, certificate_ids, device_ids, mac: false)
+    def repair_provisioning_profile!(profile_id, name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil)
       ensure_csrf(Spaceship::ProvisioningProfile) do
         fetch_csrf_token_for_provisioning
       end
 
-      r = request(:post, "account/#{platform_slug(mac)}/profile/regenProvisioningProfile.action", {
-        teamId: team_id,
-        provisioningProfileId: profile_id,
-        provisioningProfileName: name,
-        appIdId: app_id,
-        distributionType: distribution_method,
-        certificateIds: certificate_ids.join(','),
-        deviceIds: device_ids
-      })
+      params = {
+          teamId: team_id,
+          provisioningProfileId: profile_id,
+          provisioningProfileName: name,
+          appIdId: app_id,
+          distributionType: distribution_method,
+          certificateIds: certificate_ids.join(','),
+          deviceIds: device_ids
+      }
+      params[:subPlatform] = sub_platform if sub_platform
+
+      r = request(:post, "account/#{platform_slug(mac)}/profile/regenProvisioningProfile.action", params)
 
       parse_response(r, 'provisioningProfile')
     end

data/spaceship/lib/spaceship/portal/provisioning_profile.rb

@@ -65,6 +65,11 @@ module Spaceship
       #   "ios"
       attr_accessor :platform
 
+      # @return (String) The supported sub_platform for this profile
+      # @example
+      #   "tvOS"
+      attr_accessor :sub_platform
+
       # No information about this attribute
       attr_accessor :managing_app
 
@@ -136,6 +141,7 @@ module Spaceship
         'type' => :type,
         'version' => :version,
         'proProPlatform' => :platform,
+        'proProSubPlatform' => :sub_platform,
         'managingApp' => :managing_app,
         'appId' => :app
       })
@@ -206,6 +212,8 @@ module Spaceship
           app = Spaceship::App.find(bundle_id, mac: mac)
           raise "Could not find app with bundle id '#{bundle_id}'" unless app
 
+          raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? and sub_platform != 'tvOS'
+
           # Fill in sensible default values
           name ||= [bundle_id, self.pretty_type].join(' ')
 
@@ -278,6 +286,20 @@ module Spaceship
           end
         end
 
+        # @return (Array) Returns all profiles registered for this account
+        #  If you're calling this from a subclass (like AdHoc), this will
+        #  only return the profiles that are of this type
+        def all_tvos
+          profiles = all(mac: false)
+          tv_os_profiles = []
+          profiles.each do |tv_os_profile|
+            if tv_os_profile.tvos?
+              tv_os_profiles << tv_os_profile
+            end
+          end
+          return tv_os_profiles
+        end
+
         # @return (Array) Returns an array of provisioning
         #   profiles matching the bundle identifier
         #   Returns [] if no profiles were found
@@ -385,7 +407,8 @@ module Spaceship
             app.app_id,
             certificates.map(&:id),
             devices.map(&:id),
-            mac: mac?
+            mac: mac?,
+            sub_platform: tvos? ? 'tvOS' : nil
           )
         end
 
@@ -425,6 +448,11 @@ module Spaceship
         platform == 'mac'
       end
 
+      # @return (Bool) Is this a tvos provisioning profile?
+      def tvos?
+        sub_platform == 'tvOS'
+      end
+
       def devices
         fetch_details
 

data/spaceship/lib/spaceship/tunes/application.rb

@@ -63,7 +63,7 @@ module Spaceship
         #   as either the App ID or the bundle identifier
         def find(identifier, mac: false)
           all.find do |app|
-            (app.apple_id == identifier.to_s || app.bundle_id == identifier) &&
+            ((app.apple_id && app.apple_id.casecmp(identifier.to_s) == 0) || (app.bundle_id && app.bundle_id.casecmp(identifier.to_s) == 0)) &&
               app.version_sets.any? { |v| (mac ? ["osx"] : ["ios", "appletvos"]).include?(v.platform) }
           end
         end
@@ -249,6 +249,16 @@ module Spaceship
         client.availability(self.apple_id)
       end
 
+      #####################################################
+      # @!group in_app_purchases
+      #####################################################
+      # Get base In-App-Purchases object
+      def in_app_purchases
+        attrs = {}
+        attrs[:application] = self
+        Tunes::IAP.factory(attrs)
+      end
+
       #####################################################
       # @!group Builds
       #####################################################

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -0,0 +1,113 @@
+require 'spaceship/tunes/iap_list'
+require 'spaceship/tunes/iap_detail'
+require 'spaceship/tunes/iap_status'
+require 'spaceship/tunes/iap_type'
+require 'spaceship/tunes/iap_family_list'
+require 'spaceship/tunes/iap_families'
+require 'spaceship/tunes/iap_family_details'
+require 'spaceship/tunes/iap_families'
+
+module Spaceship
+  module Tunes
+    class IAP < TunesBase
+      # @return (Spaceship::Tunes::Application) A reference to the application
+      attr_accessor :application
+
+      class << self
+        def factory(attrs)
+          return self.new(attrs)
+        end
+      end
+
+      # @return (Spaceship::Tunes::IAPFamilies) A reference to the familie list
+      def families
+        attrs = {}
+        attrs[:application] = self.application
+        Tunes::IAPFamilies.factory(attrs)
+      end
+
+      # Creates a new In-App-Purchese on iTunes Connect
+      # if the In-App-Purchase already exists an exception is raised. Spaceship::TunesClient::ITunesConnectError
+      # @param type (String): The Type of the in-app-purchase (Spaceship::Tunes::IAPType::CONSUMABLE,Spaceship::Tunes::IAPType::NON_CONSUMABLE,Spaceship::Tunes::IAPType::RECURRING,Spaceship::Tunes::IAPType::NON_RENEW_SUBSCRIPTION)
+      # @param versions (Hash): a Hash of the languages
+      # @example: {
+      #   'de-DE': {
+      #     name: "Name shown in AppStore",
+      #     description: "Description of the In app Purchase"
+      #
+      #   }
+      # }
+      # @param reference_name (String): iTC Reference Name
+      # @param product_id (String): A unique ID for your in-app-purchase
+      # @param bundle_id (String): The bundle ID must match the one you used in Xcode. It
+      # @param cleared_for_sale (Boolean): Is this In-App-Purchase Cleared for Sale
+      # @param review_notes (String): Review Notes
+      # @param review_screenshot (String): Path to the screenshot (should be 640x940 PNG)
+      # @param pricing_intervals (Hash): a Hash of the languages
+      # @example:
+      #  [
+      #    {
+      #      country: "WW",
+      #      begin_date: nil,
+      #      end_date: nil,
+      #      tier: 1
+      #    }
+      #  ]
+      # @param family_id (String) Only used on RECURRING purchases, assigns the In-App-Purchase to a specific familie
+      # @param subscription_free_trial (String) Free Trial duration (1w,1m,3m....)
+      # @param subscription_duration (String) 1w,1m.....
+      def create!(type: "consumable",
+                  versions: nil,
+                  reference_name: nil,
+                  product_id: nil,
+                  cleared_for_sale: true,
+                  review_notes: nil,
+                  review_screenshot: nil,
+                  pricing_intervals: nil,
+                  family_id: nil,
+                  subscription_free_trial: nil,
+                  subscription_duration: nil)
+
+        client.create_iap!(app_id: self.application.apple_id,
+                           type: type,
+                           versions: versions,
+                           reference_name: reference_name,
+                           product_id: product_id,
+                           cleared_for_sale: cleared_for_sale,
+                           review_notes: review_notes,
+                           review_screenshot: review_screenshot,
+                           pricing_intervals: pricing_intervals,
+                           family_id: family_id,
+                           subscription_duration: subscription_duration,
+                           subscription_free_trial: subscription_free_trial)
+      end
+
+      # find a specific product
+      # @param product_id (String) Product Id
+      def find(product_id)
+        all.each do |product|
+          if product.product_id == product_id
+            return product
+          end
+        end
+        return nil
+      end
+
+      # return all available In-App-Purchase's of current app
+      # this is not paged inside iTC-API so if you have a lot if IAP's (2k+)
+      # it might take some time to load, same as it takes when you load the list via iTunes Connect
+      def all(include_deleted: false)
+        r = client.iaps(app_id: self.application.apple_id)
+        return_iaps = []
+        r.each do |product|
+          attrs = product
+          attrs[:application] = self.application
+          loaded_iap = Tunes::IAPList.factory(attrs)
+          next if loaded_iap.status == "deleted" && !include_deleted
+          return_iaps << loaded_iap
+        end
+        return_iaps
+      end
+    end
+  end
+end