fastlane-plugin-firebase_app_distribution 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5069b6e632432b25f206acbd47973be4326f582b8e555c7783c26638a6da9c21
-  data.tar.gz: a8f5e1ff46a220466eaa79e2e1072532b8715c79297462ac064e41da330e4c6e
+  metadata.gz: 0a6b59efacf7524b9c562405bf867140a83ece4972cc0e4c22cfea123e1e5842
+  data.tar.gz: 1a64bbb493f3956eb5d90e78ffbbc6ffa60ceb54930542f6cbcefcf179cc9820
 SHA512:
-  metadata.gz: 93749ffc7b47c65964da87b9db79925d71f1a0fc81bc0f33bd8710c8af34b934d19c7aad04f1e79bed2f90000190485ed07b86b1fb623cccbd1a81839d0ccdff
-  data.tar.gz: ebba43e6bc7de7d8742bab36a7a8139b176f1cbfdf2130bdddd2131e114448077f51b3458c308ede0a828335a58ad21cdcfa7fc9a5ca1955f479919868236505
+  metadata.gz: be9c94c149bd843bdad4523c559c84fee46813b97e9c02a383a18824d23e8f5c61db0c66209f1673d4c879fcf22a0714e49c98dd8b960554219b59c8289c2c53
+  data.tar.gz: 4cd7cb1a546b6baa8fa11a8829e45b488bfaf3c54934cc016c161914f03321611ba25e8b6116c77029c9d5d9a4851ce548a01d60ad719ddd06e13413190e191e

data/lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb

@@ -20,23 +20,14 @@ module Fastlane
 
       def self.run(params)
         params.values # to validate all inputs before looking for the ipa/apk
-        auth_token = fetch_auth_token(params[:service_credentials_file], params[:firebase_cli_token])
-        binary_path = params[:ipa_path] || params[:apk_path]
-        platform = lane_platform || platform_from_path(binary_path)
-        fad_api_client = Client::FirebaseAppDistributionApiClient.new(auth_token, platform)
 
-        if params[:app] # Set app_id if it is specified as a parameter
-          app_id = params[:app]
-        elsif platform == :ios
-          archive_path = Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
-          if archive_path
-            app_id = get_ios_app_id_from_archive(archive_path)
-          end
-        end
+        app_id = app_id_from_params(params)
+        platform = lane_platform || platform_from_app_id(app_id)
+        binary_path = binary_path_from_platform(platform, params[:ipa_path], params[:apk_path])
+
+        auth_token = fetch_auth_token(params[:service_credentials_file], params[:firebase_cli_token])
+        fad_api_client = Client::FirebaseAppDistributionApiClient.new(auth_token, platform, params[:debug])
 
-        if app_id.nil?
-          UI.crash!(ErrorMessage::MISSING_APP_ID)
-        end
         release_id = fad_api_client.upload(app_id, binary_path, platform.to_s)
         if release_id.nil?
           return
@@ -66,20 +57,50 @@ module Fastlane
         "Release your beta builds with Firebase App Distribution"
       end
 
+      def self.app_id_from_params(params)
+        if params[:app]
+          app_id = params[:app]
+        elsif xcode_archive_path
+          plist_path = params[:googleservice_info_plist_path]
+          app_id = get_ios_app_id_from_archive_plist(xcode_archive_path, plist_path)
+        end
+        if app_id.nil?
+          UI.crash!(ErrorMessage::MISSING_APP_ID)
+        end
+        app_id
+      end
+
+      def self.xcode_archive_path
+        # prevents issues on cross-platform build environments where an XCode build happens within
+        # the same lane
+        return nil if lane_platform == :android
+
+        Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE]
+      end
+
       def self.lane_platform
         Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
       end
 
-      def self.platform_from_path(binary_path)
-        return nil unless binary_path
-        case binary_path.split('.').last
-        when 'ipa'
+      def self.platform_from_app_id(app_id)
+        if app_id.include?(':ios:')
           :ios
