fastlane 2.197.0 → 2.200.0

data/spaceship/lib/spaceship/client.rb

@@ -391,10 +391,11 @@ module Spaceship
 
         keychain_entry = CredentialsManager::AccountManager.new(user: user, password: password)
         user ||= keychain_entry.user
-        password = keychain_entry.password
+        password = keychain_entry.password(ask_if_missing: !Spaceship::Globals.check_session)
       end
 
       if user.to_s.strip.empty? || password.to_s.strip.empty?
+        exit_with_session_state(user, false) if Spaceship::Globals.check_session
         raise NoUserCredentialsError.new, "No login data provided"
       end
 
@@ -413,21 +414,16 @@ module Spaceship
       end
     end
 
-    # This method is used for both the Apple Dev Portal and App Store Connect
-    # This will also handle 2 step verification and 2 factor authentication
+    # Check if we have a cached/valid session
     #
-    # It is called in `send_login_request` of sub classes (which the method `login`, above, transferred over to via `do_login`)
-    # rubocop:disable Metrics/PerceivedComplexity
-    def send_shared_login_request(user, password)
-      # Check if we have a cached/valid session
-      #
-      # Background:
-      # December 4th 2017 Apple introduced a rate limit - which is of course fine by itself -
-      # but unfortunately also rate limits successful logins. If you call multiple tools in a
-      # lane (e.g. call match 5 times), this would lock you out of the account for a while.
-      # By loading existing sessions and checking if they're valid, we're sending less login requests.
-      # More context on why this change was necessary https://github.com/fastlane/fastlane/pull/11108
-      #
+    # Background:
+    # December 4th 2017 Apple introduced a rate limit - which is of course fine by itself -
+    # but unfortunately also rate limits successful logins. If you call multiple tools in a
+    # lane (e.g. call match 5 times), this would lock you out of the account for a while.
+    # By loading existing sessions and checking if they're valid, we're sending less login requests.
+    # More context on why this change was necessary https://github.com/fastlane/fastlane/pull/11108
+    #
+    def has_valid_session
       # If there was a successful manual login before, we have a session on disk
       if load_session_from_file
         # Check if the session is still valid here
@@ -462,6 +458,23 @@ module Spaceship
       #
       # After this point, we sure have no valid session any more and have to create a new one
       #
+      return false
+    end
+
+    # This method is used for both the Apple Dev Portal and App Store Connect
+    # This will also handle 2 step verification and 2 factor authentication
+    #
+    # It is called in `send_login_request` of sub classes (which the method `login`, above, transferred over to via `do_login`)
+    # rubocop:disable Metrics/PerceivedComplexity
+    def send_shared_login_request(user, password)
+      # Check if the cache or FASTLANE_SESSION is still valid
+      has_valid_session = self.has_valid_session
+
+      # Exit if `--check_session` flag was passed
+      exit_with_session_state(user, has_valid_session) if Spaceship::Globals.check_session
+
+      # If the session is valid no need to attempt to generate a new one.
+      return true if has_valid_session
 
       data = {
         accountName: user,
@@ -566,6 +579,13 @@ module Spaceship
       return false
     end
 
+    # This method is used to log if the session is valid or not and then exit
+    # It is called when the `--check_session` flag is passed
+    def exit_with_session_state(user, has_valid_session)
+      puts("#{has_valid_session ? 'Valid' : 'No valid'} session found (#{user}). Exiting.")
+      exit(has_valid_session)
+    end
+
     def itc_service_key
       return @service_key if @service_key
 

data/spaceship/lib/spaceship/commands_generator.rb

@@ -41,7 +41,7 @@ module Spaceship
         c.syntax = 'fastlane spaceship spaceauth'
         c.description = 'Authentication helper for spaceship/fastlane to work with Apple 2-Step/2FA'
         c.option('--copy_to_clipboard', 'Whether the session string should be copied to clipboard. For more info see https://docs.fastlane.tools/best-practices/continuous-integration/#storing-a-manually-verified-session-using-spaceauth`')
-
+        c.option('--check_session', 'Check to see if there is a valid session (either in the cache or via FASTLANE_SESSION). Sets the exit code to 0 if the session is valid or 1 if not.') { Spaceship::Globals.check_session = true }
         c.action do |args, options|
           Spaceship::SpaceauthRunner.new(username: options.user, copy_to_clipboard: options.copy_to_clipboard).run
         end

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

@@ -1,6 +1,7 @@
 require_relative '../model'
 require_relative './build'
 
+# rubocop:disable Metrics/ClassLength
 module Spaceship
   class ConnectAPI
     class App
@@ -414,6 +415,47 @@ module Spaceship
         })
       end
 
