fastlane-plugin-huawei_appgallery 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9bf208e5687db71d1a23e0685fd487121118d9abcece8c5c52eb2fc17d18c3a
-  data.tar.gz: 021d724d17b3f8ddcc11e44179851aa695ce8926ab6d045ad4a174b7491f3868
+  metadata.gz: e4411d2594ecd5bb0bf0f2b47de08df6d4476d7ed5d39e30551df2fcbfc1c18e
+  data.tar.gz: 17fd0a9bce8eb88ab33d4a4fea16c367786c0e793ded01a0628185a4ff651bea
 SHA512:
-  metadata.gz: cbcd2452e9d6f98d021771cc9ebc4f4b2dcd15f4519f002f0c8f15bea2f5bc34970900396c6b68bd7537049366dde9aecdacb647f2d73ae90af17392069e9895
-  data.tar.gz: 5962ed3c37e237da78ea18f1f05bbcf383235e42446fc09a0e26a93754edfe810a4522a95bffeae2e14052230befed50a3b43c735e57afc5f890f82efa5f5488
+  metadata.gz: 369701889c06b57182b8f76b2a1f09146b6d8a24de1e7afde7b426709fc445313fdd3c37a5f2adeb1a535f153a0d0425bcfb254ff286a45c2a501aa44a5a60b1
+  data.tar.gz: 4c546b7b87021b427e7e42d4d49112d559d11cdab7c2a72eddf2c1a7dba7dfe441aa7ed390bd86da3af43d864b71ffca175d633765798bb11dd8ad34a40e9770

data/README.md

@@ -19,6 +19,10 @@ Example code: https://developer.huawei.com/consumer/en/service/hms/catalog/publi
 
 Pull requests are welcome. ;)
 
+## AppGallery Connect API (= API v2)
+To create client id and access token, go to [AppGalleryConnect](https://developer.huawei.com/consumer/en/service/josp/agc/index.html).
+Navigate to "Users and permissions", than click on the left on "Connect API" (in section "Api Key"). Now you create and manage your client ids and secrets.
+
 ## Example
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin.

data/lib/fastlane/plugin/huawei_appgallery/actions/huawei_appgallery_action.rb

@@ -1,14 +1,13 @@
 require 'fastlane/action'
-require_relative '../helper/huawei_appgallery_helper'
 
 module Fastlane
   module Actions
     class HuaweiAppgalleryAction < Action
       def self.run(params)
-        cookie = Helper::HuaweiAppgalleryHelper.request_cookie(params[:client_id], params[:time], params[:signature])
-        Helper::HuaweiAppgalleryHelper.update_release_notes(cookie, params[:app_id], params[:release_notes])
-        Helper::HuaweiAppgalleryHelper.upload_apk(cookie, params[:app_id], params[:apk_path])
-        Helper::HuaweiAppgalleryHelper.submit_app(cookie, params[:app_id])
+        access_token = Helper::HuaweiAppgalleryHelperV2.request_access_token(params[:client_id], params[:client_secret])
+        Helper::HuaweiAppgalleryHelperV2.update_release_notes(params[:client_id], access_token, params[:app_id], params[:release_notes])
+        Helper::HuaweiAppgalleryHelperV2.upload_apk(params[:client_id], access_token, params[:app_id], params[:apk_path])
+        Helper::HuaweiAppgalleryHelperV2.submit_app(params[:client_id], access_token, params[:app_id])
         UI.message('Finished!')
       end
 
@@ -35,14 +34,9 @@ module Fastlane
                                description: "Client ID of an AppGallery Connect API client",
                                   optional: false,
                                       type: String),
