fastlane-plugin-huawei_appgallery_connect 1.0.14 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b26badca5c4e5028b8e90d24bdf2b300539f369b468ad182149c94bde47c406
-  data.tar.gz: 81b7075c7cc3f4bbfdc541e9cb82baad9636056b7773e0c5932ba4dd083bf3e2
+  metadata.gz: 13c12a640e892f8a26d41fe23ec060b7151d36fb56792053a0781d77bf6fb698
+  data.tar.gz: ec69a3d658b3d41c92376a6752ea743984251466f288d6bab34f5cdeca54d3bb
 SHA512:
-  metadata.gz: df7fcb9ba89d6708ea7c013e5f435935f9e608f8a8e8908fedb7016d1dd8b99c843707268786ad6638aa42b66ce54e68bea474046ff0e22fcb89d7c414c861fb
-  data.tar.gz: e50ad0fdbfd1933f26377752558d9cb0d1294c7ff6c99dec928c1d01fa39e4a5a366cbb78bc3e291fa4eb746947efb2f500da6cca95ece979565017ea0ae694f
+  metadata.gz: dcef9055f72ccaf6f08abf8fa5a1ac6a78e2101dfeb896a756bb66c28dcd847f662a0858aa397b029fd0fbae09e654444b39ce0ed3dbcc32bb5c43dc492ac5e0
+  data.tar.gz: 49feaeecebd261abcc0e63862a6dec3ec6662b831ea77bf582a1036faa2ab422c675ab83d5f9cc88771eec77979ca9c30464dc83449644243df461a4d310fdb6

data/README.md

@@ -26,6 +26,9 @@ huawei_appgallery_connect(
     apk_path: "<APK_PATH>"
     
     # Optional, Parameter beyond this are optional
+    
+    # If you are facing errors when submitting for review, increase the delay time before submitting the app for review using this option:
+    delay_before_submit_for_review: 20
 
     # if you're uploading aab instead of apk, specify is_aab to true and specify path to aab file on apk_path
     is_aab: true 

data/lib/fastlane/plugin/huawei_appgallery_connect/actions/huawei_appgallery_connect_action.rb

@@ -16,12 +16,34 @@ module Fastlane
           end
 
           upload_app = Helper::HuaweiAppgalleryConnectHelper.upload_app(token, params[:client_id], params[:app_id], params[:apk_path], params[:is_aab])
+          if params[:delay_before_submit_for_review] == nil
+              UI.message("Waiting 10 seconds for upload to get processed...")
+              sleep(10)
+          else
+             UI.message("Waiting #{params[:delay_before_submit_for_review]} seconds for upload to get processed...")
+             sleep(params[:delay_before_submit_for_review])
+          end
+          self.submit_for_review(token, upload_app, params)
+
+        end
+        # Helper::HuaweiAppgalleryConnectHelper.getAppInfo(token, params[:client_id], params[:app_id])
+      end
 
-          if upload_app && params[:submit_for_review] != false
+      def self.submit_for_review(token, upload_app, params)
+        if params[:is_aab] && upload_app["success"] == true && params[:submit_for_review] != false
+          compilationStatus = Helper::HuaweiAppgalleryConnectHelper.query_aab_compilation_status(token, params, upload_app["pkgVersion"])
+          if compilationStatus == 1
+            UI.important("aab file is currently processing, waiting for 2 minutes...")
+            sleep(120)
+            self.submit_for_review(token, upload_app, params)
+          elsif compilationStatus == 2
             Helper::HuaweiAppgalleryConnectHelper.submit_app_for_review(token, params)
+          else
+            UI.user_error!("Compilation of aab failed")
           end
+        elsif upload_app["success"] == true && params[:submit_for_review] != false
+          Helper::HuaweiAppgalleryConnectHelper.submit_app_for_review(token, params)
         end
-        # Helper::HuaweiAppgalleryConnectHelper.getAppInfo(token, params[:client_id], params[:app_id])
       end
 
       def self.description
@@ -133,7 +155,13 @@ module Fastlane
                                      env_name: "HUAWEI_APPGALLERY_SUBMIT_FOR_REVIEW",
                                      description: "Should submit the app for review. The default value is true. If set false will only upload the app, and you can submit for review from the console",
                                      optional: true,
-                                     type: Boolean)
+                                     type: Boolean),
+
+          FastlaneCore::ConfigItem.new(key: :delay_before_submit_for_review,
+                                       env_name: "HUAWEI_APPGALLERY_DELAY_BEFORE_REVIEW",
+                                       description: "Delay before submitting the app for review. Default is 10 seconds. Change this to a higher value if you are having issues submitting the app for review",
+                                       optional: true,
+                                       type: Integer)
         ]
       end
 

data/lib/fastlane/plugin/huawei_appgallery_connect/helper/huawei_appgallery_connect_helper.rb

@@ -57,6 +57,7 @@ module Fastlane
         request = Net::HTTP::Put.new(uri.request_uri)
         request["client_id"] = client_id
         request["Authorization"] = "Bearer #{token}"
