fastlane-plugin-sapfire 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acba89a24594d75771baf331f21ee7edb48214dd46a7ac3d156a9cb69cb916d
-  data.tar.gz: '083e0a2bf42c6b47e5cd25498fce324ca8f148ad8731488971fca1fd105ab3f7'
+  metadata.gz: 226d306173179880376ba2856ece97544e8d0fbeb1b19878a1188c77b2ebe753
+  data.tar.gz: ccee066ce7a4f4bad9e64e9b7939615098984439f4f8fbdf2a7cc6b27533d66b
 SHA512:
-  metadata.gz: 0f6132a34df4a89c0e1d36e8a64c6fe51210741e762e9fa14f48d752e34823a2079f5a26fa1b8e77f9473bdb11c051f1d4023ed171dd5b6e64df7c35627c78ae
-  data.tar.gz: ea7ec418dc4687a371f58b64edfbcbc72511e801bbb26836c3d1d3590802cc557110e3e365562110642613ec62c35a2d44f440014cdfce8210a3a187f9fc873d
+  metadata.gz: 792614cad248073d030c735ba6a048426382eed3a758c9bddf8292e2cd76895c7b9a4adfc469475ceff4f3c94389ced6c33b4886e98fb2f0ce1258fb9309e414
+  data.tar.gz: 2daccfbafee00c0d48864506744cec183e413d6e58bd40183ef30559b2330191ee5d7ba7ae185e6ae466458fd7ff9bef64f5b21156721c326ce91adbfc6c5b1d

data/README.md

@@ -90,6 +90,11 @@ Here is the list of all available actions. Read the documentation on each one by
 |--------------------------------------------------------|-----------------------------------------------------------------------------|--------------------:|
 | [app_certification](docs/actions/app_certification.md) | Runs Windows App Certification Kit to ensure your app is safe and efficient |             windows |
 
+#### 🐛 Beta
+
+| Argument                                                       | Description                                                            | Supported platforms |
+|----------------------------------------------------------------|------------------------------------------------------------------------|--------------------:|
+| [upload_package_flight](docs/actions/upload_package_flight.md) | Uploads new binary to Microsoft Partner Center as a new package flight |             windows |
 
 #### 📦 Releasing
 

data/lib/fastlane/plugin/sapfire/actions/associate_ms_store_action.rb

@@ -11,6 +11,9 @@ module Fastlane
       @vsapi_host = ""
       @vsapi_endpoint = ""
 
+      VS_API_FW_LINK = "2264307".freeze
+      DEV_CENTER_FW_LINK = "2263650".freeze
+      VS_CLIENT_ID = "04f0c124-f2bc-4f59-8241-bf6df9866bbd".freeze
       XML_NAME = "Package.StoreAssociation.xml".freeze
 
       def self.run(params)
@@ -19,8 +22,9 @@ module Fastlane
         begin
           UI.message("Creating #{XML_NAME}...")
 
-          acquire_authorization_token
-          acquire_vsapi_location
+          dev_center_url = acquire_dev_center_location
+          acquire_vs_api_location
+          acquire_authorization_token(dev_center_url)
           ms_developer_info = developer_info
           ms_app_info = app_info(params[:app_id])
           create_xml(params[:manifest], ms_developer_info, ms_app_info)
@@ -116,14 +120,20 @@ module Fastlane
 
           if response.status == 200
             data = JSON.parse(response.body)
+            failure_code = data["FailureCode"]
+            failure_reason = data["FailureReason"]
+
+            UI.user_error!("Request returned the error.\nFailure code: #{failure_code}\nFailure reason: #{failure_reason}") if
+              (!failure_code.nil? && failure_code != 0) || !failure_reason.nil?
+
             developer_info = DeveloperInfo.new(data["PublisherDisplayName"], data["Publisher"])
 
-            UI.message("Developer info was obtained")
+            UI.success("Developer info was obtained")
 
             return developer_info
           end
 
-          UI.user_error!("Request returned the error: #{response.status}")
+          UI.user_error!("Request completed with non successful status: #{response.status}")
         rescue StandardError => ex
           UI.user_error!("Developer info request failed: #{ex}")
         end
@@ -147,30 +157,34 @@ module Fastlane
 
           if response.status == 200
             data = JSON.parse(response.body)
+            failure_code = data["FailureCode"]
+            failure_reason = data["FailureReason"]
+
+            UI.user_error!("Request returned the error.\nFailure code: #{failure_code}\nFailure reason: #{failure_reason}") if
+              (!failure_code.nil? && failure_code != 0) || !failure_reason.nil?
+
             product = data["Products"].find { |x| x["LandingUrl"].include?(app_id) }
             app_info = AppInfo.new(product["MainPackageIdentityName"], product["ReservedNames"])
 
-            UI.message("Application info was obtained")
+            UI.success("Application info was obtained")
 
             return app_info
           end
 
-          UI.user_error!("Request returned the error: #{response.code}")
+          UI.user_error!("Request completed with non successful status: #{response.status}")
         rescue StandardError => ex
           UI.user_error!("Application info request failed: #{ex}")
         end
       end
 
-      def self.acquire_authorization_token
+      def self.acquire_authorization_token(resource)
         UI.message("Acquiring authorization token ...")
 
         ms_credentials = Helper.ms_credentials
         body = {
-          client_id: ms_credentials.client_id,
-          client_secret: ms_credentials.client_secret,
-          client_info: 1,
+          client_id: VS_CLIENT_ID,
           grant_type: "password",
-          scope: "https://graph.windows.net/.default offline_access openid profile",
+          scope: "#{resource}/.default",
           username: ms_credentials.username,
           password: ms_credentials.password
         }
@@ -188,7 +202,7 @@ module Fastlane
 
           if response.status == 200
             @token = data["access_token"]
-            UI.message("Authorization token was obtained")
+            UI.success("Authorization token was obtained")
 
             return
           end
@@ -202,9 +216,28 @@ module Fastlane
         end
       end
 
-      def self.acquire_vsapi_location
+      def self.acquire_dev_center_location
+        UI.message("Acquiring Dev Center location ...")
+        location = acquire_fw_url(DEV_CENTER_FW_LINK)
+        UI.success("URL was obtained: #{location}")
+
+        location
+      end
+
+      def self.acquire_vs_api_location
+        UI.message("Acquiring VS API location ...")
+
+        location = acquire_fw_url(VS_API_FW_LINK)
+        uri = URI(location)
+        @vsapi_host = "#{uri.scheme}://#{uri.host}"
+        @vsapi_endpoint = uri.path
+
+        UI.success("URL was obtained: #{location}")
+      end
+
+      def self.acquire_fw_url(link_id)
         query = {
-          LinkId: "875315" # VS API constant
+          LinkId: link_id
         }
         connection = Faraday.new("https://go.microsoft.com")
 
@@ -214,17 +247,10 @@ module Fastlane
           if response.status == 302
             raise "'Location' header isn't presented" unless response.headers.include?("Location")
 
-            location = response.headers["Location"]
-            uri = URI(location)
-            @vsapi_host = "#{uri.scheme}://#{uri.host}"
-            @vsapi_endpoint = uri.path
-
-            UI.message("VS API endpoint: #{location}")
-
-            return
+            return response.headers["Location"]
           end
 
-          UI.user_error!("Request returned the error: #{response.status}")
+          UI.user_error!("Request completed with non successful status: #{response.status}")
         rescue StandardError => ex
           UI.user_error!("Failed to get VS API endpoint location: #{ex}")
         end

data/lib/fastlane/plugin/sapfire/actions/upload_ms_store_action.rb

@@ -1,6 +1,7 @@
 require "fastlane/action"
 require_relative "../helper/ms_credentials"
 require_relative "../helper/ms_devcenter_helper"
+require_relative "../helper/azure_blob_helper"
 require_relative "../msbuild/options"
 
 module Fastlane
@@ -22,7 +23,8 @@ module Fastlane
         UI.message("Authorization token was obtained")
 
         UI.message("Creating submission for app #{app_id} ...")
-        pending_submission = Helper::MsDevCenterHelper.non_published_submission(app_id, auth_token, timeout)
+        app_info = get_app_info(app_id, auth_token, timeout)
+        pending_submission = app_info["pendingApplicationSubmission"]
 
         unless pending_submission.nil?
           submission_id = pending_submission["id"]
@@ -46,11 +48,11 @@ module Fastlane
         UI.message("Submission #{submission_id} created")
 
         UI.message("Prepare ZIP blob for upload ...")
-        zip_path = create_blob_zip(File.expand_path(path))
+        zip_path = Helper::AzureBlobHelper.create_blob_zip(File.expand_path(path))
         UI.success("Blob is ready")
 
         UI.message("Uploading ZIP blob ...")
-        Helper::MsDevCenterHelper.upload_blob(submission_obj["fileUploadUrl"], zip_path, timeout)
+        Helper::AzureBlobHelper.upload_blob(submission_obj["fileUploadUrl"], zip_path, timeout)
         UI.success("ZIP blob uploaded successfully")
 
         submission_obj = prepare_empty_submission(submission_obj)
@@ -61,11 +63,11 @@ module Fastlane
         UI.message("Updated successfully")
 
         UI.message("Committing ...")
-        Helper::MsDevCenterHelper.commit_submission(app_id, submission_id, auth_token, timeout)
+        Helper::MsDevCenterHelper.commit_submission(app_id, nil, submission_id, auth_token, timeout)
 
         if params.values.include?(:skip_waiting_for_build_processing) &&
            [true].include?(params[:skip_waiting_for_build_processing])