-          FastlaneCore::ConfigItem.new(key: :time,
-                                  env_name: "HUAWEI_APPGALLERY_TIME",
-                               description: "Time in milliseconds since 1970, which was used to create the signature",
-                                  optional: false,
-                                      type: String),
-          FastlaneCore::ConfigItem.new(key: :signature,
-                                  env_name: "HUAWEI_APPGALLERY_SIGNATURE",
-                               description: "Signature which needs to be created by your own. Example code: https://developer.huawei.com/consumer/en/service/hms/catalog/publishingAPI.html?page=hmssdk_appGalleryConnect_devguide",
+          FastlaneCore::ConfigItem.new(key: :client_secret,
+                                  env_name: "HUAWEI_APPGALLERY_CLIENT_SECRET",
+                               description: "Client Secret of an AppGallery Connect API client",
                                   optional: false,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :app_id,

data/lib/fastlane/plugin/huawei_appgallery/helper/huawei_appgallery_helper_v2.rb

@@ -0,0 +1,205 @@
+require 'fastlane_core/ui/ui'
+
+module Fastlane
+  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
+
+  module Helper
+    class HuaweiAppgalleryHelperV2
+
+
+      def self.request_access_token(client_id, client_secret)
+        UI.message("Requesting access token from Huawei AppGallery ...")
+
+        content = {'grant_type' => 'client_credentials', 'client_id' => client_id, 'client_secret' => client_secret}
+
+        result = Net::HTTP.post(
+          URI("https://connect-api.cloud.huawei.com/api/oauth2/v1/token"),
+          content.to_json.encode('utf-8'),
+          "Content-Type" => "application/json"
+        )
+
+        if result.code.to_i != 200
+          UI.user_error!("Could not get access token from app gallery api. (HTTP #{result.code} - #{result.message})")
+        end
+
+        result_json = JSON.parse(result.body)
+        access_token = result_json['access_token']
+        access_token
+      end
+
+
+      def self.update_release_notes(client_id, access_token, app_id, release_notes)
+        release_notes.each do |lang, notes|
+          UI.message("Updating release notes for language #{lang} ...")
+
+          content = {'lang' => lang, 'newFeatures' => notes}
+
+          uri = URI("https://connect-api.cloud.huawei.com/api/publish/v2/app-language-info?appId=#{app_id}")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true
+          request = Net::HTTP::Put.new(uri)
+          request.body = content.to_json.encode('utf-8')
+          request['Content-Type'] = "application/json"
+          request['Authorization'] = "Bearer #{access_token}"
+          request['client_id'] = client_id
+          result = http.request(request)
+
+          if result.code.to_i != 200
+            UI.user_error!("Could not update release notes for #{lang}. (HTTP #{result.code} - #{result.message})")
+          end
+        end
+      end
+
+
+      def self.upload_apk(client_id, access_token, app_id, apk_path)
+        # get upload url and auth code
+        upload_url_result = self.get_upload_url(client_id, access_token, app_id)
+        auth_code = upload_url_result['authCode']
+        upload_url = upload_url_result['uploadUrl']
+
+        # upload apk
+        server_apk_url = self.upload_apk_to_api(auth_code, upload_url, apk_path)
+
+        # update app file information
+        self.update_app_file_information(client_id, access_token, app_id, server_apk_url)
+      end
+
+
+      def self.get_upload_url(client_id, access_token, app_id)
+        UI.message("Obtaining upload url ...")
+
+        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v2/upload-url?appId=#{app_id}&suffix=apk")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = Net::HTTP::Get.new(uri)
+        request['Authorization'] = "Bearer #{access_token}"
+        request['client_id'] = client_id
+        result = http.request(request)
+
+        if result.code.to_i != 200
+          UI.user_error!("Could not apk upload url from app gallery api. (HTTP #{result.code} - #{result.message})")
+        end
+
+        # result json containing "authCode", "uploadUrl"
+        result_json = JSON.parse(result.body)
+        result_json
+      end
+
+
+      def self.upload_apk_to_api(auth_code, upload_url, apk_path)
+        UI.message("Uploading apk to #{upload_url} ...")
+
+        boundary = "-----------------755754302457647"
+
+        uri = URI(upload_url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = Net::HTTP::Post.new(uri)
+        request['Accept'] = 'application/json'
+        request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
+
+        post_body = []
+        # add auth code
+        post_body << "--#{boundary}\r\n"
+        post_body << "Content-Disposition: form-data; name=\"authCode\"\r\n\r\n"
+        post_body << auth_code
+        post_body << "\r\n"
+        # add file count
+        post_body << "--#{boundary}\r\n"
+        post_body << "Content-Disposition: form-data; name=\"fileCount\"\r\n\r\n"
+        post_body << "1"
+        post_body << "\r\n"
+        # add parse type
+        post_body << "--#{boundary}\r\n"
+        post_body << "Content-Disposition: form-data; name=\"parseType\"\r\n\r\n"
+        post_body << "0"
+        post_body << "\r\n"
+        # add apk
+        post_body << "--#{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"
+
+        post_body << "--#{boundary}--\r\n"
+        request.body = post_body.join
+        result = http.request(request)
+
+        if result.code.to_i != 200
+          UI.user_error!("Could not upload apk to gallery api. (HTTP #{result.code} - #{result.message})")
+        end
+
+        # example response
+        # {"result":{"UploadFileRsp":{"fileInfoList":[{"fileDestUlr":"https://developerfile7.hicloud.com/FileServer/getFile/7/appapktemp/20200727/appapk/000/000/410/0890049000000000410.20200727174607.32489040188051103716016542322538:20200727174634:2500:AD10C3C4138E988C7A1C3680440C84559E2DD6184DF5A2E1C457C23868E5F277.apk","size":86803266}],"ifSuccess":1},"resultCode":"0"}}
+        result_json = JSON.parse(result.body)
+        json_result_obj = result_json['result']
+        json_upload_file_rsp = json_result_obj['UploadFileRsp']
+        json_file_info_list = json_upload_file_rsp['fileInfoList']
+        json_file_info = json_file_info_list.first()
+        file_dest_url = json_file_info['fileDestUlr'] # ulr is correct
+
+        file_dest_url
+      end
+
+
+      def self.update_app_file_information(client_id, access_token, app_id, apk_server_path)
+        UI.message("Updating app file information ...")
+
+        content = {
+          'fileType' => 5, # type 5 = RPK or APK
+          'files' => [{
+            'fileName' => 'naviki-release.apk', 
+            'fileDestUrl' => apk_server_path
+          }]
+        }
+
+        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v2/app-file-info?appId=#{app_id}")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = Net::HTTP::Put.new(uri)
+        request.body = content.to_json.encode('utf-8')
+        request['Content-Type'] = "application/json"
+        request['Authorization'] = "Bearer #{access_token}"
+        request['client_id'] = client_id
+        result = http.request(request)
+
+        if result.code.to_i != 200
+          UI.user_error!("Could not update app file information. (HTTP #{result.code} - #{result.message})")
+        end
+
+        result_json = JSON.parse(result.body)
+        json_ret = result_json['ret']
+        UI.message("app-file-info ret: #{json_ret}")
+      end
+
+
+      def self.submit_app(client_id, access_token, app_id)
+        UI.message('Submitting app for review ...')
+
+        # should be in format yyyy-MM-dd'T'HH:mm:ssZZ, must be escaped to be GET param
+        # https://apidock.com/ruby/DateTime/strftime
+        # https://www.shortcutfoo.com/app/dojos/ruby-date-format-strftime/cheatsheet
+        release_time = CGI::escape(Time.now.utc.strftime("%FT%T%z")) # as soon as possible
+        UI.message("Use release time #{release_time}")
+
+        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v2/app-submit?appId=#{app_id}&releaseTime=#{release_time}")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = "application/json"
+        request['Accept'] = 'application/json'
+        request['Authorization'] = "Bearer #{access_token}"
+        request['client_id'] = client_id
+        result = http.request(request)
+
+        if result.code.to_i != 200
+          UI.user_error!("Could not submit app for review. (HTTP #{result.code} - #{result.message})")
+        end
+
+        result_json = JSON.parse(result.body)
+        json_ret = result_json['ret']
+        UI.message("app-submit ret: #{json_ret}")
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module HuaweiAppgallery
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-huawei_appgallery
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Arne Kaiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -146,7 +146,7 @@ files:
 - README.md
 - lib/fastlane/plugin/huawei_appgallery.rb
 - lib/fastlane/plugin/huawei_appgallery/actions/huawei_appgallery_action.rb
-- lib/fastlane/plugin/huawei_appgallery/helper/huawei_appgallery_helper.rb
+- lib/fastlane/plugin/huawei_appgallery/helper/huawei_appgallery_helper_v2.rb
 - lib/fastlane/plugin/huawei_appgallery/version.rb
 homepage: https://github.com/arnekaiser/fastlane-plugin-huawei_appgallery
 licenses:
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Plugin to deploy an app to the Huawei AppGallery

data/lib/fastlane/plugin/huawei_appgallery/helper/huawei_appgallery_helper.rb

@@ -1,158 +0,0 @@
-require 'fastlane_core/ui/ui'
-
-module Fastlane
-  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
-
-  module Helper
-    class HuaweiAppgalleryHelper
-      def self.request_cookie(client_id, time, signature)
-        UI.message("Requesting cookie from Huawei AppGallery ...")
-        content = { 'key_string' => { 'clientId' => client_id, 'time' => time, 'sign' => signature } }
-        result = Net::HTTP.post(
-          URI('https://connect-api.cloud.huawei.com/api/common/v1/connect'),
-          content.to_json.encode('utf-8'),
-          "Accept" => "application/json"
-        )
-        cookie = result['set-cookie']
-        if cookie.nil?
-          UI.user_error!("Authentication failed: #{result.body}")
-        end
-        cookie.split('; ')[0]
-      end
-
-      def self.update_release_notes(cookie, app_id, release_notes)
-        release_notes.each do |lang, notes|
-          UI.message("Updating release notes for language #{lang} ...")
-
-          uri = URI("https://connect-api.cloud.huawei.com/api/publish/v1/appInfo/#{app_id}?lang=#{lang}")
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          request = Net::HTTP::Get.new(uri)
-          request['Cookie'] = cookie
-          request['Accept'] = 'application/json'
-
-          result = http.request(request)
-
-          if result.code.to_i != 200
-            UI.user_error!("Cannot retrieve language information for language #{lang}!")
-          end
-
-          # get values for mandatory parameters
-          result_json = JSON.parse(result.body)
-          app_name = result_json['languages'][0]['appName']
-          app_desc = result_json['languages'][0]['appDesc']
-          brief_info = result_json['languages'][0]['briefInfo']
-
-          if app_name.nil? || app_desc.nil? || brief_info.nil?
-            UI.user_error!("Cannot retrieve language information for language #{lang}!")
-          end
-
-          # set new release notes
-          content = {
-            'appName' => app_name,
-            'appDesc' => app_desc,
-            'briefInfo' => brief_info,
-            'newFeatures' => notes
-          }
-
-          uri = URI("https://connect-api.cloud.huawei.com/api/publish/v1/languageInfo/#{app_id}/#{lang}")
-          http = Net::HTTP.new(uri.host, uri.port)
-          http.use_ssl = true
-          request = Net::HTTP::Put.new(uri)
-          request.body = content.to_json.encode('utf-8')
-          request['Cookie'] = cookie
-          request['Content-Type'] = 'application/json'
-          result = http.request(request)
-          if result.code.to_i != 200
-            UI.user_error!("Cannot update language information for language #{lang}!")
-          end
-        end
-      end
-
-      def self.upload_apk(cookie, app_id, apk_path)
-        unless File.file?(apk_path)
-          UI.user_error!("Cannot read apk at: #{apk_path}")
-        end
-
-        # obtain upload url
-        UI.message("Obtaining upload url ...")
-        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v1/uploadUrl?suffix=apk&appId=#{app_id}")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        request = Net::HTTP::Get.new(uri)
-        request['Cookie'] = cookie
-        request['Accept'] = 'application/json'
-        result = http.request(request)
-        result_json = JSON.parse(result.body)
-        upload_url = result_json['uploadUrl'] # this is the upload server
-        auth_code = result_json['authCode']
-        if result.code.to_i != 200 || upload_url.nil? || auth_code.nil?
-          UI.user_error!("Cannot obtain upload url! Result: #{result_json}")
-        end
-
-        # upload apk
-        UI.message("Uploading apk to #{upload_url} ...")
-        boundary = "755754302457647"
-        uri = URI("https://#{upload_url}/api/publish/v1/uploadFile")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        request = Net::HTTP::Post.new(uri)
-        request['Cookie'] = cookie
-        request['Accept'] = 'application/json'
-        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 << auth_code
-        # 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
-
-        result = http.request(request)
-        result_json = JSON.parse(result.body)
-        upload_url = result_json['uploadUrl']
-
-        # update app file informnation
-        UI.message("Updating app file information ...")
-        content = {
-          'type' => 5, # type 5 = RPK or APK
-          'data' => upload_url
-        }
-        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v1/mediaInfo/#{app_id}/en-US") # assumes that en-US is the default language
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        request = Net::HTTP::Put.new(uri)
-        request.body = content.to_json.encode('utf-8')
-        request['Cookie'] = cookie
-        request['Content-Type'] = 'application/json'
-        result = http.request(request)
-        if result.code.to_i != 200
-          UI.user_error!("Cannot upload apk!")
-        end
-      end
-
-      def self.submit_app(cookie, app_id)
-        UI.message('Submitting app for review ...')
-        uri = URI("https://connect-api.cloud.huawei.com/api/publish/v1/submit/#{app_id}")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        request = Net::HTTP::Post.new(uri)
-        request['Cookie'] = cookie
-        request['Accept'] = 'application/json'
-        request['Content-Type'] = "application/json"
-        content = { 'releaseTime' => (Time.now.to_f * 1000).to_i.to_s } # as soon as possible
-        request.body = content.to_json.encode('utf-8')
-        result = http.request(request)
-        if result.code.to_i != 200
-          UI.user_error!("Cannot submit app!")
-        end
-      end
-    end
-  end
-end