+        request["Content-Type"] = "application/json"
 
         request.body = {privacyPolicy: privacy_policy_url}.to_json
 
@@ -79,6 +80,10 @@ module Fastlane
       def self.upload_app(token, client_id, app_id, apk_path, is_aab)
         UI.message("Fetching upload URL")
 
+        responseData = JSON.parse("{}")
+        responseData["success"] = false
+        responseData["code"] = 0
+
         if(is_aab)
           uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/upload-url?appId=#{app_id}&suffix=aab")
           upload_filename = "release.aab"
@@ -92,19 +97,22 @@ module Fastlane
         request = Net::HTTP::Get.new(uri.request_uri)
         request["client_id"] = client_id
         request["Authorization"] = "Bearer #{token}"
+        request["Content-Type"] = "application/json"
 
         response = http.request(request)
 
         if !response.kind_of? Net::HTTPSuccess
           UI.user_error!("Cannot obtain upload url, please check API Token / Permissions (status code: #{response.code})")
-          return false
+          responseData["success"] = false
+          return responseData
         end
 
         result_json = JSON.parse(response.body)
 
         if result_json['uploadUrl'].nil?
           UI.user_error!('Cannot obtain upload url')
-          return false
+          responseData["success"] = false
+          return responseData
         else
           UI.important('Uploading app')
           # Upload App
@@ -121,7 +129,8 @@ module Fastlane
           result = http.request(request)
           if !result.kind_of? Net::HTTPSuccess
             UI.user_error!("Cannot upload app, please check API Token / Permissions (status code: #{result.code})")
-            return false
+            responseData["success"] = false
+            return responseData
           end
           result_json = JSON.parse(result.body)
 
@@ -136,7 +145,7 @@ module Fastlane
             request = Net::HTTP::Put.new(uri.request_uri)
             request["client_id"] = client_id
             request["Authorization"] = "Bearer #{token}"
-            request['Content-Type'] = "application/json"
+            request["Content-Type"] = "application/json"
 
             data = {fileType: 5, files: [{
 
@@ -150,24 +159,57 @@ module Fastlane
             response = http.request(request)
             if !response.kind_of? Net::HTTPSuccess
               UI.user_error!("Cannot save app info, please check API Token / Permissions (status code: #{response.code})")
-              return false
+              responseData["success"] = false
+              return responseData
             end
             result_json = JSON.parse(response.body)
 
             if result_json['ret']['code'] == 0
               UI.success("App information saved.")
-              return true
+              responseData["success"] = true
+              responseData["pkgVersion"] = result_json["pkgVersion"][0]
+              return responseData
             else
               UI.user_error!(result_json)
               UI.user_error!("Failed to save app information")
-              return false
+              responseData["success"] = false
+              return responseData
             end
           else
-            return false
+            responseData["success"] = false
+            return responseData
           end
         end
       end
 
+      def self.query_aab_compilation_status(token,params, pkgVersion)
+        UI.important("Checking aab compilation status")
+
+        uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/aab/complile/status?appId=#{params[:app_id]}&pkgVersion=#{pkgVersion}")
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = Net::HTTP::Get.new(uri.request_uri)
+        request["client_id"] = params[:client_id]
+        request["Authorization"] = "Bearer #{token}"
+
+        response = http.request(request)
+
+        if !response.kind_of? Net::HTTPSuccess
+          UI.user_error!("Cannot query compilation status (status code: #{response.code}, body: #{response.body})")
+          return false
+        end
+
+        result_json = JSON.parse(response.body)
+
+        if result_json['ret']['code'] == 0
+          return result_json['aabCompileStatus']
+        else
+          UI.user_error!(result_json)
+          return -999
+        end
+      end
+
       def self.submit_app_for_review(token, params)
         UI.important("Submitting app for review")
 
@@ -211,6 +253,7 @@ module Fastlane
         request = Net::HTTP::Post.new(uri.request_uri)
         request["client_id"] = params[:client_id]
         request["Authorization"] = "Bearer #{token}"
+        request["Content-Type"] = "application/json"
 
         if params[:phase_wise_release] != nil && params[:phase_wise_release]
           request.body = {
@@ -221,7 +264,6 @@ module Fastlane
           }.to_json
         end
 
-
         response = http.request(request)
 
         if !response.kind_of? Net::HTTPSuccess
@@ -247,4 +289,3 @@ module Fastlane
     end
   end
 end
-

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgalleryConnect
-    VERSION = "1.0.14"
+    VERSION = "1.0.18"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-huawei_appgallery_connect
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.18
 platform: ruby
 authors:
 - Shreejan Shrestha
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.137.0
-description: 
+description:
 email: shr3jn@gmail.com
 executables: []
 extensions: []
@@ -154,7 +154,7 @@ homepage: https://github.com/shr3jn/fastlane-plugin-huawei_appgallery_connect
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Huawei AppGallery Connect Plugin
 test_files: []