fastlane-plugin-huawei_appgallery_connect 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5551239cf32bab29acd6d2d70b1623731c4629f09f102a98d05f5b0e7ee2bca
-  data.tar.gz: 83446bfb3a35d813abaa29a09af38185f136ae73c3f08d07f5620f80bedfc17b
+  metadata.gz: dfbde49f6453dab62630894c6b4d16a2710d588b0745d97b33840fbb8eaae8d8
+  data.tar.gz: 158bbe4a0770dfc2eb01a260144e3aecf72b14ba95f45e50789c3907a92bf8e0
 SHA512:
-  metadata.gz: 839662a96b67bec48d6c35e29151db9ab9d91c759de901734eed761392ffc93f3c75f154ca9bf790b38a05bac2e991d4e7896d19babe5d4eec4192f115efd573
-  data.tar.gz: 1912a210ee2fb2e53f5d5d5adeeae498f98d10e579d84cae441c6b75db8f98d2cea47bcc7893c6df0eb54bff074013589c547240dd8c2365724b9fe38473a825
+  metadata.gz: 21ac172a899067f8eac2eaf09268c7ff0e941da6886ab393a9f52f29860c6d03ec71cb997a6d84946410a87bcdf0bed5b2d53816e5aebd66767b0e961c465b44
+  data.tar.gz: d77abc579cd3551998c11c8c24a97053a079bcbf8cfc662e97883632da71d9e3be95ecb973dcdeb9461a41015bcac6bf4ba5b99dae4bb88a65847977c7a3aba2

data/README.md

@@ -27,6 +27,9 @@ huawei_appgallery_connect(
     
     # Optional, Parameter beyond this are optional
 
+    # 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 
+    
     submit_for_review: false,
 
     privacy_policy_url: "https://example.com",

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

@@ -15,13 +15,28 @@ module Fastlane
             Helper::HuaweiAppgalleryConnectHelper.update_appinfo(params[:client_id], token, params[:app_id], params[:privacy_policy_url])
           end
 
-          upload_app = Helper::HuaweiAppgalleryConnectHelper.upload_app(token, params[:client_id], params[:app_id], params[:apk_path])
+          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
@@ -67,6 +82,12 @@ module Fastlane
                                        optional: false,
                                        type: String),
 
+          FastlaneCore::ConfigItem.new(key: :is_aab,
+                                       env_name: "HUAWEI_APPGALLERY_CONNECT_IS_AAB",
+                                       description: "Specify this to be true if you're uploading aab instead of apk",
+                                       optional: true,
+                                       type: Boolean),
+
           FastlaneCore::ConfigItem.new(key: :changelog_path,
                                      env_name: "HUAWEI_APPGALLERY_CONNECT_CHANGELOG_PATH",
                                      description: "Path to Changelog file (Default empty)",

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

@@ -41,8 +41,8 @@ module Fastlane
           UI.success("Successfully getting app info")
           return result_json['appInfo']
         else
-          UI.user_error("Failed to get app info")
           UI.user_error!(result_json)
+          UI.user_error!("Failed to get app info")
         end
 
       end
@@ -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
 
@@ -70,35 +71,48 @@ module Fastlane
         if result_json['ret']['code'] == 0
           UI.success("Successfully updated app info")
         else
-          UI.user_error("Failed to update app info")
           UI.user_error!(result_json)
+          UI.user_error!("Failed to update app info")
         end
       end
 
 
-      def self.upload_app(token, client_id, app_id, apk_path)
+      def self.upload_app(token, client_id, app_id, apk_path, is_aab)
         UI.message("Fetching upload URL")
 
-        uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/upload-url?appId=#{app_id}&suffix=apk")
+        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"
+        else
+          uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/upload-url?appId=#{app_id}&suffix=apk")
+          upload_filename = "release.apk"
+        end
 
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         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
@@ -115,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)
 
@@ -130,10 +145,11 @@ module Fastlane
             request = Net::HTTP::Put.new(uri.request_uri)
             request["client_id"] = client_id
             request["Authorization"] = "Bearer #{token}"
+            request["Content-Type"] = "application/json"
 
             data = {fileType: 5, files: [{
 
-                fileName: "release.apk",
+                fileName: upload_filename,
                 fileDestUrl: result_json['result']['UploadFileRsp']['fileInfoList'][0]['fileDestUlr'],
                 size: result_json['result']['UploadFileRsp']['fileInfoList'][0]['size'].to_s
 
@@ -143,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("Failed to save app information")
               UI.user_error!(result_json)
-              return false
+              UI.user_error!("Failed to save app information")
+              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")
 
@@ -204,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 = {
@@ -226,9 +276,14 @@ module Fastlane
 
         if result_json['ret']['code'] == 0
             UI.success("Successfully submitted app for review")
+        elsif result_json['ret']['code'] == 204144660 && result_json['ret']['msg'].include?("It may take 2-5 minutes")
+          UI.important(result_json)
+          UI.important("Build is currently processing, waiting for 2 minutes before submitting again...")
+          sleep(120)
+          self.submit_app_for_review(token, params)
         else
-          UI.user_error("Failed to submit app for review.")
           UI.user_error!(result_json)
+          UI.user_error!("Failed to submit app for review.")
         end
 
       end

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

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