fastlane-plugin-firebase_app_distribution 0.7.4 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 472d779b44b65f59dd24063df03381828252f70e5a5e7b539607eae358adf97c
-  data.tar.gz: c0ffd2c61d9929eeaa51dd6f91d46ba2eb7eca99c3a190cddbb27f09b282b9f9
+  metadata.gz: 7e6ae8a63559822e0869de05d3b6239991ef11e137cfcaab8632bfcb5ebc131b
+  data.tar.gz: b4cc1e7840dc3a8a4b42bfeafa0da86d2ef6c6d2520dec19d1ac00bcb85a93f8
 SHA512:
-  metadata.gz: 1dae30f5fe89bf653fd9577474e896aa058de406f31c3ec677e793cfef03bf3c760d853da130a82ec14c1d7290e91afb65fb2c6e843612dc03b3b2662ba81a4b
-  data.tar.gz: b95312cb73b0c05ef27f868130a9a56bedf085416b6cccabe8e6f194de5e132e6ac4500641430fb3695f77b4653fa20cc6209c366690483e4693a1ad8b882ab7
+  metadata.gz: c0ad2e974069de4be2bf38ca52f0d4c8d2a5569bb2e2673332207be9d417dd8aaf779bddf34ee04eb8b78e612a26d02a5c74668be6fc590b06470c60274a6f3d
+  data.tar.gz: 50bd7ff6e1fef81db8a695f5e3c6239c0170842efb0db85c0e025f9362c5b47ded84b555718cfb661e14952c44725b33fb9af2f49a6321e7e5e1cd546f9806f9

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

@@ -2,6 +2,7 @@ require 'fastlane/action'
 require 'open3'
 require 'shellwords'
 require 'googleauth'
+require 'google/apis/firebaseappdistribution_v1'
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_error_message'
 require_relative '../helper/firebase_app_distribution_auth_client'
@@ -19,8 +20,8 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       DEFAULT_UPLOAD_TIMEOUT_SECONDS = 300
-      MAX_POLLING_RETRIES = 60
-      POLLING_INTERVAL_SECONDS = 5
+      UPLOAD_MAX_POLLING_RETRIES = 60
+      UPLOAD_POLLING_INTERVAL_SECONDS = 5
 
       def self.run(params)
         params.values # to validate all inputs before looking for the ipa/apk/aab
@@ -31,40 +32,29 @@ module Fastlane
         timeout = get_upload_timeout(params)
 
         binary_path = get_binary_path(platform, params)
-        UI.user_error!("Couldn't find binary") if binary_path.nil?
-        UI.user_error!("Couldn't find binary at path #{binary_path}") unless File.exist?(binary_path)
+        UI.user_error!("Couldn't find binary.") if binary_path.nil?
+        UI.user_error!("Couldn't find binary at path #{binary_path}.") unless File.exist?(binary_path)
         binary_type = binary_type_from_path(binary_path)
 
         # TODO(lkellogg): This sets the send timeout for all POST requests made by the client, but
         # ideally the timeout should only apply to the binary upload
-        client = init_client(params[:service_credentials_file],
-                             params[:firebase_cli_token],
-                             params[:debug],
-                             timeout)
+        init_google_api_client(params[:debug], timeout)
+        authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = authorization
 
-        # If binary is an AAB, get the AAB info for this app, which includes the integration state and certificate data
+        # If binary is an AAB, get the AAB info for this app, which includes the integration state
+        # and certificate data
         if binary_type == :AAB
           aab_info = get_aab_info(client, app_name)
           validate_aab_setup!(aab_info)
         end
 
         binary_type = binary_type_from_path(binary_path)