+      #
+      # Review Submissions
+      #
+
+      def get_ready_review_submission(client: nil, platform:, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        filter = {
+          state: [
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::READY_FOR_REVIEW
+          ].join(","),
+          platform: platform
+        }
+
+        return get_review_submissions(client: client, filter: filter, includes: includes).first
+      end
+
+      def get_in_progress_review_submission(client: nil, platform:, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        filter = {
+          state: [
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW
+          ].join(","),
+          platform: platform
+        }
+
+        return get_review_submissions(client: client, filter: filter, includes: includes).first
+      end
+
+      # appStoreVersionForReview,items
+      def get_review_submissions(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_review_submissions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
+      def create_review_submission(client: nil, platform:)
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_review_submission(app_id: id, platform: platform)
+        return resp.to_models.first
+      end
+
       #
       # Users
       #
@@ -434,3 +476,4 @@ module Spaceship
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

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

@@ -25,6 +25,7 @@ module Spaceship
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         DEVELOPER_REMOVED_FROM_SALE = "DEVELOPER_REMOVED_FROM_SALE"
+        READY_FOR_REVIEW = "READY_FOR_REVIEW"
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"

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

@@ -38,6 +38,7 @@ module Spaceship
 
         APP_WATCH_SERIES_3 = "APP_WATCH_SERIES_3"
         APP_WATCH_SERIES_4 = "APP_WATCH_SERIES_4"
+        APP_WATCH_SERIES_7 = "APP_WATCH_SERIES_7"
 
         APP_APPLE_TV = "APP_APPLE_TV"
 
@@ -85,6 +86,7 @@ module Spaceship
 
           APP_WATCH_SERIES_3,
           APP_WATCH_SERIES_4,
+          APP_WATCH_SERIES_7,
 
           APP_DESKTOP
         ]

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

@@ -41,6 +41,9 @@ module Spaceship
         MAC_APP_DEVELOPMENT = "MAC_APP_DEVELOPMENT"
         DEVELOPER_ID_KEXT = "DEVELOPER_ID_KEXT"
         DEVELOPER_ID_APPLICATION = "DEVELOPER_ID_APPLICATION"
+
+        # As of 2021-11-09, this is only available with Apple ID auth
+        DEVELOPER_ID_INSTALLER = "DEVELOPER_ID_INSTALLER"
       end
 
       def self.type

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

@@ -0,0 +1,73 @@
+require_relative '../model'
+require_relative './review_submission_item'
+
+module Spaceship
+  class ConnectAPI
+    class ReviewSubmission
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :platform
+      attr_accessor :state
+      attr_accessor :submitted_date
+
+      attr_accessor :app_store_version_for_review
+      attr_accessor :items
+      attr_accessor :last_updated_by_actor
+      attr_accessor :submitted_by_actor
+
+      module ReviewSubmissionState
+        CANCELING = "CANCELING"
+        COMPLETE = "COMPLETE"
+        IN_REVIEW = "IN_REVIEW"
+        READY_FOR_REVIEW = "READY_FOR_REVIEW"
+        WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
+      end
+
+      attr_mapping({
+         "platform" => "platform",
+         "state" => "state",
+         "submittedDate" => "submitted_date",
+
+         "appStoreVersionForReview" => "app_store_version_for_review",
+         "items" => "items",
+         "lastUpdatedByActor" => "last_updated_by_actor",
+         "submittedByActor" => "submitted_by_actor",
+       })
+
+      def self.type
+        return "reviewSubmissions"
+      end
+
+      #
+      # API
+      #
+
+      # appStoreVersionForReview,items,submittedByActor,lastUpdatedByActor
+      def self.get(client: nil, review_submission_id:, includes: nil)
+        client ||= Spaceship::ConnectAPI
+        resp = client.get_review_submission(review_submission_id: review_submission_id, includes: includes)
+        return resp.to_models.first
+      end
+
+      def submit_for_review(client: nil)
+        client ||= Spaceship::ConnectAPI
+        attributes = { submitted: true }
+        resp = client.patch_review_submission(review_submission_id: id, attributes: attributes)
+        return resp.to_models.first
+      end
+
+      def cancel_submission(client: nil)
+        client ||= Spaceship::ConnectAPI
+        attributes = { canceled: true }
+        resp = client.patch_review_submission(review_submission_id: id, attributes: attributes)
+        return resp.to_models.first
+      end
+
+      def add_app_store_version_to_review_items(client: nil, app_store_version_id:)
+        client ||= Spaceship::ConnectAPI
+        resp = client.post_review_submission_item(review_submission_id: id, app_store_version_id: app_store_version_id)
+        return resp.to_models.first
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require_relative '../model'
+
+module Spaceship
+  class ConnectAPI
+    class ReviewSubmissionItem
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :state
+
+      attr_accessor :app_store_version_experiment
+      attr_accessor :app_store_version
+      attr_accessor :app_store_product_page_version
+      attr_accessor :app_event
+
+      attr_mapping({
+         "state" =>  "state",
+
+         "appStoreVersionExperiment" => "app_store_version_experiment",
+         "appStoreVersion" => "app_store_version",
+         "appCustomProductPageVersion" => "app_store_product_page_version",
+         "appEvent" => "app_event",
+       })
+
+      def self.type
+        return "reviewSubmissionItems"
+      end
+
+      #
+      # API
+      #
+
+      # appCustomProductPageVersion,appEvent,appStoreVersion,appStoreVersionExperiment
+      def self.all(client: nil, review_submission_id:, includes: nil, limit: nil, sort: nil)
+        client ||= Spaceship::ConnectAPI
+        resps = client.get_review_submission_items(review_submission_id: review_submission_id, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+    end
+  end
+end

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

@@ -64,6 +64,19 @@ module Spaceship
           yield(model)
         end
       end
+
+      def all_pages_each(&block)
+        to_models.each do |model|
+          yield(model)
+        end
+
+        resp = self
+        loop do
+          resp = resp.next_page
+          break if resp.nil?
+          resp.each(&block)
+        end
+      end
     end
   end
 end

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

@@ -1126,6 +1126,89 @@ module Spaceship
           tunes_request_client.delete("idfaDeclarations/#{idfa_declaration_id}", params)
         end
 
+        #
+        # reviewSubmissions
+        #
+
+        def get_review_submissions(app_id:, 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}/reviewSubmissions", params)
+        end
+
+        def get_review_submission(review_submission_id:, 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("reviewSubmissions/#{review_submission_id}", params)
+        end
+
+        def post_review_submission(app_id:, platform:)
+          body = {
+            data: {
+              type: "reviewSubmissions",
+              attributes: {
+                platform: platform
+              },
+              relationships: {
+                app: {
+                  data: {
+                    type: "apps",
+                    id: app_id
+                  }
+                }
+              }
+            }
+          }
+
+          tunes_request_client.post("reviewSubmissions", body)
+        end
+
+        def patch_review_submission(review_submission_id:, attributes: nil)
+          body = {
+            data: {
+              type: "reviewSubmissions",
+              id: review_submission_id,
+              attributes: attributes,
+            }
+          }
+
+          tunes_request_client.patch("reviewSubmissions/#{review_submission_id}", body)
+        end
+
+        #
+        # reviewSubmissionItems
+        #
+
+        def get_review_submission_items(review_submission_id:, 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("reviewSubmissions/#{review_submission_id}/items", params)
+        end
+
+        def post_review_submission_item(review_submission_id:, app_store_version_id: nil)
+          body = {
+            data: {
+              type: "reviewSubmissionItems",
+              relationships: {
+                reviewSubmission: {
+                  data: {
+                    type: "reviewSubmissions",
+                    id: review_submission_id
+                  }
+                }
+              }
+            }
+          }
+
+          unless app_store_version_id.nil?
+            body[:data][:relationships][:appStoreVersion] = {
+              data: {
+                type: "appStoreVersions",
+                id: app_store_version_id
+              }
+            }
+          end
+
+          tunes_request_client.post("reviewSubmissionItems", body)
+        end
+
         #
         # sandboxTesters
         #

data/spaceship/lib/spaceship/connect_api.rb

@@ -62,6 +62,8 @@ require 'spaceship/connect_api/models/app_store_version_localization'
 require 'spaceship/connect_api/models/app_store_version_phased_release'
 require 'spaceship/connect_api/models/app_store_version'
 require 'spaceship/connect_api/models/idfa_declaration'
+require 'spaceship/connect_api/models/review_submission'
+require 'spaceship/connect_api/models/review_submission_item'
 require 'spaceship/connect_api/models/reset_ratings_request'
 require 'spaceship/connect_api/models/sandbox_tester'
 require 'spaceship/connect_api/models/territory'

data/spaceship/lib/spaceship/globals.rb

@@ -1,5 +1,9 @@
 module Spaceship
   class Globals
+    class << self
+      attr_writer(:check_session)
+    end
+
     # if spaceship is run with a FastlaneCore available respect the global state there
     # otherwise fallback to $verbose
     def self.verbose?
@@ -8,5 +12,10 @@ module Spaceship
       end
       return $verbose
     end
+
+    # if spaceship is run with the --check_session flag this value will be set to true
+    def self.check_session
+      return @check_session
+    end
   end
 end

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -16,7 +16,7 @@ module Spaceship
 
     def run
       begin
-        puts("Logging into to App Store Connect (#{@username})...")
+        puts("Logging into to App Store Connect (#{@username})...") unless Spaceship::Globals.check_session
         Spaceship::Tunes.login(@username)
         puts("Successfully logged in to App Store Connect".green)
         puts("")

data/supply/lib/supply/options.rb

@@ -217,6 +217,14 @@ module Supply
                                      verify_block: proc do |value|
                                        UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
                                      end),
+        FastlaneCore::ConfigItem.new(key: :track_promote_release_status,
+                                     env_name: "SUPPLY_TRACK_PROMOTE_RELEASE_STATUS",
+                                     optional: true,
+                                     description: "Promoted track release status (used when promoting a track) - valid values are #{Supply::ReleaseStatus::ALL.join(', ')}",
+                                     default_value: Supply::ReleaseStatus::COMPLETED,
+                                     verify_block: proc do |value|
+                                                     UI.user_error!("Value must be one of '#{Supply::RELEASE_STATUS}'") unless Supply::ReleaseStatus::ALL.include?(value)
+                                                   end),
         FastlaneCore::ConfigItem.new(key: :validate_only,
                                      env_name: "SUPPLY_VALIDATE_ONLY",
                                      optional: true,

data/supply/lib/supply/uploader.rb

@@ -164,6 +164,10 @@ module Supply
         UI.user_error!(%(Cannot specify rollout percentage when the release status is set to 'draft'))
       end
 
+      if Supply.config[:track_promote_release_status] == Supply::ReleaseStatus::DRAFT && Supply.config[:rollout]
+        UI.user_error!(%(Cannot specify rollout percentage when the track promote release status is set to 'draft'))
+      end
+
       unless Supply.config[:version_codes_to_retain].nil?
         Supply.config[:version_codes_to_retain] = Supply.config[:version_codes_to_retain].map(&:to_i)
       end
@@ -182,7 +186,7 @@ module Supply
         end
       else
         releases = releases.select do |release|
-          release.status == Supply::ReleaseStatus::COMPLETED
+          release.status == Supply.config[:release_status]
         end
       end
 
@@ -200,7 +204,7 @@ module Supply
         release.status = Supply::ReleaseStatus::IN_PROGRESS
         release.user_fraction = rollout
       else
-        release.status = Supply::ReleaseStatus::COMPLETED
+        release.status = Supply.config[:track_promote_release_status]
         release.user_fraction = nil
       end
 

metadata

@@ -1,38 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.197.0
+  version: 2.200.0
 platform: ruby
 authors:
-- Max Ott
-- Danielle Tomlinson
 - Jimmy Dee
-- Manish Rathi
-- Manu Wallner
+- Jérôme Lacoste
+- Danielle Tomlinson
 - Maksym Grebenets
-- Iulian Onofrei
+- Matthew Ellis
+- Josh Holtz
+- Luka Mirosevic
 - Felix Krause
-- Helmut Januschka
+- Iulian Onofrei
+- Satoshi Namai
 - Jan Piotrowski
-- Stefan Natchev
-- Luka Mirosevic
 - Joshua Liebowitz
-- Fumiya Nakamura
-- Kohki Miki
-- Satoshi Namai
-- Jérôme Lacoste
-- Daniel Jankowski
-- Aaron Brager
+- Manish Rathi
+- Helmut Januschka
 - Olivier Halligon
-- Matthew Ellis
+- Stefan Natchev
+- Max Ott
 - Roger Oba
+- Kohki Miki
 - Andrew McBurney
-- Josh Holtz
 - Jorge Revuelta H
+- Daniel Jankowski
+- Aaron Brager
+- Fumiya Nakamura
+- Manu Wallner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -993,6 +993,7 @@ files:
 - deliver/lib/deliver/upload_price_tier.rb
 - deliver/lib/deliver/upload_screenshots.rb
 - fastlane/README.md
+- fastlane/lib/.DS_Store
 - fastlane/lib/assets/ActionDetails.md.erb
 - fastlane/lib/assets/Actions.md.erb
 - fastlane/lib/assets/AppfileTemplate
@@ -1011,8 +1012,10 @@ files:
 - fastlane/lib/assets/s3_plist_template.erb
 - fastlane/lib/assets/s3_version_template.erb
 - fastlane/lib/fastlane.rb
+- fastlane/lib/fastlane/.DS_Store
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
+- fastlane/lib/fastlane/actions/.DS_Store
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1654,7 +1657,6 @@ 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/.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
@@ -1705,6 +1707,8 @@ files:
 - spaceship/lib/spaceship/connect_api/models/pre_release_version.rb
 - spaceship/lib/spaceship/connect_api/models/profile.rb
 - spaceship/lib/spaceship/connect_api/models/reset_ratings_request.rb
+- spaceship/lib/spaceship/connect_api/models/review_submission.rb
+- spaceship/lib/spaceship/connect_api/models/review_submission_item.rb
 - spaceship/lib/spaceship/connect_api/models/sandbox_tester.rb
 - spaceship/lib/spaceship/connect_api/models/territory.rb
 - spaceship/lib/spaceship/connect_api/models/user.rb
@@ -1837,6 +1841,7 @@ files:
 - supply/lib/supply/release_listing.rb
 - supply/lib/supply/setup.rb
 - supply/lib/supply/uploader.rb
+- trainer/lib/.DS_Store
 homepage: https://fastlane.tools
 licenses:
 - MIT
@@ -1867,6 +1872,7 @@ require_paths:
 - snapshot/lib
 - spaceship/lib
 - supply/lib
+- trainer/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="