fastlane-plugin-huawei_appgallery_connect 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b26badca5c4e5028b8e90d24bdf2b300539f369b468ad182149c94bde47c406
-  data.tar.gz: 81b7075c7cc3f4bbfdc541e9cb82baad9636056b7773e0c5932ba4dd083bf3e2
+  metadata.gz: e8ad1b77f355b7d2284ad5e1cd0f161b2c643209cafbe79c3bd11c5de23405f2
+  data.tar.gz: f6dd1a859de8909d8e25b1485a5dd98130da965814e6246beadaf4c291f3f41d
 SHA512:
-  metadata.gz: df7fcb9ba89d6708ea7c013e5f435935f9e608f8a8e8908fedb7016d1dd8b99c843707268786ad6638aa42b66ce54e68bea474046ff0e22fcb89d7c414c861fb
-  data.tar.gz: e50ad0fdbfd1933f26377752558d9cb0d1294c7ff6c99dec928c1d01fa39e4a5a366cbb78bc3e291fa4eb746947efb2f500da6cca95ece979565017ea0ae694f
+  metadata.gz: 1cef05bbe6d2a076cca0e48d42e956717e792ebae5420c00e6c2c0b0ba805a186aa563c70f11268fc0d1b220b1ada355759f555c0f13fa37ad9bf0975b3409bc
+  data.tar.gz: 15771fc11e6da6d2deb8eb442c2b05e82c9d2f379bf64658617aa041bcf5f7c9507d926cf27d343bdc189f11c111f0ff91a449360a309801cedbf64ba76e9348

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

@@ -16,12 +16,27 @@ module Fastlane
           end
 
           upload_app = Helper::HuaweiAppgalleryConnectHelper.upload_app(token, params[:client_id], params[:app_id], params[:apk_path], params[:is_aab])
+          self.submit_for_review(token, upload_app, params)
 
-          if upload_app && params[:submit_for_review] != false
+        end
+        # Helper::HuaweiAppgalleryConnectHelper.getAppInfo(token, params[:client_id], params[:app_id])
+      end
+
+      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(10)
+            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

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

@@ -79,6 +79,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"
@@ -97,14 +101,16 @@ module Fastlane
 
         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 +127,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)
 
@@ -150,24 +157,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")
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgalleryConnect
-    VERSION = "1.0.14"
+    VERSION = "1.0.15"
   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.15
 platform: ruby
 authors:
 - Shreejan Shrestha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry