fastlane-plugin-huawei_appgallery_connect 1.0.17 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cbcf000ecf19c315a575d2c5084aae0880a68e7d86f7a2560252269fe5e1857
-  data.tar.gz: 3d30472124721a580b6ef1747437a306ae2e6b2810073caa9122f172296abd31
+  metadata.gz: 0a4f3a4eb6499091d3b7c95a832214f04be9846b9465766aa41e4f2bc405cc86
+  data.tar.gz: 41e306b534c09d085c62178aa7ba9198096ad8a582fa4a0d8ae0f0bef1cd3225
 SHA512:
-  metadata.gz: cf05150273e858905a0bad16d652d3f93a63e655e0b498cf40908569981372e7076246691ac1b4ceb798d7f44ec68a6dde4e42315586d204946af943e4b3378b
-  data.tar.gz: f11f69b3f0eed7b80e5af2def0c4e2783f13a5fedc431adc43aa1544e159bd53f0f93b71d578433630710d87fc0ffc1d1661c7f10f614dfd2878e63d0c687ca9
+  metadata.gz: e610470f62631e286658f801c9e598bd540fe3b0f4fa6168798336bf13a623931ea02b35a71221b1eb09e3de4fab0f8bc253357b62a72a450e987667c5a363a9
+  data.tar.gz: 509a8bc237fbdfa5e099e113532c3c5151bfd20083be18e79150bb447a6c6d2c357f1e661baec97987e6efdb1e58005616b9ec3051edac2a051cc2b8d786265b

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,8 +16,13 @@ module Fastlane
           end
 
           upload_app = Helper::HuaweiAppgalleryConnectHelper.upload_app(token, params[:client_id], params[:app_id], params[:apk_path], params[:is_aab])
-          UI.message("Waiting 10 seconds for upload to get processed...")
-          sleep(10)
+          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
@@ -29,7 +34,7 @@ module Fastlane
           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)
+            sleep(120)
             self.submit_for_review(token, upload_app, params)
           elsif compilationStatus == 2
             Helper::HuaweiAppgalleryConnectHelper.submit_app_for_review(token, params)
@@ -150,7 +155,19 @@ 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),
+
+           FastlaneCore::ConfigItem.new(key: :package_ids,
+                                                  env_name: "HUAWEI_APPGALLERY_PACKAGE_IDS",
+                                                  description: "App Package IDs separated by commas.",
+                                                  optional: true,
+                                                  type: String)
         ]
       end
 

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

@@ -0,0 +1,65 @@
+require 'fastlane/action'
+require_relative '../helper/huawei_appgallery_connect_helper'
+
+module Fastlane
+  module Actions
+    class HuaweiAppgalleryConnectUpdateAppLocalizationAction < Action
+      def self.run(params)
+        token = Helper::HuaweiAppgalleryConnectHelper.get_token(params[:client_id], params[:client_secret])
+
+        if token.nil?
+          UI.message('Cannot retrieve token, please check your client ID and client secret')
+        else
+          Helper::HuaweiAppgalleryConnectHelper.update_app_localization_info(token, params)
+        end
+      end
+
+      def self.description
+        'Huawei AppGallery Connect Plugin'
+      end
+
+      def self.authors
+        ['Shreejan Shrestha', 'Nikita Blizniuk']
+      end
+
+      def self.return_value; end
+
+      def self.details
+        'Fastlane plugin to upload Android app to Huawei AppGallery Connect'
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :client_id,
+                                       env_name: 'HUAWEI_APPGALLERY_CONNECT_CLIENT_ID',
+                                       description: 'Huawei AppGallery Connect Client ID',
+                                       optional: false,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :client_secret,
+                                       env_name: 'HUAWEI_APPGALLERY_CONNECT_CLIENT_SECRET',
+                                       description: 'Huawei AppGallery Connect Client Secret',
+                                       optional: false,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :app_id,
+                                       env_name: 'HUAWEI_APPGALLERY_CONNECT_APP_ID',
+                                       description: 'Huawei AppGallery Connect App ID',
+                                       optional: false,
+                                       type: String),
+
+          FastlaneCore::ConfigItem.new(key: :metadata_path,
+                                       env_name: 'HUAWEI_APPGALLERY_CONNECT_METADATA_PATH',
+                                       description: 'Huawei Appgallery Connect Metadata Path. Default is fastalane/metadata/huawei',
+                                       optional: true,
+                                       type: String)
+        ]
+      end
+
+      def self.is_supported?(platform)
+        [:android].include?(platform)
+        true
+      end
+    end
+  end
+end

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