-          UI.success("Submission passed, but build processing were skipped. Check the Dev Center page.")
+          UI.success("Submission passed, but build processing were skipped. Check the Dev Center page to get an actual status.")
           return
         end
 
@@ -73,7 +75,7 @@ module Fastlane
         data = nil
         until status
           UI.message("Waiting for the submission to change the status - this may take a few minutes")
-          data = Helper::MsDevCenterHelper.get_submission_status(app_id, submission_id, auth_token, timeout)
+          data = Helper::MsDevCenterHelper.get_submission_status(app_id, nil, submission_id, auth_token, timeout)
           status = data["status"] != "CommitStarted"
           sleep(30) unless status
         end
@@ -182,20 +184,6 @@ module Fastlane
         :production
       end
 
-      def self.create_blob_zip(package_path)
-        zip_path = File.join(File.dirname(package_path), "blob.zip")
-        File.delete(zip_path) if File.exist?(zip_path)
-
-        Zip::File.open(zip_path, create: true) do |file|
-          file.add(File.basename(package_path), package_path)
-
-          screenshot_path = File.join(Helper::SapfireHelper.root_plugin_location, "assets", "ms_example_screenshot.png")
-          file.add("ms_example_screenshot.png", File.expand_path(screenshot_path))
-        end
-
-        zip_path
-      end
-
       def self.add_package_to_submission(submission_obj, file_name)
         check_submission(submission_obj)
         UI.user_error!("Package file name can't be null or empty") if file_name.nil? || file_name.empty?

data/lib/fastlane/plugin/sapfire/actions/upload_package_flight_action.rb

