fastlane-plugin-huawei_appgallery_connect 1.0.10 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4730eea2fe43d0c50a03cab93d475c48d373685456f0735de5d40bfef322944e
-  data.tar.gz: 49acfbc7cd1932ef5b02fa8412a0abf37caf0e7a50ca83bbc456e1a858bc005e
+  metadata.gz: e8ad1b77f355b7d2284ad5e1cd0f161b2c643209cafbe79c3bd11c5de23405f2
+  data.tar.gz: f6dd1a859de8909d8e25b1485a5dd98130da965814e6246beadaf4c291f3f41d
 SHA512:
-  metadata.gz: ef179ee73d6b189ecd473f9284d7e69e9ba0c83be8c7ec85ce6fa4ccd46bafb18d092460cc6b384a88ae55d739589d6ea05aa1306a3752b2bdc3c57dd3f49881
-  data.tar.gz: 6d05974036fa6b42ad6a5270d4ce8c5ce395e2450209de88103c7debc65f8e024faadc4fda740f880cb22c3af52596d405d990805cc10b649d46ff6d1ac373a8
+  metadata.gz: 1cef05bbe6d2a076cca0e48d42e956717e792ebae5420c00e6c2c0b0ba805a186aa563c70f11268fc0d1b220b1ada355759f555c0f13fa37ad9bf0975b3409bc
+  data.tar.gz: 15771fc11e6da6d2deb8eb442c2b05e82c9d2f379bf64658617aa041bcf5f7c9507d926cf27d343bdc189f11c111f0ff91a449360a309801cedbf64ba76e9348

data/README.md

@@ -12,41 +12,70 @@ fastlane add_plugin huawei_appgallery_connect
 
 ## About huawei_appgallery_connect
 
-Huawei AppGallery Connect Plugin
+Huawei AppGallery Connect Plugin can be used to upload Android application on the Huawei App Gallery using fastlane.
 
-**Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
+## Usage
 
-## Example
-
-Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.
-
-**Note to author:** Please set up a sample project to make it easy for users to explore what your plugin does. Provide everything that is necessary to try out the plugin in this project (including a sample Xcode/Android project if necessary)
-
-## Run tests for this plugin
-
-To run both the tests, and code style validation, run
+To get started you will need the client id, client Secret & app ID which can be obtained from your Huawei AppGallery Connect account.
 
 ```
-rake
+huawei_appgallery_connect(
+    client_id: "<CLIENT_ID>",
+    client_secret: "<CLIENT_SECRET>",
+    app_id: "<APP_ID>",
+    apk_path: "<APK_PATH>"
+    
+    # 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",
+    changelog_path: "<PATH_TO_CHANGELOG_FILE>",
+
+    # release time to release app on specific date
+    release_time: "2019-12-25T07:05:15+0000",
+
+    # For phase wise release: set these parameters
+    phase_wise_release: true,
+    phase_release_start_time: "2019-12-25T07:05:15+0000",
+    phase_release_end_time: "2019-12-28T07:05:15+0000",
+    phase_release_percent: "10.00",
+    phase_release_description: "<DESCRIPTION>"
+)
 ```
 
-To automatically fix many of the styling issues, use
-```
-rubocop -a
-```
+The following action can be used to submit the app for review if submit_for_review was set to false during the upload of apk
 
-## Issues and Feedback
-
-For any other issues and feedback about this plugin, please submit it to this repository.
+```
+huawei_appgallery_connect_submit_for_review(
+    client_id: "<CLIENT_ID>",
+    client_secret: "<CLIENT_SECRET>",
+    app_id: "<APP_ID>",
 
-## Troubleshooting
 
-If you have trouble using plugins, check out the [Plugins Troubleshooting](https://docs.fastlane.tools/plugins/plugins-troubleshooting/) guide.
+    # Optional, Parameter beyond this are optional
 
-## Using _fastlane_ Plugins
+    # release time to release app on specific date
+    release_time: "2019-12-25T07:05:15+0000",
 
-For more information about how the `fastlane` plugin system works, check out the [Plugins documentation](https://docs.fastlane.tools/plugins/create-plugin/).
+    # For phase wise release: set these parameters
+    phase_wise_release: true,
+    phase_release_start_time: "2019-12-25T07:05:15+0000",
+    phase_release_end_time: "2019-12-28T07:05:15+0000",
+    phase_release_percent: "10.00",
+    phase_release_description: "<DESCRIPTION>"
+)
+```
+You can also retreive app info by making use of the following action
 
-## About _fastlane_
+```
+huawei_appgallery_connect_get_app_info(
+    client_id: "<CLIENT_ID>",
+    client_secret: "<CLIENT_SECRET>",
+    app_id: "<APP_ID>"
+)
 
-_fastlane_ is the easiest way to automate beta deployments and releases for your iOS and Android apps. To learn more, check out [fastlane.tools](https://fastlane.tools).
+```

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/actions/huawei_appgallery_connect_submit_for_review.rb

@@ -88,6 +88,12 @@ module Fastlane
                                          description: "Release time in UTC format for app release on a specific date. The format is yyyy-MM-dd'T'HH:mm:ssZZ)",
                                          optional: true,
                                          conflicting_options: [:phase_wise_release],
+                                         type: String),
+          
+            FastlaneCore::ConfigItem.new(key: :changelog_path,
+                                         env_name: "HUAWEI_APPGALLERY_CONNECT_CHANGELOG_PATH",
+                                         description: "Path to Changelog file (Default empty)",
+                                         optional: true,
                                          type: String)
         ]
       end

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

@@ -76,10 +76,20 @@ module Fastlane
       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
@@ -91,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
@@ -115,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)
 
@@ -130,10 +143,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 +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")
 
@@ -226,6 +273,11 @@ 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!(result_json)
           UI.user_error!("Failed to submit app for review.")
@@ -235,3 +287,4 @@ 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.10"
+    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.10
+  version: 1.0.15
 platform: ruby
 authors:
 - Shreejan Shrestha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry