fastlane 2.161.0 → 2.162.0

data/spaceship/lib/spaceship/client.rb

@@ -196,7 +196,7 @@ module Spaceship
       self.new(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
     end
 
-    def initialize(cookie: nil, current_team_id: nil, timeout: nil)
+    def initialize(cookie: nil, current_team_id: nil, csrf_tokens: nil, timeout: nil)
       options = {
        request: {
           timeout:       (ENV["SPACESHIP_TIMEOUT"] || timeout || 300).to_i,
@@ -204,6 +204,7 @@ module Spaceship
         }
       }
       @current_team_id = current_team_id
+      @csrf_tokens = csrf_tokens
       @cookie = cookie || HTTP::CookieJar.new
 
       @client = Faraday.new(self.class.hostname, options) do |c|

data/spaceship/lib/spaceship/connect_api.rb

@@ -15,6 +15,7 @@ require 'spaceship/connect_api/models/device'
 require 'spaceship/connect_api/models/profile'
 
 require 'spaceship/connect_api/models/user'
+require 'spaceship/connect_api/models/user_invitation'
 
 require 'spaceship/connect_api/models/app'
 require 'spaceship/connect_api/models/beta_app_localization'

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

@@ -17,7 +17,7 @@ module Spaceship
       #####################################################
 
       # Instantiates a client with cookie session or a JWT token.
-      def initialize(cookie: nil, current_team_id: nil, token: nil, another_client: nil)
+      def initialize(cookie: nil, current_team_id: nil, token: nil, csrf_tokens: nil, another_client: nil)
         params_count = [cookie, token, another_client].compact.size
         if params_count != 1
           raise "Must initialize with one of :cookie, :token, or :another_client"
@@ -25,10 +25,10 @@ module Spaceship
 
         if token.nil?
           if another_client.nil?
-            super(cookie: cookie, current_team_id: current_team_id, timeout: 1200)
+            super(cookie: cookie, current_team_id: current_team_id, csrf_tokens: csrf_tokens, timeout: 1200)
             return
           end
-          super(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id)
+          super(cookie: another_client.instance_variable_get(:@cookie), current_team_id: another_client.team_id, csrf_tokens: another_client.csrf_tokens)
         else
           options = {
             request: {

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

@@ -97,8 +97,18 @@ module Spaceship
       end
 
       def portal_team_id
-        return nil if @portal_client.nil?
-        return @portal_client.team_id
+        if token
+          message = [
+            "Cannot determine portal team id via the App Store Connect API (yet)",
+            "Look to see if you can get the portal team id from somewhere else",
+            "View more info in the docs at https://docs.fastlane.tools/app-store-connect-api/"
+          ]
+          raise message.join('. ')
+        elsif @portal_client
+          return @portal_client.team_id
+        else
+          raise "No App Store Connect API token or Portal Client set"
+        end
       end
 
       def tunes_team_id
@@ -126,7 +136,7 @@ module Spaceship
               "Or set the 'SPACESHIP_CONNECT_API_IN_HOUSE' environment variable to 'true'",
               "View more info in the docs at https://docs.fastlane.tools/app-store-connect-api/"
             ]
-            raise message.join('\n')
+            raise message.join('. ')
           end
           return !!token.in_house
         elsif @portal_client

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

@@ -111,7 +111,9 @@ module Spaceship
           timeout_minutes = (ENV["SPACESHIP_SCREENSHOT_UPLOAD_TIMEOUT"] || 20).to_i
 
           loop do
-            puts("Waiting for screenshot to appear before uploading...")
+            # This error handling needs to be revised since any error occured can reach here.
+            # It should handle errors based on what status code is.
+            puts("Waiting for screenshots to appear before uploading. This is unlikely to be recovered unless it's 503 error. error=\"#{error}\"")
             sleep(30)
 
             screenshots = Spaceship::ConnectAPI::AppScreenshotSet

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

@@ -35,7 +35,8 @@ module Spaceship
       #
 
       def self.all(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes)
+        resps = Spaceship::ConnectAPI.get_beta_testers(filter: filter, includes: includes).all_pages
+        return resps.flat_map(&:to_models)
       end
 
       def self.find(email: nil, includes: nil)

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

@@ -1,4 +1,7 @@
 require_relative '../model'
+
+require 'openssl'
+
 module Spaceship
   class ConnectAPI
     class Certificate
@@ -6,6 +9,7 @@ module Spaceship
 
       attr_accessor :certificate_content
       attr_accessor :display_name
+      attr_accessor :expiration_date
       attr_accessor :name
       attr_accessor :platform
       attr_accessor :serial_number
@@ -47,6 +51,26 @@ module Spaceship
         Time.parse(expiration_date) > Time.now
       end
 
+      # Create a new code signing request that can be used to
+      # generate a new certificate
+      # @example
+      #  Create a new certificate signing request
+      #  csr, pkey = Spaceship.certificate.create_certificate_signing_request
+      #
+      #  # Use the signing request to create a new distribution certificate
+      #  Spaceship.certificate.production.create!(csr: csr)
+      def self.create_certificate_signing_request
+        key = OpenSSL::PKey::RSA.new(2048)
+        csr = OpenSSL::X509::Request.new
+        csr.version = 0
+        csr.subject = OpenSSL::X509::Name.new([
+                                                ['CN', 'PEM', OpenSSL::ASN1::UTF8STRING]
+                                              ])
+        csr.public_key = key.public_key
+        csr.sign(key, OpenSSL::Digest::SHA1.new)
+        return [csr, key]
+      end
+
       #
       # API
       #
@@ -55,6 +79,24 @@ module Spaceship
         resps = Spaceship::ConnectAPI.get_certificates(filter: filter, includes: includes).all_pages
         return resps.flat_map(&:to_models)
       end
+
+      def self.create(certificate_type: nil, csr_content: nil)
+        attributes = {
+          certificateType: certificate_type,
+          csrContent: csr_content
+        }
+        resp = Spaceship::ConnectAPI.post_certificate(attributes: attributes)
+        return resp.to_models.first
+      end
+
+      def self.get(certificate_id: nil, includes: nil)
+        resp = Spaceship::ConnectAPI.get_certificate(certificate_id: certificate_id, includes: includes)
+        return resp.to_models.first
+      end
+
+      def delete!
+        Spaceship::ConnectAPI.delete_certificate(certificate_id: id)
+      end
     end
   end
 end

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

@@ -27,7 +27,8 @@ module Spaceship
         "expirationDate" => "expiration_date",
 
         "bundleId" => "bundle_id",
-        "certificates" => "certificates"
+        "certificates" => "certificates",
+        "devices" => "devices"
       })
 
       module ProfileState