@@ -0,0 +1,233 @@
+require "fastlane/action"
+require_relative "../helper/ms_credentials"
+require_relative "../helper/ms_devcenter_helper"
+require_relative "../helper/azure_blob_helper"
+require_relative "../msbuild/options"
+
+module Fastlane
+  module Actions
+    class UploadPackageFlightAction < Action
+      DEFAULT_TIMEOUT = 300
+
+      def self.run(params)
+        ms_credentials = Helper.ms_credentials
+        app_id = params[:app_id]
+        flight_name = params[:name]
+        group_ids = params[:group_ids]
+        path = params[:path]
+        timeout = params.values.include?(:timeout) && params[:timeout].positive? ? params[:timeout] : DEFAULT_TIMEOUT
+
+        UI.message("Acquiring authorization token for DevCenter ...")
+        auth_token = Helper::MsDevCenterHelper.acquire_authorization_token(ms_credentials.tenant_id,
+                                                                           ms_credentials.client_id,
+                                                                           ms_credentials.client_secret,
+                                                                           timeout)
+        UI.message("Authorization token was obtained")
+        UI.message("Creating package flight for app #{app_id} ...")
+
+        flight_obj = Helper::MsDevCenterHelper.create_flight(app_id, flight_name, group_ids, auth_token, timeout)
+        flight_id = flight_obj["flightId"]
+        flight_name = flight_obj["friendlyName"]
+        submission_id = flight_obj["pendingFlightSubmission"]["id"]
+        submission_obj = Helper::MsDevCenterHelper.get_submission(app_id, flight_id, submission_id, auth_token, timeout)
+        UI.message("Flight #{flight_name} (ID: #{flight_id}) created")
+
+        UI.message("Prepare ZIP blob for upload ...")
+        zip_path = Helper::AzureBlobHelper.create_blob_zip(File.expand_path(path))
+        UI.success("Blob is ready")
+
+        UI.message("Uploading ZIP blob ...")
+        Helper::AzureBlobHelper.upload_blob(submission_obj["fileUploadUrl"], zip_path, timeout)
+        UI.success("ZIP blob uploaded successfully")
+
+        publish_immediate = params.values.include?(:publish_immediate) && [true].include?(params[:publish_immediate])
+        submission_obj = prepare_empty_submission(submission_obj, publish_immediate)
+        submission_obj = add_package_to_submission(submission_obj, File.basename(path))
+
+        UI.message("Updating submission data ...")
+        Helper::MsDevCenterHelper.update_submission(app_id, submission_obj, auth_token, timeout)
+        UI.message("Updated successfully")
+
+        UI.message("Committing ...")
+        Helper::MsDevCenterHelper.commit_submission(app_id, flight_id, submission_id, auth_token, timeout)
+
+        if params.values.include?(:skip_waiting_for_build_processing) &&
+           [true].include?(params[:skip_waiting_for_build_processing])
+          UI.success("Submission passed, but build processing were skipped. Check the Dev Center page to get an actual status.")
+          return
+        end
+
+        status = false
+        data = nil
+        until status
+          UI.message("Waiting for the submission to change the status - this may take a few minutes")
+          data = Helper::MsDevCenterHelper.get_submission_status(app_id, flight_id, submission_id, auth_token, timeout)
+          status = data["status"] != "CommitStarted"
+          sleep(30) unless status
+        end
+
+        if data["status"] == "CommitFailed"
+          errors = data["statusDetails"]["errors"]
+          if errors.length == 1 && errors[0]["code"] == "InvalidState"
+            UI.important(
+              [
+                "All submission operations passed correctly, but there are some things that you need to proceed using DevCenter.",
+                "Message: #{errors[0]["details"]}"
+              ].join("\n")
+            )
+            return
+          end
+
+          errors.each do |error|
+            UI.error("Error code: #{error["code"]}\nMessage: #{error["details"]}")
+          end
+
+          UI.user_error!("Submission failed")
+        end
+
+        UI.success("Submission passed. Check the DevCenter page.")
+      end
+
+      def self.description
+        "Creates a new package flight submission in Microsoft Partner Center and uploads new binary to it"
+      end
+
+      def self.authors
+        ["CheeryLee"]
+      end
+
+      def self.is_supported?(platform)
+        [:windows].include?(platform)
+      end
+
+      def self.output
+        [
+          ["SF_PUSHING_TIMEOUT", "The timeout for pushing to a server in seconds"],
+          ["SF_APP_ID", "The Microsoft Store ID of an application"],
+          ["SF_FLIGHT_NAME", "An optional name that would be used as a flight name"],
+          ["SF_PACKAGE", "The file path to the package to be uploaded"]
+        ]
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(
+            key: :timeout,
+            env_name: "SF_PUSHING_TIMEOUT",
+            description: "The timeout for pushing to a server in seconds",
+            optional: true,
+            default_value: 0,
+            type: Integer
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_id,
+            env_name: "SF_APP_ID",
+            description: "The Microsoft Store ID of an application",
+            optional: false,
+            type: String,
+            verify_block: proc do |value|
+              UI.user_error!("The Microsoft Store ID can't be empty") unless value && !value.empty?
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :skip_waiting_for_build_processing,
+            description: "If set to true, the action will only commit the submission and skip the remaining build validation",
+            optional: true,
+            default_value: false,
+            type: Fastlane::Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :publish_immediate,
+            description: "If set to true, the submission will be published automatically once the validation passes",
+            optional: true,
+            default_value: false,
+            type: Fastlane::Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :name,
+            env_name: "SF_FLIGHT_NAME",
+            description: "An optional name that would be used as a flight name",
+            optional: true,
+            default_value: "",
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :group_ids,
+            description: "A list of tester groups who will get a new package",
+            optional: false,
+            type: Array,
+            verify_block: proc do |array|
+              UI.user_error!("List of tester groups can't be empty") if array.empty?
+
+              array.each do |value|
+                UI.user_error!("Tester group ID must be a string and can't be null or empty") if
+                  !value.is_a?(String) || value.nil? || value.empty?
+              end
+            end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :path,
+            env_name: "SF_PACKAGE",
+            description: "The file path to the package to be uploaded",
+            optional: false,
+            type: String,
+            verify_block: proc do |value|
+              UI.user_error!("Path to UWP package is invalid") unless value && !value.empty?
+
+              format_valid = false
+              Msbuild::Options::PACKAGE_FORMATS.each do |extension|
+                if value.end_with?(extension)
+                  format_valid = true
+                  break
+                end
+              end
+
+              UI.user_error!("The provided path doesn't point to UWP file") unless
+                File.exist?(File.expand_path(value)) && format_valid
+            end
+          )
+        ]
+      end
+
+      def self.category
+        :beta
+      end
+
+      def self.add_package_to_submission(submission_obj, file_name)
+        check_submission(submission_obj)
+        UI.user_error!("Package file name can't be null or empty") if file_name.nil? || file_name.empty?
+
+        key = "flightPackages"
+        package = {
+          "fileName": file_name,
+          "fileStatus": "PendingUpload",
+          "minimumDirectXVersion": "None",
+          "minimumSystemRam": "None"
+        }
+
+        if submission_obj[key].empty?
+          submission_obj[key] = []
+        else
+          submission_obj[key].each do |existing_package|
+            existing_package["fileStatus"] = "PendingDelete"
+          end
+        end
+
+        submission_obj[key].append(package)
+        submission_obj
+      end
+
+      def self.prepare_empty_submission(submission_obj, publish_immediate)
+        check_submission(submission_obj)
+        submission_obj["targetPublishMode"] = publish_immediate ? "Immediate" : "Manual"
+        submission_obj
+      end
+
+      def self.check_submission(submission_obj)
+        UI.user_error!("Submission data object need to be provided") if submission_obj.nil?
+      end
+
+      private_constant(:DEFAULT_TIMEOUT)
+    end
+  end
+end

data/lib/fastlane/plugin/sapfire/helper/azure_blob_helper.rb

