fastlane 2.126.0.beta.20190623200100 → 2.126.0

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

@@ -1,26 +1,321 @@
 require 'spaceship/connect_api/testflight/client'
-require 'spaceship/connect_api/testflight/base'
-
-require 'spaceship/connect_api/testflight/models/app'
-require 'spaceship/connect_api/testflight/models/beta_app_localization'
-require 'spaceship/connect_api/testflight/models/beta_build_localization'
-require 'spaceship/connect_api/testflight/models/beta_build_metric'
-require 'spaceship/connect_api/testflight/models/beta_app_review_detail'
-require 'spaceship/connect_api/testflight/models/beta_app_review_submission'
-require 'spaceship/connect_api/testflight/models/beta_group'
-require 'spaceship/connect_api/testflight/models/beta_tester'
-require 'spaceship/connect_api/testflight/models/beta_tester_metric'
-require 'spaceship/connect_api/testflight/models/build'
-require 'spaceship/connect_api/testflight/models/build_delivery'
-require 'spaceship/connect_api/testflight/models/build_beta_detail'
-require 'spaceship/connect_api/testflight/models/pre_release_version'
-require 'spaceship/connect_api/testflight/models/user'
 
 module Spaceship
-  module ConnectAPI
+  class ConnectAPI
     module TestFlight
