fastlane-plugin-huawei_appgallery_connect 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9118e279be8f6da3dc4c514a77a18852ff339d76ccdb20b6e4b88deaadf8dbf
-  data.tar.gz: 5ab9d86baeeb3c0ee259a27a5006a5c362ae62783950a2e048689b7774d0273c
+  metadata.gz: 58302bbcf0fb6a8711345cf3a1498335a6c0a8a18dea0e4e34b9d0ae74383e5e
+  data.tar.gz: 1e60d771e423f877d9015275bcd4d4fdfe54f32bb80c5b116ccbe29cd1e8361a
 SHA512:
-  metadata.gz: fca220c998a61ef5472a92c53fa97f5cb1a6fae3e1a2f6ddd6f2c420eb75d8864dc362534aed49a7173f34ded2659db137d7dd74739d2721ba66ed1f2e01277a
-  data.tar.gz: cbcd11aff1b161a8d80e8ae83983e1e39d7d256f9beb33c471f1511cca26387905bc5b9a8aa85c0bcf63f6eb830394666ccd747699a4dc69e41666316768b452
+  metadata.gz: a66c42655b6fd63deadb0cc51645a7fdd76d366fcea290b3113fc8025160b045bb943df30c2aa91c43afc902b884e1b9d9603676693fcbfc51bb4e1e04884b59
+  data.tar.gz: 27f55e5c0c33a0c8ccc3064c0e0e78c3b61b07e79f415989b04c1357143892c382c7c140af6f80ba89cfb67012e1ec974d006d741823f3c76e935d2146b51a89

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

@@ -15,11 +15,9 @@ module Fastlane
             Helper::HuaweiAppgalleryConnectHelper.update_appinfo(params[:client_id], token, params[:app_id], params[:privacy_policy_url])
           end
 
-          apk_lang = params[:apk_lang] == nil ? 'en-GB' : params[:apk_lang]
+          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], apk_lang)
-
-          if upload_app
+          if upload_app && params[:submit_for_review] != false
             Helper::HuaweiAppgalleryConnectHelper.submit_app_for_review(token, params)
           end
         end
@@ -123,7 +121,13 @@ module Fastlane
                                      env_name: "HUAWEI_APPGALLERY_CONNECT_APK_LANGUAGE",
                                      description: "Language type. For details, please refer to https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agcapi-reference-langtype",
                                      optional: true,
-                                     type: String)
+                                     type: String),
+
+          FastlaneCore::ConfigItem.new(key: :submit_for_review,
+                                     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)
         ]
       end
 

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

@@ -0,0 +1,76 @@
+require 'fastlane/action'
+require_relative '../helper/huawei_appgallery_connect_helper'
+
+module Fastlane
+  module Actions
+    module SharedValues
+      ANDROID_APPGALLERY_APP_INFO = :ANDROID_APPGALLERY_APP_INFO
+    end
+    class HuaweiAppgalleryConnectGetAppInfoAction < 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 
+          appInfo = Helper::HuaweiAppgalleryConnectHelper.get_app_info(token, params[:client_id],params[:app_id])
+          Actions.lane_context[SharedValues::ANDROID_APPGALLERY_APP_INFO] = appInfo
+          return appInfo
+        end
+      end
+
+      def self.description
+        "Huawei AppGallery Connect Plugin"
+      end
+
+      def self.authors
+        ["Shreejan Shrestha"]
+      end
+
+      def self.return_value
+        # If your method provides a return value, you can describe here what it does
+      end
+
+      def self.details
+        # Optional:
+        "Fastlane plugin to get Android app to Huawei AppGallery Connect information"
+      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),
+
+        ]
+      end
+
+      def self.is_supported?(platform)
+        [:android].include?(platform)
+        true
+      end
+
+      def self.example_code
+        [
+          'app_info = huawei_appgallery_connect_get_app_info'
+        ]
+      end
+
+    end
+  end
+end

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

@@ -31,8 +31,19 @@ module Fastlane
         request["client_id"] = client_id
         request["Authorization"] = "Bearer #{token}"
         response = http.request(request)
+        if !response.kind_of? Net::HTTPSuccess
+          UI.user_error!("Cannot obtain app info, please check API Token / Permissions (status code: #{response.code})")
+          return false
+        end
+        result_json = JSON.parse(response.body)
+
+        if result_json['ret']['code'] == 0
+          UI.success("Successfully getting app info")
+          return result_json['appInfo']
+        else
+          UI.user_error!("Failed to get app info")
+        end
 