@@ -0,0 +1,143 @@
+module Fastlane
+  module Helper
+    class AzureBlobHelper
+      FILE_CHUNK_SIZE = 26_214_400
+      UPLOAD_RETRIES = 3
+
+      def self.create_blob_zip(package_path)
+        zip_path = File.join(File.dirname(package_path), "blob.zip")
+        File.delete(zip_path) if File.exist?(zip_path)
+
+        Zip::File.open(zip_path, create: true) do |file|
+          file.add(File.basename(package_path), package_path)
+
+          screenshot_path = File.join(Helper::SapfireHelper.root_plugin_location, "assets", "ms_example_screenshot.png")
+          file.add("ms_example_screenshot.png", File.expand_path(screenshot_path))
+        end
+
+        zip_path
+      end
+
+      def self.upload_blob(url, zip_path, timeout = 0)
+        UI.user_error!("File upload URL need to be provided") if !url.is_a?(String) || url.nil? || url.empty?
+        UI.user_error!("File path is invalid") if !zip_path.is_a?(String) || zip_path.nil? || zip_path.empty?
+
+        expand_path = File.expand_path(zip_path)
+        UI.user_error!("The provided path doesn't point to ZIP file") unless File.exist?(expand_path) && zip_path.end_with?(".zip")
+
+        File.open(expand_path) do |file|
+          block_list = []
+          chunks_count = (file.size.to_f / FILE_CHUNK_SIZE).ceil
+          current_chunk = 1
+
+          until file.eof?
+            bytes = file.read(FILE_CHUNK_SIZE)
+            id = SecureRandom.uuid.delete("-")
+            block_list.append(id)
+            retry_count = 0
+            result = false
+
+            UI.message("Upload chunk [#{current_chunk} / #{chunks_count}]")
+
+            while !result && retry_count < UPLOAD_RETRIES
+              result = upload_block(url, bytes, id, timeout)
+              retry_count += 1
+            end
+
+            UI.user_error!("Uploading failed: some chunks have not been uploaded") unless result
+            current_chunk += 1
+          end
+
+          result = upload_block_list(url, block_list, timeout)
+          UI.user_error!("Uploading failed: block list hasn't been uploaded") unless result
+        end
+      end
+
+      def self.upload_block(url, bytes, id, timeout = 0)
+        headers = {
+          "Content-Length": bytes.length.to_s
+        }
+
+        url_data = parse_upload_url(url)
+        url_data[:query]["comp"] = "block"
+        url_data[:query]["blockid"] = id
+        connection = Faraday.new(url_data[:host])
+
+        begin
+          response = connection.put(url_data[:path]) do |req|
+            req.headers = headers
+            req.params = url_data[:query]
+            req.body = bytes
+            req.options.timeout = timeout if timeout.positive?
+          end
+
+          return true if response.status == 201
+
+          error = response.body.to_s
+          UI.error("Upload request failed.\nCode: #{response.status}\nError: #{error}")
+        rescue StandardError => ex
+          UI.error("Upload request failed: #{ex}")
+        end
+
+        false
+      end
+
+      def self.upload_block_list(url, list, timeout = 0)
+        document = REXML::Document.new
+        document.xml_decl.version = "1.0"
+        document.xml_decl.encoding = "utf-8"
+        block_list = document.add_element("BlockList")
+
+        list.each do |block|
+          block_list.add_element("Latest").text = block
+        end
+
+        url_data = parse_upload_url(url)
+        url_data[:query]["comp"] = "blocklist"
+        connection = Faraday.new(url_data[:host])
+
+        begin
+          response = connection.put(url_data[:path]) do |req|
+            req.params = url_data[:query]
+            req.body = document.to_s
+            req.options.timeout = timeout if timeout.positive?
+          end
+
+          return true if response.status == 201
+
+          error = response.body.to_s
+          UI.error("Upload block list request failed.\nCode: #{response.status}\nError: #{error}")
+        rescue StandardError => ex
+          UI.error("Upload block list request failed: #{ex}")
+        end
+
+        false
+      end
+
+      def self.parse_upload_url(url)
+        url = URI.parse(url)
+        query_parts = {}
+        url.query.split("&").each do |x|
+          parts = x.split("=")
+          query_parts[parts[0]] = CGI.unescape(parts[1])
+        end
+
+        {
+          host: "https://#{url.host}",
+          path: url.path,
+          query: query_parts
+        }
+      end
+
+      public_class_method(:create_blob_zip)
+      public_class_method(:upload_blob)
+
+      private_class_method(:upload_block)
+      private_class_method(:upload_block_list)
+      private_class_method(:parse_upload_url)
+
+      private_constant(:FILE_CHUNK_SIZE)
+      private_constant(:UPLOAD_RETRIES)
+    end
+  end
+end