@@ -83,6 +84,11 @@ 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
+        return resps.flat_map(&:to_models)
+      end
+
       def delete!
         return Spaceship::ConnectAPI.delete_profile(profile_id: id)
       end

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

@@ -0,0 +1,59 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class UserInvitation
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :first_name
+      attr_accessor :last_name
+      attr_accessor :email
+      attr_accessor :roles
+      attr_accessor :all_apps_visible
+      attr_accessor :provisioning_allowed
+
+      attr_mapping({
+        "firstName" => "first_name",
+        "lastName" => "last_name",
+        "email" => "email",
+        "roles" => "roles",
+        "allAppsVisible" => "all_apps_visible",
+        "provisioningAllowed" => "provisioning_allowed"
+      })
+
+      module UserRole
+        ADMIN = "ADMIN"
+        FINANCE = "FINANCE"
+        TECHNICAL = "TECHNICAL"
+        SALES = "SALES"
+        MARKETING = "MARKETING"
+        DEVELOPER = "DEVELOPER"
+        ACCOUNT_HOLDER = "ACCOUNT_HOLDER"
+        READ_ONLY = "READ_ONLY"
+        APP_MANAGER = "APP_MANAGER"
+        ACCESS_TO_REPORTS = "ACCESS_TO_REPORTS"
+        CUSTOMER_SUPPORT = "CUSTOMER_SUPPORT"
+      end
+
+      def self.type
+        return "userInvitations"
+      end
+
+      #
+      # Managing invitations
+      #
+
+      def self.all(filter: {}, includes: nil, sort: nil)
+        resps = Spaceship::ConnectAPI.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)
+      end
+
+      def delete!
+        Spaceship::ConnectAPI.delete_user_invitation(user_invitation_id: id)
+      end
+    end
+  end
+end

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

@@ -36,13 +36,39 @@ module Spaceship
           provisioning_request_client.get("certificates", params)
         end
 
+        def get_certificate(certificate_id: nil, includes: nil)
+          params = provisioning_request_client.build_params(filter: nil, includes: includes, limit: nil, sort: nil)
+          provisioning_request_client.get("certificates/#{certificate_id}", params)
+        end
+
+        def post_certificate(attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              type: "certificates"
+            }
+          }
+
+          provisioning_request_client.post("certificates", body)
+        end
+
+        def delete_certificate(certificate_id: nil)
+          raise "Certificate id is nil" if certificate_id.nil?
+
+          provisioning_request_client.delete("certificates/#{certificate_id}")
+        end
+
         #
         # devices
         #
 