-      def self.client
-        return Spaceship::ConnectAPI::TestFlight::Base.client
+      #
+      # apps
+      #
+
+      def get_apps(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("apps", params)
+      end
+
+      def get_app(app_id: nil, includes: nil)
+        params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
+        Client.instance.get("apps/#{app_id}", params)
+      end
+
+      #
+      # betaAppLocalizations
+      #
+
+      def get_beta_app_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaAppLocalizations", params)
+      end
+
+      def post_beta_app_localizations(app_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            type: "betaAppLocalizations",
+            relationships: {
+              app: {
+                data: {
+                  type: "apps",
+                  id: app_id
+                }
+              }
+            }
+          }
+        }
+
+        Client.instance.post("betaAppLocalizations", body)
+      end
+
+      def patch_beta_app_localizations(localization_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            id: localization_id,
+            type: "betaAppLocalizations"
+          }
+        }
+
+        Client.instance.patch("betaAppLocalizations/#{localization_id}", body)
+      end
+
+      #
+      # betaAppReviewDetails
+      #
+
+      def get_beta_app_review_detail(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaAppReviewDetails", params)
+      end
+
+      def patch_beta_app_review_detail(app_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            id: app_id,
+            type: "betaAppReviewDetails"
+          }
+        }
+
+        Client.instance.patch("betaAppReviewDetails/#{app_id}", body)
+      end
+
+      #
+      # betaAppReviewSubmissions
+      #
+
+      def get_beta_app_review_submissions(filter: {}, includes: nil, limit: nil, sort: nil, cursor: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+        Client.instance.get("betaAppReviewSubmissions", params)
+      end
+
+      def post_beta_app_review_submissions(build_id: nil)
+        body = {
+          data: {
+            type: "betaAppReviewSubmissions",
+            relationships: {
+              build: {
+                data: {
+                  type: "builds",
+                  id: build_id
+                }
+              }
+            }
+          }
+        }
+
+        Client.instance.post("betaAppReviewSubmissions", body)
+      end
+
+      def delete_beta_app_review_submission(beta_app_review_submission_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil, cursor: nil)
+        Client.instance.delete("betaAppReviewSubmissions/#{beta_app_review_submission_id}", params)
+      end
+
+      #
+      # betaBuildLocalizations
+      #
+
+      def get_beta_build_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaBuildLocalizations", params)
+      end
+
+      def post_beta_build_localizations(build_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            type: "betaBuildLocalizations",
+            relationships: {
+              build: {
+                data: {
+                  type: "builds",
+                  id: build_id
+                }
+              }
+            }
+          }
+        }
+
+        Client.instance.post("betaBuildLocalizations", body)
+      end
+
+      def patch_beta_build_localizations(localization_id: nil, feedbackEmail: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            id: localization_id,
+            type: "betaBuildLocalizations"
+          }
+        }
+
+        Client.instance.patch("betaBuildLocalizations/#{localization_id}", body)
+      end
+
+      #
+      # betaBuildMetrics
+      #
+
+      def get_beta_build_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaBuildMetrics", params)
+      end
+
+      #
+      # betaGroups
+      #
+
+      def get_beta_groups(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaGroups", params)
+      end
+
+      def add_beta_groups_to_build(build_id: nil, beta_group_ids: [])
+        body = {
+          data: beta_group_ids.map do |id|
+            {
+              type: "betaGroups",
+              id: id
+            }
+          end
+        }
+
+        Client.instance.post("builds/#{build_id}/relationships/betaGroups", body)
+      end
+
+      #
+      # betaTesters
+      #
+
+      def get_beta_testers(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaTesters", params)
+      end
+
+      # beta_testers - [{email: "", firstName: "", lastName: ""}]
+      def post_bulk_beta_tester_assignments(beta_group_id: nil, beta_testers: nil)
+        beta_testers || []
+
+        beta_testers.map do |tester|
+          tester[:errors] = []
+        end
+
+        body = {
+          data: {
+            attributes: {
+              betaTesters: beta_testers
+            },
+            relationships: {
+              betaGroup: {
+                data: {
+                  type: "betaGroups",
+                  id: beta_group_id
+                }
+              }
+            },
+            type: "bulkBetaTesterAssignments"
+          }
+        }
+
+        Client.instance.post("bulkBetaTesterAssignments", body)
+      end
+
+      def delete_beta_tester_from_apps(beta_tester_id: nil, app_ids: [])
+        body = {
+          data: app_ids.map do |id|
+            {
+              type: "apps",
+              id: id
+            }
+          end
+        }
+
+        delete("betaTesters/#{beta_tester_id}/relationships/apps", nil, body)
+      end
+
+      def delete_beta_tester_from_beta_groups(beta_tester_id: nil, beta_group_ids: [])
+        body = {
+          data: beta_group_ids.map do |id|
+            {
+              type: "betaGroups",
+              id: id
+            }
+          end
+        }
+
+        delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
+      end
+
+      #
+      # betaTesterMetrics
+      #
+
+      def get_beta_tester_metrics(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaTesterMetrics", params)
+      end
+
+      #
+      # builds
+      #
+
+      def get_builds(filter: {}, includes: "buildBetaDetail,betaBuildMetrics", limit: 10, sort: "uploadedDate", cursor: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort, cursor: cursor)
+        Client.instance.get("builds", params)
+      end
+
+      def get_build(build_id: nil, includes: nil)
+        params = Client.instance.build_params(filter: nil, includes: includes, limit: nil, sort: nil, cursor: nil)
+        Client.instance.get("builds/#{build_id}", params)
+      end
+
+      def patch_builds(build_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            id: build_id,
+            type: "builds"
+          }
+        }
+
+        Client.instance.patch("builds/#{build_id}", body)
+      end
+
+      #
+      # buildBetaDetails
+      #
+
+      def get_build_beta_details(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("buildBetaDetails", params)
+      end
+
+      def patch_build_beta_details(build_beta_details_id: nil, attributes: {})
+        body = {
+          data: {
+            attributes: attributes,
+            id: build_beta_details_id,
+            type: "buildBetaDetails"
+          }
+        }
+
+        Client.instance.patch("buildBetaDetails/#{build_beta_details_id}", body)
+      end
+
+      #
+      # buildDeliveries
+      #
+
+      def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("buildDeliveries", params)
+      end
+
+      #
+      # preReleaseVersions
+      #
+
+      def get_pre_release_versions(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("preReleaseVersions", params)
       end
     end
   end

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

@@ -8,7 +8,7 @@ require 'openssl'
 # openssl ec -in key.pem -pubout -out public_key.pem -aes256
 
 module Spaceship
-  module ConnectAPI
+  class ConnectAPI
     class Token
       # maximum expiration supported by AppStore (20 minutes)
       MAX_TOKEN_DURATION = 1200
@@ -17,6 +17,18 @@ module Spaceship
       attr_reader :issuer_id
       attr_reader :text
 
+      def self.create(key_id: nil, issuer_id: nil, filepath: nil)
+        key_id ||= ENV['SPACESHIP_CONNECT_API_KEY_ID']
+        issuer_id ||= ENV['SPACESHIP_CONNECT_API_ISSUER_ID']
+        filepath ||= ENV['SPACESHIP_CONNECT_API_KEY_FILEPATH']
+
+        self.new(
+          key_id: key_id,
+          issuer_id: issuer_id,
+          key: OpenSSL::PKey::EC.new(File.read(filepath))
+        )
+      end
+
       def initialize(key_id: nil, issuer_id: nil, key: nil)
         @expiration = Time.now + MAX_TOKEN_DURATION
         @key_id = key_id

data/spaceship/lib/spaceship/connect_api/users/client.rb

@@ -0,0 +1,33 @@
+require_relative '../client'
+require_relative '../../tunes/tunes_client'
+
+module Spaceship
+  class ConnectAPI
+    module Users
+      class Client < Spaceship::ConnectAPI::Client
+        def self.instance
+          # Verify there is a token or a client that can be used
+          if Spaceship::ConnectAPI.token
+            if @client.nil? || @client.token != Spaceship::ConnectAPI.token
+              @client = Client.new(token: Spaceship::ConnectAPI.token)
+            end
+          elsif Spaceship::Tunes.client
+            # Initialize new client if new or if team changed
+            if @client.nil? || @client.team_id != Spaceship::Tunes.client.team_id
+              @client = Client.client_with_authorization_from(Spaceship::Tunes.client)
+            end
+          end
+
+          # Need to handle not having a client but this shouldn't ever happen
+          raise "Please login using `Spaceship::Tunes.login('user', 'password')`" unless @client
+
+          @client
+        end
+
+        def self.hostname
+          'https://appstoreconnect.apple.com/iris/v1/'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require 'spaceship/connect_api/users/client'
+
+module Spaceship
+  class ConnectAPI
+    module Users
+      #
+      # users
+      #
+
+      def get_users(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("users", params)
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/test_flight/build.rb

@@ -218,7 +218,7 @@ module Spaceship
         return if approved?
 
         build = find_app_store_connect_build
-        Spaceship::ConnectAPI::TestFlight.client.post_beta_app_review_submissions(build_id: build["id"])
+        Spaceship::ConnectAPI.post_beta_app_review_submissions(build_id: build["id"])
       end
 
       def expire!
@@ -231,7 +231,7 @@ module Spaceship
 
       # Bridges the TestFlight::Build to the App Store Connect API build
       def find_app_store_connect_build
-        resp = Spaceship::ConnectAPI::TestFlight.client.get_builds(filter: { expired: false, processingState: "PROCESSING,VALID", version: self.build_version, "preReleaseVersion.version" => self.train_version, app: app_id })
+        resp = Spaceship::ConnectAPI.get_builds(filter: { expired: false, processingState: "PROCESSING,VALID", version: self.build_version, "preReleaseVersion.version" => self.train_version, app: app_id })
         resp.first
       end
     end

data/spaceship/lib/spaceship/test_flight/build_trains.rb

@@ -13,65 +13,14 @@ module Spaceship::TestFlight
     # See `Spaceship::TestFlight::Build#reload`
 
     def self.all(app_id: nil, platform: nil, retry_count: 3)
-      client = Spaceship::ConnectAPI::TestFlight.client
-
-      builds = []
-      included = []
-      cursor = nil
-
-      loop do
-        builds_resp = client.get_builds(filter: { app: app_id, processingState: "VALID,PROCESSING,FAILED,INVALID" }, limit: 100, sort: "uploadedDate", includes: "preReleaseVersion,app", cursor: cursor)
-        builds += builds_resp["data"]
-        included += (builds_resp["included"] || [])
-
-        next_page = builds_resp["links"]["next"]
-        break if next_page.nil?
-
-        uri = URI.parse(next_page)
-        params = CGI.parse(uri.query)
-        cursor = params["cursor"].first
-
-        break if cursor.nil?
-      end
-
-      # Load with all of the data
-      builds.map do |build|
-        r = build["relationships"]["app"]["data"]
-        build["app"] = included.find { |h| h["type"] == r["type"] && h["id"] == r["id"] }
-
-        r = build["relationships"]["preReleaseVersion"]["data"]
-        build["preReleaseVersion"] = included.find { |h| h["type"] == r["type"] && h["id"] == r["id"] }
-
-        build
-      end
-
-      # Map to testflight build response????
-      train_builds = builds.map do |build|
-        h = {}
-
-        h['buildVersion'] = build["attributes"]["version"]
-        h['uploadDate'] = build["attributes"]["uploadedDate"]
-
-        processing_state = build["attributes"]["processingState"]
-        if processing_state == "VALID"
-          h['externalState'] = Spaceship::TestFlight::Build::BUILD_STATES[:active]
-        elsif processing_state == "PROCESSING"
-          h['externalState'] = Spaceship::TestFlight::Build::BUILD_STATES[:processing]
-        end
-
-        h['appAdamId'] = build["app"]["id"]
-        h['bundleId'] = build["app"]["attributes"]["bundleId"]
-
-        h['trainVersion'] = build["preReleaseVersion"]["attributes"]["version"]
-
-        h
-      end
+      resps = Spaceship::ConnectAPI.get_builds(filter: { app: app_id, processingState: "VALID,PROCESSING,FAILED,INVALID" }, limit: 100, sort: "uploadedDate", includes: "preReleaseVersion,app").all_pages
+      connect_builds = resps.map(&:to_models).flatten
 
       trains = {}
-      train_builds.each do |build|
-        train_version = build["trainVersion"]
+      connect_builds.each do |connect_build|
+        train_version = connect_build.app_version
         trains[train_version] ||= []
-        trains[train_version] << Spaceship::TestFlight::Build.new(build)
+        trains[train_version] << connect_build.to_testflight_build
       end
 
       self.new(trains)