data/lib/fastlane/plugin/sapfire/helper/ms_devcenter_helper.rb

@@ -7,112 +7,42 @@ module Fastlane
       REQUEST_HEADERS = {
         "Accept": "application/json"
       }.freeze
-      FILE_CHUNK_SIZE = 26_214_400
-      UPLOAD_RETRIES = 3
 
-      def self.upload_blob(url, zip_path, timeout = 0)
-        UI.user_error!("File upload URL need to be provided") if !url.is_a?(String) || url.nil? || url.empty?
-        UI.user_error!("File path is invalid") if !zip_path.is_a?(String) || zip_path.nil? || zip_path.empty?
-
-        expand_path = File.expand_path(zip_path)
-        UI.user_error!("The provided path doesn't point to ZIP file") unless File.exist?(expand_path) && zip_path.end_with?(".zip")
-
-        File.open(expand_path) do |file|
-          block_list = []
-          chunks_count = (file.size.to_f / FILE_CHUNK_SIZE).ceil
-          current_chunk = 1
-
-          until file.eof?
-            bytes = file.read(FILE_CHUNK_SIZE)
-            id = SecureRandom.uuid.delete("-")
-            block_list.append(id)
-            retry_count = 0
-            result = false
-
-            UI.message("Upload chunk [#{current_chunk} / #{chunks_count}]")
-
-            while !result && retry_count < UPLOAD_RETRIES
-              result = upload_block(url, bytes, id, timeout)
-              retry_count += 1
-            end
-
-            UI.user_error!("Uploading failed: some chunks have not been uploaded") unless result
-            current_chunk += 1
-          end
-
-          result = upload_block_list(url, block_list, timeout)
-          UI.user_error!("Uploading failed: block list hasn't been uploaded") unless result
-        end
-      end
-
-      def self.upload_block(url, bytes, id, timeout = 0)
-        headers = {
-          "Content-Length": bytes.length.to_s
-        }
-
-        url_data = parse_upload_url(url)
-        url_data[:query]["comp"] = "block"
-        url_data[:query]["blockid"] = id
-        connection = Faraday.new(url_data[:host])
-
-        begin
-          response = connection.put(url_data[:path]) do |req|
-            req.headers = headers
-            req.params = url_data[:query]
-            req.body = bytes
-            req.options.timeout = timeout if timeout.positive?
-          end
-
-          return true if response.status == 201
-
-          error = response.body.to_s
-          UI.error("Upload request failed.\nCode: #{response.status}\nError: #{error}")
-        rescue StandardError => ex
-          UI.error("Upload request failed: #{ex}")
-        end
-
-        false
-      end
-
-      def self.upload_block_list(url, list, timeout = 0)
-        document = REXML::Document.new
-        document.xml_decl.version = "1.0"
-        document.xml_decl.encoding = "utf-8"
-        block_list = document.add_element("BlockList")
-
-        list.each do |block|
-          block_list.add_element("Latest").text = block
-        end
+      def self.get_app_info(app_id, auth_token, timeout = 0)
+        check_app_id(app_id)
 
-        url_data = parse_upload_url(url)
-        url_data[:query]["comp"] = "blocklist"
-        connection = Faraday.new(url_data[:host])
+        connection = Faraday.new(HOST)
+        url = build_url_root(app_id)
 
         begin
-          response = connection.put(url_data[:path]) do |req|
-            req.params = url_data[:query]
-            req.body = document.to_s
+          response = connection.get(url) do |req|
+            req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
+          data = JSON.parse(response.body)
 
-          return true if response.status == 201
+          return data if response.status == 200
 
-          error = response.body.to_s
-          UI.error("Upload block list request failed.\nCode: #{response.status}\nError: #{error}")
+          UI.user_error!("Getting app request returned the error.\nCode: #{response.status}")
         rescue StandardError => ex
-          UI.error("Upload block list request failed: #{ex}")
+          UI.user_error!("Getting app info process failed: #{ex}")
         end
-
-        false
       end
 
-      def self.get_app_info(app_id, auth_token, timeout = 0)
+      def self.get_submission(app_id, flight_id, submission_id, auth_token, timeout = 0)
         check_app_id(app_id)
+        check_submission_id(submission_id)
+
+        is_flight = !flight_id.nil? && !flight_id.empty?
+        check_flight_id(flight_id) if is_flight
 
         connection = Faraday.new(HOST)
+        url = build_url_root(app_id)
+        url += "/flights/#{flight_id}" if is_flight
+        url += "/submissions/#{submission_id}"
 
         begin
-          response = connection.get("/#{API_VERSION}/#{API_ROOT}/#{app_id}") do |req|
+          response = connection.get(url) do |req|
             req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
@@ -120,9 +50,12 @@ module Fastlane
 
           return data if response.status == 200
 