-        def get_devices(filter: {}, includes: nil, limit: nil, sort: nil)
+        def get_devices(profile_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
           params = provisioning_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-          provisioning_request_client.get("devices", params)
+          if profile_id.nil?
+            provisioning_request_client.get("devices", params)
+          else
+            provisioning_request_client.get("profiles/#{profile_id}/devices", params)
+          end
         end
 
         #

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

@@ -277,6 +277,19 @@ module Spaceship
           test_flight_request_client.delete("betaTesters/#{beta_tester_id}/relationships/betaGroups", nil, body)
         end
 
+        def delete_beta_testers_from_app(beta_tester_ids: [], app_id: nil)
+          body = {
+            data: beta_tester_ids.map do |id|
+              {
+                type: "betaTesters",
+                id: id
+              }
+            end
+          }
+
+          test_flight_request_client.delete("apps/#{app_id}/relationships/betaTesters", nil, body)
+        end
+
         #
         # betaTesterMetrics
         #

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

@@ -17,11 +17,18 @@ module Spaceship
         # users
         #
 
+        # Get list of users
         def get_users(filter: {}, includes: nil, limit: nil, sort: nil)
           params = users_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
           users_request_client.get("users", params)
         end
 
+        # Delete existing user
+        def delete_user(user_id: nil)
+          users_request_client.delete("users/#{user_id}")
+        end
+
+        # Change app permissions for user
         def add_user_visible_apps(user_id: nil, app_ids: nil)
           body = {
             data: app_ids.map do |app_id|
@@ -34,6 +41,39 @@ module Spaceship
 
           users_request_client.post("users/#{user_id}/relationships/visibleApps", body)
         end
+
+        #
+        # invitations (invited users)
+        #
+
+        # Get all invited users (not yet accepted)
+        def get_user_invitations(filter: {}, includes: nil, limit: nil, sort: nil)
+          params = users_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+          users_request_client.get("userInvitations", params)
+        end
+
+        # Invite new users to App Store Connect
+        def post_user_invitation(email: nil, first_name: nil, last_name: nil, roles: [], provisioning_allowed: nil, all_apps_visible: nil)
+          body = {
+            data: {
+              type: "userInvitations",
+              attributes: {
+                email: email,
+                firstName: first_name,
+                lastName: last_name,
+                roles: roles,
+                provisioningAllowed: provisioning_allowed,
+                allAppsVisible: all_apps_visible
+              }
+            }
+          }
+          users_request_client.post("userInvitations", body)
+        end
+
+        # Remove invited user from team (not yet accepted)
+        def delete_user_invitation(user_invitation_id: nil)
+          users_request_client.delete("userInvitations/#{user_invitation_id}")
+        end
       end
     end
   end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.161.0
+  version: 2.162.0
 platform: ruby
 authors:
-- Jan Piotrowski
 - Kohki Miki
-- Manu Wallner
-- Josh Holtz
-- Jérôme Lacoste
-- Jimmy Dee
+- Danielle Tomlinson
+- Aaron Brager
+- Fumiya Nakamura
 - Maksym Grebenets
+- Felix Krause
+- Joshua Liebowitz
+- Jérôme Lacoste
 - Iulian Onofrei
-- Helmut Januschka
-- Luka Mirosevic
-- Olivier Halligon
-- Jorge Revuelta H
 - Max Ott
-- Felix Krause
-- Danielle Tomlinson
 - Daniel Jankowski
-- Fumiya Nakamura
-- Joshua Liebowitz
-- Aaron Brager
-- Matthew Ellis
-- Andrew McBurney
+- Josh Holtz
+- Olivier Halligon
 - Stefan Natchev
+- Andrew McBurney
+- Luka Mirosevic
+- Jimmy Dee
+- Matthew Ellis
+- Manu Wallner
+- Helmut Januschka
+- Jorge Revuelta H
+- Jan Piotrowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1662,6 +1662,7 @@ files:
 - 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
+- spaceship/lib/spaceship/connect_api/models/user_invitation.rb
 - spaceship/lib/spaceship/connect_api/provisioning/client.rb
 - spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb
 - spaceship/lib/spaceship/connect_api/response.rb