-        UI.message("⌛ Uploading the #{binary_type}.")
-
-        # For some reason calling the client.upload_medium returns nil when
-        # it should return a long running operation object
-        # (https://github.com/googleapis/google-api-ruby-client/blob/main/generated/google-apis-firebaseappdistribution_v1/lib/google/apis/firebaseappdistribution_v1/service.rb#L79).
-        # We could use client.http, but is much slower
-        # (https://github.com/firebase/fastlane-plugin-firebase_app_distribution/issues/330),
-        # so we still use the old client for now.
-        # TODO(kbolay) Prefer client.upload_medium, assuming it is sufficiently fast
-        fad_api_client = Client::FirebaseAppDistributionApiClient.new(client.authorization.access_token, params[:debug])
-        operation_name = fad_api_client.upload_binary(app_name,
-                                                      binary_path,
-                                                      platform.to_s,
-                                                      get_upload_timeout(params))
-
-        release = poll_upload_release_operation(client, operation_name, binary_type)
+        UI.message("📡 Uploading the #{binary_type}.")
+        operation = upload_binary(app_name, binary_path, client, timeout)
+        UI.message("🕵️ Validating upload…")
+        release = poll_upload_release_operation(client, operation, binary_type)
 
         if binary_type == :AAB && aab_info && !aab_certs_included?(aab_info.test_certificate)
           updated_aab_info = get_aab_info(client, app_name)
@@ -86,6 +76,7 @@ module Fastlane
           release.release_notes = Google::Apis::FirebaseappdistributionV1::GoogleFirebaseAppdistroV1ReleaseNotes.new(
             text: release_notes
           )
+          UI.message("📜 Setting release notes.")
           release = update_release(client, release)
         end
 
@@ -98,6 +89,7 @@ module Fastlane
             tester_emails: emails,
             group_aliases: group_aliases
           )
+          UI.message("📦 Distributing release.")
           distribute_release(client, release, request)
         else
           UI.message("⏩ No testers or groups passed in. Skipping this step.")
@@ -222,25 +214,23 @@ module Fastlane
         release_notes_param || Actions.lane_context[SharedValues::FL_CHANGELOG]
       end
 
-      def self.poll_upload_release_operation(client, operation_name, binary_type)
-        operation = client.get_project_app_release_operation(operation_name)
-        MAX_POLLING_RETRIES.times do
+      def self.poll_upload_release_operation(client, operation, binary_type)
+        UPLOAD_MAX_POLLING_RETRIES.times do
+          sleep(UPLOAD_POLLING_INTERVAL_SECONDS)
+          operation = client.get_project_app_release_operation(operation.name)
           if operation.done && operation.response && operation.response['release']
             release = extract_release(operation)
-            result = operation.response['result']
-            if result == 'RELEASE_UPDATED'
+            case operation.response['result']
+            when 'RELEASE_UPDATED'
               UI.success("✅ Uploaded #{binary_type} successfully; updated provisioning profile of existing release #{release_version(release)}.")
-              break
-            elsif result == 'RELEASE_UNMODIFIED'
+            when 'RELEASE_UNMODIFIED'
               UI.success("✅ The same #{binary_type} was found in release #{release_version(release)} with no changes, skipping.")
-              break
             else
               UI.success("✅ Uploaded #{binary_type} successfully and created release #{release_version(release)}.")
             end
             break
           elsif !operation.done
-            sleep(POLLING_INTERVAL_SECONDS)
-            operation = client.get_project_app_release_operation(operation.name)
+            next
           else
             if operation.error && operation.error.message
               UI.user_error!("#{ErrorMessage.upload_binary_error(binary_type)}: #{operation.error.message}")
@@ -257,6 +247,30 @@ module Fastlane
         extract_release(operation)
       end
 
+      def self.upload_binary(app_name, binary_path, client, timeout)
+        options = Google::Apis::RequestOptions.new
+        options.max_elapsed_time = timeout # includes retries (default = no retries)
+        options.header = {
+          'Content-Type' => 'application/octet-stream',
+          'X-Goog-Upload-File-Name' => CGI.escape(File.basename(binary_path)),
+          'X-Goog-Upload-Protocol' => 'raw'
+        }
+
+        # For some reason calling the client.upload_medium returns nil when
+        # it should return a long running operation object, so we make a
+        # standard http call instead and convert it to a long running object
+        # https://github.com/googleapis/google-api-ruby-client/blob/main/generated/google-apis-firebaseappdistribution_v1/lib/google/apis/firebaseappdistribution_v1/service.rb#L79
+        # TODO(kbolay) Prefer client.upload_medium
+        response = client.http(
+          :post,
+          "https://firebaseappdistribution.googleapis.com/upload/v1/#{app_name}/releases:upload",
+          body: File.open(binary_path, 'rb'),
+          options: options
+        )
+
+        Google::Apis::FirebaseappdistributionV1::GoogleLongrunningOperation.from_json(response)
+      end
+
       def self.extract_release(operation)
         Google::Apis::FirebaseappdistributionV1::GoogleFirebaseAppdistroV1Release.from_json(operation.response['release'].to_json)
       end