-          UI.user_error!("Getting app request returned the error.\nCode: #{response.status}")
+          code = data["code"]
+          message = data["message"]
+
+          UI.user_error!("Getting flight submission request returned the error.\nCode: #{response.status} #{code}.\nDescription: #{message}")
         rescue StandardError => ex
-          UI.user_error!("Getting app info process failed: #{ex}")
+          UI.user_error!("Getting flight submission process failed: #{ex}")
         end
       end
 
@@ -130,9 +63,10 @@ module Fastlane
         check_app_id(app_id)
 
         connection = Faraday.new(HOST)
+        url = "#{build_url_root(app_id)}/submissions"
 
         begin
-          response = connection.post("/#{API_VERSION}/#{API_ROOT}/#{app_id}/submissions") do |req|
+          response = connection.post(url) do |req|
             req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
@@ -153,11 +87,15 @@ module Fastlane
         check_app_id(app_id)
         UI.user_error!("Submission data object need to be provided") if submission_obj.nil?
 
-        submission_id = submission_obj["id"]
         connection = Faraday.new(HOST)
+        flight_id = submission_obj["flightId"]
+        submission_id = submission_obj["id"]
+        url = build_url_root(app_id)
+        url += "/flights/#{flight_id}" if !flight_id.nil? && !flight_id.empty?
+        url += "/submissions/#{submission_id}"
 
         begin
-          response = connection.put("/#{API_VERSION}/#{API_ROOT}/#{app_id}/submissions/#{submission_id}") do |req|
+          response = connection.put(url) do |req|
             req.headers = build_headers(auth_token)
             req.body = submission_obj.to_json
             req.options.timeout = timeout if timeout.positive?
@@ -172,14 +110,20 @@ module Fastlane
         end
       end
 
-      def self.commit_submission(app_id, submission_id, auth_token, timeout = 0)
+      def self.commit_submission(app_id, flight_id, submission_id, auth_token, timeout = 0)
         check_app_id(app_id)
         check_submission_id(submission_id)
 
+        is_flight = !flight_id.nil? && !flight_id.empty?
+        check_flight_id(flight_id) if is_flight
+
         connection = Faraday.new(HOST)
+        url = build_url_root(app_id)
+        url += "/flights/#{flight_id}" if is_flight
+        url += "/submissions/#{submission_id}/commit"
 
         begin
-          response = connection.post("/#{API_VERSION}/#{API_ROOT}/#{app_id}/submissions/#{submission_id}/commit") do |req|
+          response = connection.post(url) do |req|
             req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
@@ -195,9 +139,10 @@ module Fastlane
         check_submission_id(submission_id)
 
         connection = Faraday.new(HOST)
+        url = "#{build_url_root(app_id)}/submissions/#{submission_id}"
 
         begin
-          response = connection.delete("/#{API_VERSION}/#{API_ROOT}/#{app_id}/submissions/#{submission_id}") do |req|
+          response = connection.delete(url) do |req|
             req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
@@ -208,11 +153,12 @@ module Fastlane
         end
       end
 
-      def self.get_submission_status(app_id, submission_id, auth_token, timeout = 0)
+      def self.get_submission_status(app_id, flight_id, submission_id, auth_token, timeout = 0)
         check_app_id(app_id)
+        check_flight_id(flight_id) if !flight_id.nil? && !flight_id.empty?
         check_submission_id(submission_id)
 
-        response = get_submission_status_internal(app_id, submission_id, auth_token, timeout)
+        response = get_submission_status_internal(app_id, flight_id, submission_id, auth_token, timeout)
 
         # Sometimes MS can return internal server error code (500) that is not directly related to uploading process.
         # Once it happens, retry 3 times until we'll get a success response.
@@ -221,7 +167,7 @@ module Fastlane
 
           until server_error_500_retry_counter < 2
             server_error_500_retry_counter += 1
-            response = get_submission_status_internal(app_id, submission_id, auth_token, timeout)
+            response = get_submission_status_internal(app_id, flight_id, submission_id, auth_token, timeout)
             break if response.nil? || response[:status] == 200
           end
         end
@@ -231,11 +177,14 @@ module Fastlane
         UI.user_error!("Submission status obtaining request returned the error.\nCode: #{response[:status]}")
       end
 
-      def self.get_submission_status_internal(app_id, submission_id, auth_token, timeout = 0)
+      def self.get_submission_status_internal(app_id, flight_id, submission_id, auth_token, timeout = 0)
         connection = Faraday.new(HOST)
+        url = build_url_root(app_id)
+        url += "/flights/#{flight_id}/" if !flight_id.nil? && !flight_id.empty?
+        url += "/submissions/#{submission_id}/status"
 
         begin
-          response = connection.get("/#{API_VERSION}/#{API_ROOT}/#{app_id}/submissions/#{submission_id}/status") do |req|
+          response = connection.get(url) do |req|
             req.headers = build_headers(auth_token)
             req.options.timeout = timeout if timeout.positive?
           end
