fastlane 2.155.1 → 2.157.0

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

@@ -1,27 +1,18 @@
-require_relative '../client'
+require_relative '../api_client'
+require_relative './users'
 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
+      class Client < Spaceship::ConnectAPI::APIClient
+        def initialize(cookie: nil, current_team_id: nil, token: nil, another_client: nil)
+          another_client ||= Spaceship::Tunes.client if cookie.nil? && token.nil?
 
-          # Need to handle not having a client but this shouldn't ever happen
-          raise "Please login using `Spaceship::Tunes.login('user', 'password')`" unless @client
+          super(cookie: cookie, current_team_id: current_team_id, token: token, another_client: another_client)
 
-          @client
+          self.extend(Spaceship::ConnectAPI::Users::API)
+          self.users_request_client = self
         end
 
         def self.hostname

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

@@ -3,26 +3,37 @@ require 'spaceship/connect_api/users/client'
 module Spaceship
   class ConnectAPI
     module Users
-      #
-      # users
-      #
+      module API
+        def users_request_client=(users_request_client)
+          @users_request_client = users_request_client
+        end
 
-      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
+        def users_request_client
+          return @users_request_client if @users_request_client
+          raise TypeError, "You need to instantiate this module with users_request_client"
+        end
+
+        #
+        # 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
 
-      def add_user_visible_apps(user_id: nil, app_ids: nil)
-        body = {
-          data: app_ids.map do |app_id|
-            {
-              type: "apps",
-              id: app_id
-            }
-          end
-        }
+        def add_user_visible_apps(user_id: nil, app_ids: nil)
+          body = {
+            data: app_ids.map do |app_id|
+              {
+                type: "apps",
+                id: app_id
+              }
+            end
+          }
 
-        Client.instance.post("users/#{user_id}/relationships/visibleApps", body)
+          users_request_client.post("users/#{user_id}/relationships/visibleApps", body)
+        end
       end
     end
   end

data/spaceship/lib/spaceship/stats_middleware.rb

@@ -0,0 +1,65 @@
+require 'faraday'
+
+require_relative 'globals'
+
+module Spaceship
+  class StatsMiddleware < Faraday::Middleware
+    ServiceOption = Struct.new(:name, :url, :auth_type)
+    URLLog = Struct.new(:url, :auth_type)
+    class << self
+      def services
+        return @services if @services
+
+        require_relative 'tunes/tunes_client'
+        require_relative 'portal/portal_client'
+        require_relative 'connect_api/testflight/client'
+        require_relative 'connect_api/provisioning/client'
+
+        @services ||= [
+          ServiceOption.new("App Store Connect API (official)", "api.appstoreconnect.apple.com", "JWT"),
+          ServiceOption.new("App Store Connect API (web session)", Spaceship::ConnectAPI::TestFlight::Client.hostname.gsub("https://", ""), "Web session"),
+          ServiceOption.new("App Store Connect API (web session)", Spaceship::ConnectAPI::Provisioning::Client.hostname.gsub("https://", ""), "Web session"),
+          ServiceOption.new("Legacy iTunesConnect Auth", "idmsa.apple.com", "Web session"),
+          ServiceOption.new("Legacy iTunesConnect Auth", "appstoreconnect.apple.com/olympus/v1/", "Web session"),
+          ServiceOption.new("Legacy iTunesConnect", Spaceship::TunesClient.hostname.gsub("https://", ""), "Web session"),
+          ServiceOption.new("Legacy iTunesConnect Developer Portal", Spaceship::PortalClient.hostname.gsub("https://", ""), "Web session")
+        ]
+      end
+
+      def service_stats
+        @service_stats ||= Hash.new(0)
+      end
+
+      def request_logs
+        @request_logs ||= []
+        @request_logs
+      end
+    end
+
+    def initialize(app)
+      super(app)
+    end
+
+    def call(env)
+      log(env)
+      @app.call(env)
+    end
+
+    def log(env)
+      return false unless env && env.url && (uri = URI.parse(env.url.to_s))
+      service = StatsMiddleware.services.find do |s|
+        uri.to_s.include?(s.url)
+      end
+
+      service = ServiceOption.new("Unknown", uri.host, "Unknown") if service.nil?
+      StatsMiddleware.service_stats[service] += 1
+
+      StatsMiddleware.request_logs << URLLog.new(uri.to_s, service.auth_type)
+
+      return true
+    rescue => e
+      puts("Failed to log spaceship stats - #{e.message}") if Spaceship::Globals.verbose?
+      return false
+    end
+  end
+end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.155.1
+  version: 2.157.0
 platform: ruby
 authors:
-- Luka Mirosevic
+- Josh Holtz
 - Daniel Jankowski
+- Jimmy Dee
 - Olivier Halligon