-        when 'apk'
+        elsif app_id.include?(':android:')
           :android
         end
       end
 
+      def self.binary_path_from_platform(platform, ipa_path, apk_path)
+        case platform
+        when :ios
+          ipa_path
+        when :android
+          apk_path
+        else
+          ipa_path || apk_path
+        end
+      end
+
       def self.available_options
         if lane_platform == :ios || lane_platform.nil?
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
@@ -100,6 +121,12 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("firebase_app_distribution: Couldn't find ipa file at path '#{value}'") unless File.exist?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :googleservice_info_plist_path,
+                                       env_name: "GOOGLESERVICE_INFO_PLIST_PATH",
+                                       description: "Path to your GoogleService-Info.plist file, relative to the root of your Xcode project",
+                                       default_value: "GoogleService-Info.plist",
+                                       optional: true,
+                                       type: String),
           # Android Specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: "FIREBASEAPPDISTRO_APK_PATH",

data/lib/fastlane/plugin/firebase_app_distribution/client/error_response.rb

@@ -0,0 +1,16 @@
+module Fastlane
+  module Client
+    class ErrorResponse
+      attr_accessor :code, :message, :status
+
+      def initialize(response)
+        unless response[:body].nil? || response[:body].empty?
+          response_body = JSON.parse(response[:body], symbolize_names: true)
+          @code = response_body[:error][:code]
+          @message = response_body[:error][:message]
+          @status = response_body[:error][:status]
+        end
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/firebase_app_distribution/client/firebase_app_distribution_api_client.rb

@@ -1,5 +1,6 @@
 require 'fastlane_core/ui/ui'
 require_relative '../actions/firebase_app_distribution_login'
+require_relative '../client/error_response'
 
 module Fastlane
   module Client
@@ -9,8 +10,14 @@ module Fastlane
       MAX_POLLING_RETRIES = 60
       POLLING_INTERVAL_SECONDS = 2
 
-      def initialize(auth_token, platform)
+      AUTHORIZATION = "Authorization"
+      CONTENT_TYPE = "Content-Type"
+      APPLICATION_JSON = "application/json"
+      APPLICATION_OCTET_STREAM = "application/octet-stream"
+
+      def initialize(auth_token, platform, debug = false)
         @auth_token = auth_token
+        @debug = debug
 
         if platform.nil?
           @binary_type = "IPA/APK"
@@ -39,7 +46,8 @@ module Fastlane
         payload = { emails: emails, groupIds: group_ids }
         begin
           connection.post(enable_access_url(app_id, release_id), payload.to_json) do |request|
-            request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers[AUTHORIZATION] = "Bearer " + @auth_token
+            request.headers[CONTENT_TYPE] = APPLICATION_JSON
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
@@ -66,12 +74,14 @@ module Fastlane
         end
         begin
           connection.post(release_notes_create_url(app_id, release_id), payload.to_json) do |request|
-            request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers[AUTHORIZATION] = "Bearer " + @auth_token
+            request.headers[CONTENT_TYPE] = APPLICATION_JSON
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
-          # rescue Faraday::ClientError
-          #   UI.user_error!("#{ErrorMessage::INVALID_RELEASE_ID}: #{release_id}")
+        rescue Faraday::ClientError => e
+          error = ErrorResponse.new(e.response)
+          UI.user_error!("#{ErrorMessage::INVALID_RELEASE_NOTES}: #{error.message}")
         end
         UI.success("✅ Posted release notes.")
       end
@@ -93,7 +103,7 @@ module Fastlane
 
         begin
           response = connection.get(v1_apps_url(app_id)) do |request|
-            request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers[AUTHORIZATION] = "Bearer " + @auth_token
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
@@ -115,7 +125,8 @@ module Fastlane
       # Throws a user_error if an invalid app id is passed in, or if the binary file does not exist
       def upload_binary(app_id, binary_path, platform)
         connection.post(binary_upload_url(app_id), read_binary(binary_path)) do |request|