@@ -185,7 +185,7 @@ module Fastlane
       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}")
+        uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/aab/complile/status?appId=#{params[:app_id]}&pkgIds=#{params[:package_ids]}&pkgVersion=#{pkgVersion}")
 
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
@@ -229,7 +229,7 @@ module Fastlane
         end
 
         if params[:release_time] != nil
-          params[:release_time] = URI::encode(params[:release_time], /\W/)
+          params[:release_time] = Addressable::URI.encode(params[:release_time], /\W/)
           release_time = "&releaseTime=#{params[:release_time]}"
         end
 
@@ -242,7 +242,7 @@ module Fastlane
             UI.user_error!("Failed to submit app for review. Changelog file length is invalid")
             return
           else
-            changelog = "&remark=" + URI::encode(changelog_data)
+            changelog = "&remark=" + Addressable::URI.encode(changelog_data)
           end
         end
 
@@ -286,6 +286,62 @@ module Fastlane
         end
 
       end
+
+      def self.update_app_localization_info(token, params)
+        metadata_path = if !params[:metadata_path].nil?
+                          params[:metadata_path]
+                        else
+                          'fastlane/metadata/huawei'
+                        end
+
+        UI.important("Uploading app localization information from path: #{metadata_path}")
+
+        # gather info from metadata folders
+        Dir.glob("#{metadata_path}/*") do |folder|
+          uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/app-language-info?appId=#{params[:app_id]}")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          request = Net::HTTP::Put.new(uri.request_uri)
+          request['client_id'] = params[:client_id]
+          request['Authorization'] = "Bearer #{token}"
+          request['Content-Type'] = 'application/json'
+          lang = File.basename(folder)
+          body = { "lang": lang }
+
+          Dir.glob("#{folder}/*") do |file|
+            case file
+            when /app_name/
+              body[:appName] = File.read(file)
+            when /app_description/
+              body[:appDesc] = File.read(file)
+            when /introduction/
+              body[:briefInfo] = File.read(file)
+            when /release_notes/
+              body[:newFeatures] = File.read(file)
+            end
+          end
+
+          body.length.zero? && next
+          UI.important(body.to_json)
+          request.body = body.to_json
+          response = http.request(request)
+
+          UI.important(response)
+
+          unless response.is_a? Net::HTTPSuccess
+            UI.user_error!("Cannot upload localization info (status code: #{response.code}, body: #{response.body})")
+            return false
+          end
+
+          result_json = JSON.parse(response.body)
+
+          if result_json['ret']['code'].zero?
+            UI.success("Successfully uploaded app localization info for #{File.basename(folder)}")
+          else
+            UI.user_error!(result_json)
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgalleryConnect
-    VERSION = "1.0.17"
+    VERSION = "1.0.20"
   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.17
+  version: 1.0.20
 platform: ruby
 authors:
 - Shreejan Shrestha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -148,6 +148,7 @@ files:
 - lib/fastlane/plugin/huawei_appgallery_connect/actions/huawei_appgallery_connect_action.rb
 - lib/fastlane/plugin/huawei_appgallery_connect/actions/huawei_appgallery_connect_get_app_info.rb
 - lib/fastlane/plugin/huawei_appgallery_connect/actions/huawei_appgallery_connect_submit_for_review.rb
+- lib/fastlane/plugin/huawei_appgallery_connect/actions/huawei_appgallery_connect_update_app_localization.rb
 - lib/fastlane/plugin/huawei_appgallery_connect/helper/huawei_appgallery_connect_helper.rb
 - lib/fastlane/plugin/huawei_appgallery_connect/version.rb
 homepage: https://github.com/shr3jn/fastlane-plugin-huawei_appgallery_connect
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Huawei AppGallery Connect Plugin