@@ -335,7 +349,7 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("firebase_app_distribution: '#{value}' is not a valid value for android_artifact_type. Should be 'APK' or 'AAB'") unless ['APK', 'AAB'].include?(value)
                                        end),
-          # Generic
+          # General
           FastlaneCore::ConfigItem.new(key: :app,
                                        env_name: "FIREBASEAPPDISTRO_APP",
                                        description: "Your app's Firebase App ID. You can find the App ID in the Firebase console, on the General Settings page",
@@ -346,6 +360,18 @@ module Fastlane
                                        env_name: "FIREBASEAPPDISTRO_FIREBASE_CLI_PATH",
                                        description: "The absolute path of the firebase cli command",
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :debug,
+                                      description: "Print verbose debug output",
+                                      optional: true,
+                                      default_value: false,
+                                      type: Boolean),
+
+          # Release Distribution
+          FastlaneCore::ConfigItem.new(key: :upload_timeout,
+                                       description: "Amount of seconds before the upload will  timeout, if not completed",
+                                       optional: true,
+                                       default_value: DEFAULT_UPLOAD_TIMEOUT_SECONDS,
+                                       type: Integer),
           FastlaneCore::ConfigItem.new(key: :groups,
                                        env_name: "FIREBASEAPPDISTRO_GROUPS",
                                        description: "The group aliases used for distribution, separated by commas",
@@ -353,17 +379,17 @@ module Fastlane
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :groups_file,
                                        env_name: "FIREBASEAPPDISTRO_GROUPS_FILE",
-                                       description: "The group aliases used for distribution, separated by commas",
+                                       description: "Path to file containing group aliases used for distribution, separated by commas",
                                        optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :testers,
                                        env_name: "FIREBASEAPPDISTRO_TESTERS",
-                                       description: "Pass email addresses of testers, separated by commas",
+                                       description: "Email addresses of testers, separated by commas",
                                        optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :testers_file,
                                        env_name: "FIREBASEAPPDISTRO_TESTERS_FILE",
-                                       description: "Pass email addresses of testers, separated by commas",
+                                       description: "Path to file containing email addresses of testers, separated by commas",
                                        optional: true,
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :release_notes,
@@ -373,27 +399,23 @@ module Fastlane
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :release_notes_file,
                                        env_name: "FIREBASEAPPDISTRO_RELEASE_NOTES_FILE",
-                                       description: "Release notes file for this build",
+                                       description: "Path to file containing release notes for this build",
                                        optional: true,
                                        type: String),
+
+          # Auth
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using the Firebase CLI's login:ci command",
                                        optional: true,
                                        type: String),
-          FastlaneCore::ConfigItem.new(key: :debug,
-                                       description: "Print verbose debug output",
-                                       optional: true,
-                                       default_value: false,
-                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :service_credentials_file,
-                                       description: "Path to Google service account json",
+                                       description: "Path to Google service account json file",
                                        optional: true,
                                        type: String),
-          FastlaneCore::ConfigItem.new(key: :upload_timeout,
-                                       description: "The amount of seconds before the upload will timeout, if not completed",
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
                                        optional: true,
-                                       default_value: DEFAULT_UPLOAD_TIMEOUT_SECONDS,
-                                       type: Integer)
+                                       type: String)
         ]
       end
 

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

@@ -1,6 +1,6 @@
 require 'fastlane/action'
 require 'fastlane_core/ui/ui'
-
+require 'google/apis/firebaseappdistribution_v1'
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_auth_client'
 
@@ -11,7 +11,9 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
         if blank?(params[:emails]) && blank?(params[:file])
           UI.user_error!("Must specify `emails` or `file`.")
@@ -78,6 +80,10 @@ module Fastlane
                                       description: "Path to Google service credentials file",
                                       optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                      description: "Google service account json file content",
+                                      optional: true,
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using the Firebase CLI's login:ci command",
                                        optional: true,

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

@@ -1,7 +1,6 @@
 require 'fastlane/action'
 require 'fastlane_core/ui/ui'
 require 'google/apis/firebaseappdistribution_v1'
-
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_auth_client'
 