-- Josh Holtz
+- Jorge Revuelta H
+- Helmut Januschka
 - Jérôme Lacoste
+- Felix Krause
 - Iulian Onofrei
-- Maksym Grebenets
-- Max Ott
-- Kohki Miki
+- Matthew Ellis
+- Aaron Brager
 - Danielle Tomlinson
-- Andrew McBurney
 - Manu Wallner
+- Andrew McBurney
+- Max Ott
+- Luka Mirosevic
+- Maksym Grebenets
+- Kohki Miki
+- Jan Piotrowski
+- Stefan Natchev
 - Joshua Liebowitz
 - Fumiya Nakamura
-- Felix Krause
-- Jimmy Dee
-- Jorge Revuelta H
-- Aaron Brager
-- Stefan Natchev
-- Helmut Januschka
-- Jan Piotrowski
-- Matthew Ellis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -944,14 +944,17 @@ files:
 - deliver/lib/assets/summary.html.erb
 - deliver/lib/deliver.rb
 - deliver/lib/deliver/app_screenshot.rb
+- deliver/lib/deliver/app_screenshot_iterator.rb
 - deliver/lib/deliver/commands_generator.rb
 - deliver/lib/deliver/detect_values.rb
 - deliver/lib/deliver/download_screenshots.rb
 - deliver/lib/deliver/generate_summary.rb
 - deliver/lib/deliver/html_generator.rb
+- deliver/lib/deliver/languages.rb
 - deliver/lib/deliver/loader.rb
 - deliver/lib/deliver/module.rb
 - deliver/lib/deliver/options.rb
+- deliver/lib/deliver/queue_worker.rb
 - deliver/lib/deliver/runner.rb
 - deliver/lib/deliver/setup.rb
 - deliver/lib/deliver/submit_for_review.rb
@@ -988,6 +991,7 @@ files:
 - fastlane/lib/fastlane/actions/add_extra_platforms.rb
 - fastlane/lib/fastlane/actions/add_git_tag.rb
 - fastlane/lib/fastlane/actions/app_store_build_number.rb
+- fastlane/lib/fastlane/actions/app_store_connect_api_key.rb
 - fastlane/lib/fastlane/actions/appaloosa.rb
 - fastlane/lib/fastlane/actions/appetize.rb
 - fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb
@@ -1174,6 +1178,7 @@ files:
 - fastlane/lib/fastlane/actions/snapshot.rb
 - fastlane/lib/fastlane/actions/sonar.rb
 - fastlane/lib/fastlane/actions/spaceship_logs.rb
+- fastlane/lib/fastlane/actions/spaceship_stats.rb
 - fastlane/lib/fastlane/actions/splunkmint.rb
 - fastlane/lib/fastlane/actions/spm.rb
 - fastlane/lib/fastlane/actions/ssh.rb
@@ -1556,7 +1561,6 @@ files:
 - sigh/README.md
 - sigh/lib/assets/resign.sh
 - sigh/lib/sigh.rb
-- sigh/lib/sigh/.runner.rb.swp
 - sigh/lib/sigh/commands_generator.rb
 - sigh/lib/sigh/download_all.rb
 - sigh/lib/sigh/local_manage.rb
@@ -1609,10 +1613,10 @@ files:
 - spaceship/lib/spaceship/client.rb
 - spaceship/lib/spaceship/commands_generator.rb
 - spaceship/lib/spaceship/connect_api.rb
+- spaceship/lib/spaceship/connect_api/api_client.rb
 - 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/.device.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
@@ -1658,9 +1662,11 @@ files:
 - spaceship/lib/spaceship/connect_api/provisioning/client.rb
 - spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb
 - spaceship/lib/spaceship/connect_api/response.rb
+- spaceship/lib/spaceship/connect_api/spaceship.rb
 - spaceship/lib/spaceship/connect_api/testflight/client.rb
 - spaceship/lib/spaceship/connect_api/testflight/testflight.rb
 - spaceship/lib/spaceship/connect_api/token.rb
+- spaceship/lib/spaceship/connect_api/token_refresh_middleware.rb
 - spaceship/lib/spaceship/connect_api/tunes/client.rb
 - spaceship/lib/spaceship/connect_api/tunes/tunes.rb
 - spaceship/lib/spaceship/connect_api/users/client.rb
@@ -1699,6 +1705,7 @@ files:
 - spaceship/lib/spaceship/portal/website_push.rb
 - spaceship/lib/spaceship/provider.rb
 - spaceship/lib/spaceship/spaceauth_runner.rb
+- spaceship/lib/spaceship/stats_middleware.rb
 - spaceship/lib/spaceship/test_flight.rb
 - spaceship/lib/spaceship/test_flight/app_test_info.rb
 - spaceship/lib/spaceship/test_flight/base.rb