@@ -251,6 +200,36 @@ module Fastlane
         end
       end
 
+      def self.create_flight(app_id, friendly_name, group_ids, auth_token, timeout = 0)
+        check_app_id(app_id)
+
+        friendly_name = !friendly_name.nil? && !friendly_name.empty? ? friendly_name : "Fastlane Sapfire Flight"
+        body = {
+          friendlyName: friendly_name,
+          groupIds: group_ids
+        }
+        connection = Faraday.new(HOST)
+        url = "#{build_url_root(app_id)}/flights"
+
+        begin
+          response = connection.post(url) do |req|
+            req.headers = build_headers(auth_token)
+            req.body = body.to_json
+            req.options.timeout = timeout if timeout.positive?
+          end
+          data = JSON.parse(response.body)
+
+          return data if response.status == 201
+
+          code = data["code"]
+          message = data["message"]
+
+          UI.user_error!("Creating flight request returned the error.\nCode: #{response.status} #{code}.\nDescription: #{message}")
+        rescue StandardError => ex
+          UI.user_error!("Creating flight process failed: #{ex}")
+        end
+      end
+
       def self.acquire_authorization_token(tenant_id, client_id, client_secret, timeout = 0)
         body = {
           client_id: client_id,
@@ -282,10 +261,8 @@ module Fastlane
         end
       end
 
-      def self.non_published_submission(app_id, auth_token, timeout = 0)
-        check_app_id(app_id)
-        app_info = get_app_info(app_id, auth_token, timeout)
-        app_info["pendingApplicationSubmission"]
+      def self.build_url_root(app_id)
+        "/#{API_VERSION}/#{API_ROOT}/#{app_id}"
       end
 
       def self.build_headers(auth_token)
@@ -295,21 +272,6 @@ module Fastlane
         }.merge(REQUEST_HEADERS)
       end
 
-      def self.parse_upload_url(url)
-        url = URI.parse(url)
-        query_parts = {}
-        url.query.split("&").each do |x|
-          parts = x.split("=")
-          query_parts[parts[0]] = CGI.unescape(parts[1])
-        end
-
-        {
-          host: "https://#{url.host}",
-          path: url.path,
-          query: query_parts
-        }
-      end
-
       def self.check_app_id(id)
         UI.user_error!("App ID need to be provided") if !id.is_a?(String) || id.nil? || id.empty?
       end
@@ -318,30 +280,32 @@ module Fastlane
         UI.user_error!("Submission ID need to be provided") if !id.is_a?(String) || id.nil? || id.empty?
       end
 
-      public_class_method(:upload_blob)
+      def self.check_flight_id(id)
+        UI.user_error!("Flight ID need to be provided") if !id.is_a?(String) || id.nil? || id.empty?
+      end
+
+
       public_class_method(:get_app_info)
+      public_class_method(:get_submission)
       public_class_method(:create_submission)
       public_class_method(:update_submission)
       public_class_method(:commit_submission)
       public_class_method(:remove_submission)
       public_class_method(:get_submission_status)
+      public_class_method(:create_flight)
       public_class_method(:acquire_authorization_token)
-      public_class_method(:non_published_submission)
 
-      private_class_method(:upload_block)
-      private_class_method(:upload_block_list)
+      private_class_method(:build_url_root)
       private_class_method(:build_headers)
-      private_class_method(:parse_upload_url)
       private_class_method(:check_app_id)
       private_class_method(:check_submission_id)
+      private_class_method(:check_flight_id)
       private_class_method(:get_submission_status_internal)
 
       private_constant(:HOST)
       private_constant(:API_VERSION)
       private_constant(:API_ROOT)
       private_constant(:REQUEST_HEADERS)
-      private_constant(:FILE_CHUNK_SIZE)
-      private_constant(:UPLOAD_RETRIES)
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Sapfire
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sapfire
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - CheeryLee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -144,7 +144,9 @@ files:
 - lib/fastlane/plugin/sapfire/actions/update_uwp_signing_settings_action.rb
 - lib/fastlane/plugin/sapfire/actions/upload_ms_store_action.rb
 - lib/fastlane/plugin/sapfire/actions/upload_nuget_action.rb
+- lib/fastlane/plugin/sapfire/actions/upload_package_flight_action.rb
 - lib/fastlane/plugin/sapfire/actions_base/msbuild_action_base.rb
+- lib/fastlane/plugin/sapfire/helper/azure_blob_helper.rb
 - lib/fastlane/plugin/sapfire/helper/ms_credentials.rb
 - lib/fastlane/plugin/sapfire/helper/ms_devcenter_helper.rb
 - lib/fastlane/plugin/sapfire/helper/sapfire_helper.rb
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A bunch of fastlane actions to work with MSBuild, NuGet and Microsoft Store