fastlane-plugin-huawei_appgallery_connect 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84afdec450a7cf11208dcad9dae2fa62ad089a3a0907c3df4c81f3dd4488814d
-  data.tar.gz: de7053fd3678df52953178b2d2f0bac8994e0ad6a3f4176cb473cbee4781766b
+  metadata.gz: db6448df1270081dea454256e3901e7cfccd87f05b9e567f60ac087a22503712
+  data.tar.gz: 6f45cf3e942fd190878b9bcccc4f517e418e8dde45ee9095e4a46191f4704bff
 SHA512:
-  metadata.gz: 439ba5077088030af209b3e875afa3ecca3fe871b2a15c60501570a29b89469eef609cda6c504c8ea8d460a2a5d2f3d86d7c2d759c1b585e29e76bb8bcc4ee11
-  data.tar.gz: 994abf9690ff654d51023ab4da43ef3459197a015246d3b9310962037cc29172a2e2f651e935b6a2f5a12d3342b417db14284af4dabd31c063044c989da796be
+  metadata.gz: 17c3845380567b942d70b03de4d957397078847c870d4c08b3a925981e2ee1d1a310e26d85d80e514022d6616812481c754521a433f6018db18e88d76f24c7ad
+  data.tar.gz: c10c3d520b9dcf5e9fb632a763e4dac72d00603d52439afbc2b2ddf28d560c15db36dfd859e2b1340b5e97893a276708857d4afa5caeb05b0b12c95cc7c7ffc6

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

@@ -17,7 +17,7 @@ module Fastlane
 
           upload_app = Helper::HuaweiAppgalleryConnectHelper.upload_app(token, params[:client_id], params[:app_id], params[:apk_path])
 
-          if upload_app
+          if upload_app && params[:submit_for_review] != false
             Helper::HuaweiAppgalleryConnectHelper.submit_app_for_review(token, params)
           end
         end
@@ -121,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

@@ -32,7 +32,15 @@ module Fastlane
         request["Authorization"] = "Bearer #{token}"
         response = http.request(request)
 
-        result_json = JSON.parse(res.body)
+        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
+
       end
 
       def self.update_appinfo(client_id, token, app_id, privacy_policy_url)
@@ -73,6 +81,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,24 +100,9 @@ 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)
           result_json = JSON.parse(result.body)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgalleryConnect
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   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.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Shreejan Shrestha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-04-16 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