fastlane-plugin-sapfire 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88044ddcaf677c20f2d9e0b7b2a54e1f92b2b609344815c82ff3d26b2344385f
-  data.tar.gz: 1e060c84cc0da8e87ee0f01aa8e3030745310c6cc97f89ef451a3f760371e615
+  metadata.gz: b04c4cbeb06c2856f862f7d4410efeaf27cb92a9e0b7291280199be31046573c
+  data.tar.gz: e19d2776f46af1798b2a6ce9d9c512ae0eae5937fac8128876538d43df162095
 SHA512:
-  metadata.gz: c751b85ff40459a46faee5598277794d05e5da1d679e12b4fbb8b261a893824f58bd04ef77acb4b5251288993669414bf4e0ad5ceb276cc76f65901576809f38
-  data.tar.gz: 2cccb183366378b8987a2f709078409bc967ca2831ef34bd4e2ac56a5214c690b94a32d39d54acfdcf250b8d6207a381206208cb055c38359121727663054f03
+  metadata.gz: b7db36a7409104f795a328a2b0706e14e3a3f7ddf732d5f397ad57f6094bd894007a60d65897f5076d7add53a0abd8e0707fd1bc36c8cc0d80592861856df2b4
+  data.tar.gz: 78e224d53850151f10099fb430f276ed2dfcc1fb92fa6b5dd47f0217c3880c235f65de35722bae2d6e1438755c123c091a5ce5f8032af0cc3f4b79cd721b51a7

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)
@@ -161,16 +165,14 @@ module Fastlane
         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
         }
@@ -202,9 +204,25 @@ module Fastlane
         end
       end
 
-      def self.acquire_vsapi_location
+      def self.acquire_dev_center_location
+        location = acquire_fw_url(DEV_CENTER_FW_LINK)
+        UI.message("Dev Center location: #{location}")
+
+        location
+      end
+
+      def self.acquire_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.message("VS API location: #{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,14 +232,7 @@ 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}")

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

@@ -23,9 +23,10 @@ module Fastlane
 
         UI.message("Creating submission for app #{app_id} ...")
         pending_submission = Helper::MsDevCenterHelper.non_published_submission(app_id, auth_token, timeout)
-        submission_id = pending_submission["id"]
 
         unless pending_submission.nil?
+          submission_id = pending_submission["id"]
+
           if params.values.include?(:remove_pending_submission) &&
              [true].include?(params[:remove_pending_submission])
             UI.message("Pending submission #{submission_id} were found and scheduled for deletion due to 'remove_pending_submission' argument set to 'true'")

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Sapfire
-    VERSION = "1.2.0"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sapfire
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - CheeryLee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A bunch of fastlane actions to work with MSBuild, NuGet and Microsoft Store