-        result_json = JSON.parse(res.body)
       end
 
       def self.update_appinfo(client_id, token, app_id, privacy_policy_url)
@@ -49,7 +60,10 @@ module Fastlane
         request.body = {privacyPolicy: privacy_policy_url}.to_json
 
         response = http.request(request)
-
+        if !response.kind_of? Net::HTTPSuccess
+          UI.user_error!("Cannot update app info, please check API Token / Permissions (status code: #{response.code})")
+          return false
+        end
         result_json = JSON.parse(response.body)
 
         if result_json['ret']['code'] == 0
@@ -60,7 +74,7 @@ module Fastlane
       end
 
 
-      def self.upload_app(token, client_id, app_id, apk_path, apk_lang)
+      def self.upload_app(token, client_id, app_id, apk_path)
         UI.message("Fetching upload URL")
 
         uri = URI.parse("https://connect-api.cloud.huawei.com/api/publish/v2/upload-url?appId=#{app_id}&suffix=apk")
@@ -73,6 +87,11 @@ module Fastlane
 
         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
+        end
+
         result_json = JSON.parse(response.body)
 
         if result_json['uploadUrl'].nil?
@@ -87,26 +106,15 @@ module Fastlane
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true
           request = Net::HTTP::Post.new(uri)
-          request['Content-Type'] = "multipart/form-data, boundary=#{boundary}"
-
-          post_body = []
-          # add the auth code
-          post_body << "--#{boundary}\r\n"
-          post_body << "Content-Disposition: form-data; name=\"authCode\"\r\n\r\n"
-          post_body << result_json['authCode']
-          # add the file count
-          post_body << "\r\n--#{boundary}\r\n"
-          post_body << "Content-Disposition: form-data; name=\"fileCount\"\r\n\r\n"
-          post_body << "1"
-          # add the apk
-          post_body << "\r\n--#{boundary}\r\n"
-          post_body << "Content-Disposition: form-data; name=\"file\"; filename=\"release.apk\"\r\n"
-          post_body << "Content-Type: multipart/form-data\r\n\r\n"
-          post_body << File.read(apk_path).encode('utf-8')
-          post_body << "\r\n--#{boundary}--\r\n"
-          request.body = post_body.join
+
+          form_data = [['file', File.open(apk_path.to_s)],['authCode', result_json['authCode']],['fileCount', '1']]
+          request.set_form form_data, 'multipart/form-data'
 
           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
+          end
           result_json = JSON.parse(result.body)
 
           if result_json['result']['result_code'].to_i == 0
@@ -121,7 +129,7 @@ module Fastlane
             request["client_id"] = client_id
             request["Authorization"] = "Bearer #{token}"
 
-            data = {fileType: 5, lang: apk_lang, files: [{
+            data = {fileType: 5, files: [{
 
                 fileName: "release.apk",
                 fileDestUrl: result_json['result']['UploadFileRsp']['fileInfoList'][0]['fileDestUlr'],
@@ -131,13 +139,17 @@ module Fastlane
 
             request.body = data
             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
+            end
             result_json = JSON.parse(response.body)
 
             if result_json['ret']['code'] == 0
               UI.success("App information saved.")
               return true
             else
+              UI.user_error!(result_json)
               UI.user_error!("Failed to save app information")
               return false
             end
@@ -203,6 +215,11 @@ module Fastlane
 
         response = http.request(request)
 
+        if !response.kind_of? Net::HTTPSuccess
+          UI.user_error!("Cannot submit app for review (status code: #{response.code}, body: #{response.body})")
+          return false
+        end
+
         result_json = JSON.parse(response.body)
 
         if result_json['ret']['code'] == 0

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgalleryConnect
-    VERSION = "1.0.2"
+    VERSION = "1.0.7"
   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.2
+  version: 1.0.7
 platform: ruby
 authors:
 - Shreejan Shrestha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -146,6 +146,7 @@ files:
 - README.md
 - lib/fastlane/plugin/huawei_appgallery_connect.rb
 - 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/helper/huawei_appgallery_connect_helper.rb
 - lib/fastlane/plugin/huawei_appgallery_connect/version.rb
 homepage: https://github.com/shr3jn/fastlane-plugin-huawei_appgallery_connect