-          request.headers["Authorization"] = "Bearer " + @auth_token
+          request.headers[AUTHORIZATION] = "Bearer " + @auth_token
+          request.headers[CONTENT_TYPE] = APPLICATION_OCTET_STREAM
           request.headers["X-APP-DISTRO-API-CLIENT-ID"] = "fastlane"
           request.headers["X-APP-DISTRO-API-CLIENT-TYPE"] =  platform
           request.headers["X-APP-DISTRO-API-CLIENT-VERSION"] = Fastlane::FirebaseAppDistribution::VERSION
@@ -182,7 +193,7 @@ module Fastlane
       def get_upload_status(app_id, upload_token)
         begin
           response = connection.get(upload_status_url(app_id, upload_token)) do |request|
-            request.headers["Authorization"] = "Bearer " + @auth_token
+            request.headers[AUTHORIZATION] = "Bearer " + @auth_token
           end
         rescue Faraday::ResourceNotFound
           UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
@@ -220,6 +231,7 @@ module Fastlane
         @connection ||= Faraday.new(url: BASE_URL) do |conn|
           conn.response(:json, parser_options: { symbolize_names: true })
           conn.response(:raise_error) # raise_error middleware will run before the json middleware
+          conn.response(:logger, nil, { headers: false, bodies: { response: true }, log_level: :debug }) if @debug
           conn.adapter(Faraday.default_adapter)
         end
       end

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_error_message.rb

@@ -14,6 +14,7 @@ module ErrorMessage
   INVALID_PATH = "Could not read content from"
   INVALID_TESTERS = "Could not enable access for testers. Check that the groups exist and the tester emails are formatted correctly"
   INVALID_RELEASE_ID = "App distribution failed to fetch release with id"
+  INVALID_RELEASE_NOTES = "Failed to add release notes"
   SERVICE_CREDENTIALS_ERROR = "App Distribution could not generate credentials from the service credentials file specified. Service Account Path"
 
   def self.binary_not_found(binary_type)

data/lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb

@@ -28,10 +28,10 @@ module Fastlane
         CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
       end
 
-      def get_ios_app_id_from_archive(path)
-        app_path = parse_plist("#{path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
-        UI.shell_error!("can't extract application path from Info.plist at #{path}") if app_path.empty?
-        identifier = parse_plist("#{path}/Products/#{app_path}/GoogleService-Info.plist")["GOOGLE_APP_ID"]
+      def get_ios_app_id_from_archive_plist(archive_path, plist_path)
+        app_path = parse_plist("#{archive_path}/Info.plist")["ApplicationProperties"]["ApplicationPath"]
+        UI.shell_error!("can't extract application path from Info.plist at #{archive_path}") if app_path.empty?
+        identifier = parse_plist("#{archive_path}/Products/#{app_path}/#{plist_path}")["GOOGLE_APP_ID"]
         UI.shell_error!("can't extract GOOGLE_APP_ID") if identifier.empty?
         return identifier
       end

data/lib/fastlane/plugin/firebase_app_distribution/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.2.1"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Stefan Natchev
 - Manny Jimenez
 - Alonso Salas Infante
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -138,7 +138,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.127.1
-description:
+description: 
 email:
 - snatchev@google.com
 - mannyjimenez@google.com
@@ -152,6 +152,7 @@ files:
 - lib/fastlane/plugin/firebase_app_distribution.rb
 - lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_action.rb
 - lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_login.rb
+- lib/fastlane/plugin/firebase_app_distribution/client/error_response.rb
 - lib/fastlane/plugin/firebase_app_distribution/client/firebase_app_distribution_api_client.rb
 - lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_auth_client.rb
 - lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_error_message.rb
@@ -162,7 +163,7 @@ homepage: https://github.com/fastlane/fastlane-plugin-firebase_app_distribution
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Release your beta builds to Firebase App Distribution. https://firebase.google.com/docs/app-distribution
 test_files: []