@@ -11,8 +10,6 @@ module Fastlane
       extend Auth::FirebaseAppDistributionAuthClient
       extend Helper::FirebaseAppDistributionHelper
 
-      FirebaseAppDistributionV1 = Google::Apis::FirebaseappdistributionV1
-
       def self.run(params)
         if blank?(params[:alias])
           UI.user_error!("Must specify `alias`.")
@@ -22,7 +19,9 @@ module Fastlane
           UI.user_error!("Must specify `display_name`.")
         end
 
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
         project_number = params[:project_number]
         group_alias = params[:alias]
@@ -31,7 +30,7 @@ module Fastlane
         UI.message("⏳ Creating tester group '#{group_alias} (#{display_name})' in project #{project_number}...")
 
         parent = project_name(project_number)
-        group = FirebaseAppDistributionV1::GoogleFirebaseAppdistroV1Group.new(
+        group = Google::Apis::FirebaseappdistributionV1::GoogleFirebaseAppdistroV1Group.new(
           name: group_name(project_number, group_alias),
           display_name: display_name
         )
@@ -88,6 +87,10 @@ module Fastlane
                                        description: "Path to Google service credentials file",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using the Firebase CLI's login:ci command",
                                        optional: true,

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

@@ -1,6 +1,6 @@
 require 'fastlane/action'
 require 'fastlane_core/ui/ui'
-
+require 'google/apis/firebaseappdistribution_v1'
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_auth_client'
 
@@ -11,7 +11,9 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
         if blank?(params[:alias])
           UI.user_error!("Must specify `alias`.")
@@ -65,6 +67,10 @@ module Fastlane
                                        description: "Path to Google service credentials file",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using the Firebase CLI's login:ci command",
                                        optional: true,

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

@@ -13,7 +13,9 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
         UI.message("⏳ Fetching latest release for app #{params[:app]}...")
 
@@ -89,6 +91,10 @@ module Fastlane
                                        description: "Path to Google service account json",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :debug,
                                        description: "Print verbose debug output",
                                        optional: true,

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

@@ -2,9 +2,9 @@ require 'fastlane/action'
 require 'open3'
 require 'shellwords'
 require 'googleauth'
+require 'google/apis/firebaseappdistribution_v1alpha'
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_error_message'
-require_relative '../client/firebase_app_distribution_api_client'
 require_relative '../helper/firebase_app_distribution_auth_client'
 
 module Fastlane
@@ -14,11 +14,19 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
-        fad_api_client = Client::FirebaseAppDistributionApiClient.new(client.authorization.access_token, params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1alpha::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
-        app_id = params[:app]
-        udids = fad_api_client.get_udids(app_id)
+        project_number = params[:project_number]
+        if blank?(project_number)
+          app_id = params[:app]
+          if blank?(app_id)
+            UI.user_error!("Must specify `project_number`.")
+          end
+          project_number = project_number_from_app_id(app_id)
+        end
+        udids = client.get_project_tester_udids(project_name(project_number)).tester_udids
 
         if udids.empty?
           UI.important("App Distribution fetched 0 tester UDIDs. Nothing written to output file.")
@@ -32,7 +40,7 @@ module Fastlane
         File.open(output_file, 'w') do |f|
           f.write("Device ID\tDevice Name\tDevice Platform\n")
           udids.each do |tester_udid|
-            f.write("#{tester_udid[:udid]}\t#{tester_udid[:name]}\t#{tester_udid[:platform]}\n")
+            f.write("#{tester_udid.udid}\t#{tester_udid.name}\t#{tester_udid.platform}\n")
           end
         end
       end
@@ -52,10 +60,18 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(key: :project_number,
+                                       conflicting_options: [:app],
+                                       env_name: "FIREBASEAPPDISTRO_PROJECT_NUMBER",
+                                       description: "Your Firebase project number. You can find the project number in the Firebase console, on the General Settings page",
+                                       type: Integer,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :app,
+                                       conflicting_options: [:project_number],
                                        env_name: "FIREBASEAPPDISTRO_APP",
                                        description: "Your app's Firebase App ID. You can find the App ID in the Firebase console, on the General Settings page",
-                                       optional: false,
+                                       optional: true,
+                                       deprecated: "Use project_number (FIREBASEAPPDISTRO_PROJECT_NUMBER) instead",
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :output_file,
                                        env_name: "FIREBASEAPPDISTRO_OUTPUT_FILE",
@@ -70,6 +86,10 @@ module Fastlane
                                        description: "Path to Google service account json",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :debug,
                                        description: "Print verbose debug output",
                                        optional: true,

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

@@ -1,6 +1,6 @@
 require 'fastlane/action'
 require 'fastlane_core/ui/ui'
-
+require 'google/apis/firebaseappdistribution_v1'
 require_relative '../helper/firebase_app_distribution_helper'
 require_relative '../helper/firebase_app_distribution_auth_client'
 
@@ -11,7 +11,9 @@ module Fastlane
       extend Helper::FirebaseAppDistributionHelper
 
       def self.run(params)
-        client = init_client(params[:service_credentials_file], params[:firebase_cli_token], params[:debug])
+        init_google_api_client(params[:debug])
+        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
+        client.authorization = get_authorization(params[:service_credentials_file], params[:firebase_cli_token], params[:service_credentials_json_data], params[:debug])
 
         if blank?(params[:emails]) && blank?(params[:file])
           UI.user_error!("Must specify `emails` or `file`.")
@@ -73,6 +75,10 @@ module Fastlane
                                       description: "Path to Google service credentials file",
                                       optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :service_credentials_json_data,
+                                       description: "Google service account json file content",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :firebase_cli_token,
                                        description: "Auth token generated using the Firebase CLI's login:ci command",
                                        optional: true,

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

@@ -20,6 +20,7 @@ module Fastlane
       # auth method is used, unset all other auth variables/parameters to nil/empty
       #
       # args
+      #   google_service_json_data - Google service account json file content as a string
       #   google_service_path - Absolute path to the Google service account file
       #   firebase_cli_token - Refresh token
       #   debug - Whether to enable debug-level logging
@@ -28,26 +29,25 @@ module Fastlane
       #   FIREBASE_TOKEN - see firebase_cli_token
       #
       # Crashes if given invalid or missing credentials
-      def get_authorization(google_service_path, firebase_cli_token, debug = false)
+      def get_authorization(google_service_path, firebase_cli_token, google_service_json_data, debug = false)
         if !google_service_path.nil? && !google_service_path.empty?
           UI.message("🔐 Authenticating with --service_credentials_file path parameter: #{google_service_path}")
-          service_account(google_service_path, debug)
+          service_account_from_file(google_service_path, debug)
+        elsif !google_service_json_data.nil? && !google_service_json_data.empty?
+          UI.message("🔐 Authenticating with --service_credentials_json content parameter")
+          service_account_from_json(google_service_json_data, debug)
         elsif !firebase_cli_token.nil? && !firebase_cli_token.empty?
           UI.message("🔐 Authenticating with --firebase_cli_token parameter")
           firebase_token(firebase_cli_token, debug)
         elsif !ENV["FIREBASE_TOKEN"].nil? && !ENV["FIREBASE_TOKEN"].empty?
           UI.message("🔐 Authenticating with FIREBASE_TOKEN environment variable")
           firebase_token(ENV["FIREBASE_TOKEN"], debug)
-        # TODO(lkellogg): Not using Google::Auth.get_application_default yet while we are still
-        # using the old client for uploads. ADC also does not work for the get_udids action:
-        # https://cloud.google.com/docs/authentication/troubleshoot-adc#user-creds-client-based
-        # For now go back to just using the environment variable:
-        elsif !ENV["GOOGLE_APPLICATION_CREDENTIALS"].nil? && !ENV["GOOGLE_APPLICATION_CREDENTIALS"].empty?
-          UI.message("🔐 Authenticating with GOOGLE_APPLICATION_CREDENTIALS environment variable: #{ENV['GOOGLE_APPLICATION_CREDENTIALS']}")
-          service_account(ENV["GOOGLE_APPLICATION_CREDENTIALS"], debug)
         elsif (refresh_token = refresh_token_from_firebase_tools)
-          UI.message("🔐 No authentication method found. Using cached Firebase CLI credentials.")
+          UI.message("🔐 Authenticating with cached Firebase CLI credentials")
           firebase_token(refresh_token, debug)
+        elsif !application_default_creds.nil?
+          UI.message("🔐 Authenticating with Application Default Credentials")
+          application_default_creds
         else
           UI.user_error!(ErrorMessage::MISSING_CREDENTIALS)
           nil
@@ -56,6 +56,12 @@ module Fastlane
 
       private
 
+      def application_default_creds
+        Google::Auth.get_application_default([SCOPE])
+      rescue
+        nil
+      end
+
       def refresh_token_from_firebase_tools
         config_path = format_config_path
         if File.exist?(config_path)
@@ -98,21 +104,32 @@ module Fastlane
         UI.user_error!(error_message)
       end
 
-      def service_account(google_service_path, debug)
-        service_account_credentials = Google::Auth::ServiceAccountCredentials.make_creds(
-          json_key_io: File.open(google_service_path),
+      def service_account_from_json(google_service_json_data, debug)
+        get_service_account_credentials(google_service_json_data, debug)
+      end
+
+      def service_account_from_file(google_service_path, debug)
+        get_service_account_credentials(File.read(google_service_path), debug)
+      rescue Errno::ENOENT
+        UI.user_error!("#{ErrorMessage::SERVICE_CREDENTIALS_NOT_FOUND}: #{google_service_path}")
+      end
+
+      def get_service_account_credentials(json_data, debug)
+        json_file = JSON.parse(json_data)
+        # check if it's an external account or service account
+        auth = json_file["type"] == "external_account" ? Google::Auth::ExternalAccount::Credentials : Google::Auth::ServiceAccountCredentials
+        service_account_credentials = auth.make_creds(
+          json_key_io: StringIO.new(json_data),
           scope: SCOPE
         )
         service_account_credentials.fetch_access_token!
         service_account_credentials
-      rescue Errno::ENOENT
-        UI.user_error!("#{ErrorMessage::SERVICE_CREDENTIALS_NOT_FOUND}: #{google_service_path}")
       rescue Signet::AuthorizationError => error
-        error_message = "#{ErrorMessage::SERVICE_CREDENTIALS_ERROR}: \"#{google_service_path}\""
+        error_message = "#{ErrorMessage::SERVICE_CREDENTIALS_ERROR}: "
         if debug
           error_message += "\n#{error_details(error)}"
         else
-          error_message += ". #{debug_instructions}"
+          error_message += debug_instructions.to_s
         end
         UI.user_error!(error_message)
       end

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

@@ -1,46 +1,46 @@
 module ErrorMessage
   MISSING_CREDENTIALS = "Missing authentication credentials. Set up Application Default Credentials, your Firebase refresh token, or sign in with the Firebase CLI, and try again."
-  MISSING_APP_ID = "Missing app id. Please check that the app parameter is set and try again"
-  SERVICE_CREDENTIALS_NOT_FOUND = "Service credentials file does not exist. Please check the service credentials path and try again"
-  PARSE_SERVICE_CREDENTIALS_ERROR = "Failed to extract service account information from the service credentials file"
-  PARSE_FIREBASE_TOOLS_JSON_ERROR = "Encountered error parsing json file. Ensure the firebase-tools.json file is formatted correctly"
-  UPLOAD_RELEASE_NOTES_ERROR = "App Distribution halted because it had a problem uploading release notes"
-  UPLOAD_TESTERS_ERROR = "App Distribution halted because it had a problem adding testers/groups"
-  GET_RELEASE_TIMEOUT = "App Distribution failed to fetch release information"
+  MISSING_APP_ID = "Missing app id. Please check that the app parameter is set and try again."
+  SERVICE_CREDENTIALS_NOT_FOUND = "Service credentials file does not exist. Please check the service credentials path and try again."
+  PARSE_SERVICE_CREDENTIALS_ERROR = "Failed to extract service account information from the service credentials file."
+  PARSE_FIREBASE_TOOLS_JSON_ERROR = "Encountered error parsing json file. Ensure the firebase-tools.json file is formatted correctly."
+  UPLOAD_RELEASE_NOTES_ERROR = "App Distribution halted because it had a problem uploading release notes."
+  UPLOAD_TESTERS_ERROR = "App Distribution halted because it had a problem adding testers/groups."
+  GET_RELEASE_TIMEOUT = "App Distribution failed to fetch release information."
   REFRESH_TOKEN_ERROR = "App Distribution could not generate credentials from the refresh token specified."
-  APP_NOT_ONBOARDED_ERROR = "App Distribution not onboarded"
+  APP_NOT_ONBOARDED_ERROR = "App Distribution not onboarded."
   INVALID_APP_ID = "App Distribution could not find your app. Make sure to onboard your app by pressing the \"Get started\" button on the App Distribution page in the Firebase console: https://console.firebase.google.com/project/_/appdistribution. App ID"
   INVALID_PROJECT = "App Distribution could not find your Firebase project. Make sure to onboard an app in your project by pressing the \"Get started\" button on the App Distribution page in the Firebase console: https://console.firebase.google.com/project/_/appdistribution."
   INVALID_PATH = "Could not read content from"
   INVALID_TESTERS = "Could not enable access for testers. Check that the tester emails are formatted correctly, the groups exist and you are using group aliases (not group names) for specifying groups."
   INVALID_TESTER_GROUP = "App Distribution could not find your tester group. Make sure that it exists before trying to add testers, and that the group alias is specified correctly."
   INVALID_TESTER_GROUP_NAME = "The tester group name should be 4-63 characters, and valid characters are /[a-z][0-9]-/."
-  INVALID_RELEASE_NOTES = "Failed to set release notes"
-  SERVICE_CREDENTIALS_ERROR = "App Distribution could not generate credentials from the service credentials file specified"
+  INVALID_RELEASE_NOTES = "Failed to set release notes."
+  SERVICE_CREDENTIALS_ERROR = "App Distribution could not generate credentials from the service credentials file specified."
   PLAY_ACCOUNT_NOT_LINKED = "This project is not linked to a Google Play account."
   APP_NOT_PUBLISHED = "This app is not published in the Google Play console."
   NO_APP_WITH_GIVEN_BUNDLE_ID_IN_PLAY_ACCOUNT = "App with matching package name does not exist in Google Play."
   PLAY_IAS_TERMS_NOT_ACCEPTED = "You must accept the Play Internal App Sharing (IAS) terms to upload AABs."
   INVALID_EMAIL_ADDRESS = "You passed an invalid email address."
-  TESTER_LIMIT_VIOLATION = "Creating testers would exceed tester limit"
+  TESTER_LIMIT_VIOLATION = "Creating testers would exceed tester limit."
 
   def self.aab_upload_error(aab_state)
     "Failed to process the AAB: #{aab_state}"
   end
 
   def self.binary_not_found(binary_type)
-    "Could not find the #{binary_type}. Make sure you set the #{binary_type} path parameter to point to your #{binary_type}"
+    "Could not find the #{binary_type}. Make sure you set the #{binary_type} path parameter to point to your #{binary_type}."
   end
 
   def self.parse_binary_metadata_error(binary_type)
-    "Failed to extract #{binary_type} metadata from the #{binary_type} path"
+    "Failed to extract #{binary_type} metadata from the #{binary_type} path."
   end
 
   def self.upload_binary_error(binary_type)
-    "App Distribution halted because it had a problem uploading the #{binary_type}"
+    "App Distribution halted because it had a problem uploading the #{binary_type}."
   end
 
   def self.binary_processing_error(binary_type)
-    "App Distribution failed to process the #{binary_type}"
+    "App Distribution failed to process the #{binary_type}."
   end
 end

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

@@ -1,5 +1,6 @@
 require 'fastlane_core/ui/ui'
 require 'cfpropertylist'
+
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
   module Helper
@@ -53,8 +54,12 @@ module Fastlane
         !blank?(value)
       end
 
+      def project_number_from_app_id(app_id)
+        app_id.split(':')[1]
+      end
+
       def app_name_from_app_id(app_id)
-        "#{project_name(app_id.split(':')[1])}/apps/#{app_id}"
+        "#{project_name(project_number_from_app_id(app_id))}/apps/#{app_id}"
       end
 
       def project_name(project_number)
@@ -65,7 +70,7 @@ module Fastlane
         "#{project_name(project_number)}/groups/#{group_alias}"
       end
 
-      def init_client(service_credentials_file, firebase_cli_token, debug, timeout = nil)
+      def init_google_api_client(debug, timeout = nil)
         if debug
           UI.important("Warning: Debug logging enabled. Output may include sensitive information.")
           Google::Apis.logger.level = Logger::DEBUG
@@ -76,10 +81,6 @@ module Fastlane
         unless timeout.nil?
           Google::Apis::ClientOptions.default.send_timeout_sec = timeout
         end
-
-        client = Google::Apis::FirebaseappdistributionV1::FirebaseAppDistributionService.new
-        client.authorization = get_authorization(service_credentials_file, firebase_cli_token, debug)
-        client
       end
 
       def deep_symbolize_keys(hash)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module FirebaseAppDistribution
-    VERSION = "0.7.4"
+    VERSION = "0.8.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-firebase_app_distribution
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Stefan Natchev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-firebaseappdistribution_v1
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: google-apis-firebaseappdistribution_v1alpha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +186,6 @@ files:
 - lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_get_latest_release.rb
 - lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_get_udids.rb
 - lib/fastlane/plugin/firebase_app_distribution/actions/firebase_app_distribution_remove_testers_action.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
 - lib/fastlane/plugin/firebase_app_distribution/helper/firebase_app_distribution_helper.rb
@@ -196,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Release your beta builds to Firebase App Distribution. https://firebase.google.com/docs/app-distribution

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

@@ -1,97 +0,0 @@
-require 'fastlane_core/ui/ui'
-require_relative '../helper/firebase_app_distribution_helper'
-
-module Fastlane
-  module Client
-    class FirebaseAppDistributionApiClient
-      include Helper::FirebaseAppDistributionHelper
-
-      BASE_URL = "https://firebaseappdistribution.googleapis.com"
-      MAX_POLLING_RETRIES = 60
-      POLLING_INTERVAL_SECONDS = 5
-
-      AUTHORIZATION = "Authorization"
-      CONTENT_TYPE = "Content-Type"
-      APPLICATION_OCTET_STREAM = "application/octet-stream"
-      CLIENT_VERSION = "X-Client-Version"
-
-      def initialize(auth_token, debug = false)
-        @auth_token = auth_token
-        @debug = debug
-      end
-
-      # Uploads the app binary to the Firebase API
-      #
-      # args
-      #   app_name - Firebase App resource name
-      #   binary_path - Absolute path to your app's aab/apk/ipa file
-      #   platform - 'android' or 'ios'
-      #   timeout - The amount of seconds before the upload will timeout, if not completed
-      #
-      # Returns the long-running operation name.
-      #
-      # Throws a user_error if the binary file does not exist
-      def upload_binary(app_name, binary_path, platform, timeout)
-        response = connection.post(binary_upload_url(app_name), read_binary(binary_path)) do |request|
-          request.options.timeout = timeout # seconds
-          request.headers[AUTHORIZATION] = "Bearer " + @auth_token
-          request.headers[CONTENT_TYPE] = APPLICATION_OCTET_STREAM
-          request.headers[CLIENT_VERSION] = client_version_header_value
-          request.headers["X-Goog-Upload-File-Name"] = CGI.escape(File.basename(binary_path))
-          request.headers["X-Goog-Upload-Protocol"] = "raw"
-        end
-
-        response.body[:name] || ''
-      rescue Errno::ENOENT # Raised when binary_path file does not exist
-        binary_type = binary_type_from_path(binary_path)
-        UI.user_error!("#{ErrorMessage.binary_not_found(binary_type)}: #{binary_path}")
-      end
-
-      # Get tester UDIDs
-      #
-      # args
-      #   app_name - Firebase App resource name
-      #
-      # Returns a list of hashes containing tester device info
-      def get_udids(app_id)
-        begin
-          response = connection.get(get_udids_url(app_id)) do |request|
-            request.headers[AUTHORIZATION] = "Bearer " + @auth_token
-            request.headers[CLIENT_VERSION] = client_version_header_value
-          end
-        rescue Faraday::ResourceNotFound
-          UI.user_error!("#{ErrorMessage::INVALID_APP_ID}: #{app_id}")
-        end
-        response.body[:testerUdids] || []
-      end
-
-      private
-
-      def client_version_header_value
-        "fastlane/#{Fastlane::FirebaseAppDistribution::VERSION}"
-      end
-
-      def binary_upload_url(app_name)
-        "/upload/v1/#{app_name}/releases:upload"
-      end
-
-      def get_udids_url(app_id)
-        "/v1alpha/apps/#{app_id}/testers:getTesterUdids"
-      end
-
-      def connection
-        @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
-
-      def read_binary(path)
-        # File must be read in binary mode to work on Windows
-        File.open(path, 'rb').read
-      end
-    end
-  end
-end