fastlane-plugin-rustored 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c803f43cb99f9a9b6a73af925c53e4e66aaa9b4609856873d11c0c187384f7
-  data.tar.gz: df043511b75ec03a565cd2b1cef586019c42a44c57036aea56e4c00572ef8f18
+  metadata.gz: c1147f69aca62793f1507a37818bf8dab5568b33e37df2a8ddfc74cefa73dcc8
+  data.tar.gz: 2689e265f60f6147cdf3c5daa87f61bcc226d3360c67a85103a01f7bd3545e55
 SHA512:
-  metadata.gz: 2e797187bd06c5b623026943c0599677f4a282307e97f65ffd055c37985ee279ef1faddf47a105bd6cbc2830c9de3470546d4d7c34849da6e5f17ce9540acdc8
-  data.tar.gz: e9df9811c147d34f58313f4ae9e2000dedc5d3f815c5be4111d1c8d0bbee76ad548929103f6332920fe6397f6cbace3a0d53cecac4ae907d964d2f5c98f2919f
+  metadata.gz: fe622044ff5b889921a385f1fecee80816d5290b3e420edc60e941a324a0dd9dbb96051b0d777c67e696dee88f64af593f4178b69d1d8986c1d931372abfa843
+  data.tar.gz: a56d20e1fa4728b51e878b1e423965f8640ca5389b765becb017fa29ea742ee538ecdb1542753860323c57cb0c152cabd2dd53b5b81f9009bd88f817a53436cc

data/README.md

@@ -1,8 +1,18 @@
 # rustored
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-rustored)
+![Made with Love](https://img.shields.io/badge/Made%20with-❤️-ff69b4)
 
-Fastlane plugin for publishing Android builds to RuStore.
+Fastlane plugin for uploading APK and AAB files to an existing RuStore draft version through the public API.
+
+The plugin does not create a draft, send it to moderation, or publish it. Pass the `version_id` of a draft created in the RuStore Console or through the [RuStore API](https://www.rustore.ru/help/work-with-rustore-api/api-upload-publication-app/create-draft-version).
+
+## Prerequisites
+
+- The application must have at least one active version in RuStore.
+- The API key must have access to the application and the required APK/AAB upload method.
+- A draft version and its `version_id` must already exist.
+- Before uploading an AAB, configure its publication signature in the RuStore Console.
 
 ## Install
 
@@ -14,11 +24,12 @@ fastlane add_plugin rustored
 
 ### `rustored_publish_aab`
 
-Publishes an AAB file.
+Uploads an AAB file to the draft.
 
 ```ruby
 rustored_publish_aab(
-  token: ENV["RUSTORE_TOKEN"],
+  key_id: ENV["RUSTORE_KEY_ID"],
+  private_key: ENV["RUSTORE_PRIVATE_KEY"],
   package_name: "com.example.app",
   version_id: 123456,
   aab_path: "app/build/outputs/bundle/release/app-release.aab"
@@ -27,11 +38,12 @@ rustored_publish_aab(
 
 ### `rustored_publish_apk`
 
-Publishes an APK file.
+Uploads an APK file to the draft.
 
 ```ruby
 rustored_publish_apk(
-  token: ENV["RUSTORE_TOKEN"],
+  key_id: ENV["RUSTORE_KEY_ID"],
+  private_key: ENV["RUSTORE_PRIVATE_KEY"],
   package_name: "com.example.app",
   version_id: 123456,
   apk_path: "app/build/outputs/apk/release/app-release.apk",
@@ -40,13 +52,20 @@ rustored_publish_apk(
 )
 ```
 
+The plugin signs the auth request and receives the RuStore public token automatically. Pass `private_key` exactly as copied from the RuStore Console: it is already Base64-encoded and must not be encoded again.
+
+`services_type` accepts `Unknown` (the default) or `HMS`. `is_main_apk` is required by the RuStore API.
+
+RuStore does not show an API-uploaded artifact in the Console until the draft is sent to moderation. Builds containing new sensitive permissions must be uploaded and declared through the Console instead.
+
 ## Options
 
 Shared:
 
 | Option | Env | Required |
 | --- | --- | --- |
-| `token` | `RUSTORE_TOKEN` | yes |
+| `key_id` | `RUSTORE_KEY_ID` | yes |
+| `private_key` | `RUSTORE_PRIVATE_KEY` | yes |
 | `package_name` | `RUSTORE_PACKAGE_NAME` | yes |
 | `version_id` | `RUSTORE_VERSION_ID` | yes |
 
@@ -61,12 +80,13 @@ APK:
 | Option | Env | Required |
 | --- | --- | --- |
 | `apk_path` | `RUSTORE_APK_PATH` | yes |
-| `services_type` | `RUSTORE_SERVICES_TYPE` | no |
+| `services_type` | `RUSTORE_SERVICES_TYPE` | no (`Unknown`) |
 | `is_main_apk` | `RUSTORE_IS_MAIN_APK` | yes |
 
-## Test
+## Development
 
 ```bash
-bundle exec rspec
-bundle exec rubocop
+bundle exec rake
 ```
+
+API reference: [authorization](https://www.rustore.ru/help/work-with-rustore-api/api-authorization-token), [APK upload](https://www.rustore.ru/help/work-with-rustore-api/api-upload-publication-app/apk-file-upload/file-upload-apk), and [AAB upload](https://www.rustore.ru/help/work-with-rustore-api/api-upload-publication-app/apk-file-upload/file-upload-aab).

data/lib/fastlane/plugin/rustored/actions/rustored_publish_aab_action.rb

@@ -9,7 +9,8 @@ module Fastlane
     class RustoredPublishAabAction < Action
       def self.run(params)
         Fastlane::Helper::RustoredHelper.publish_aab(
-          token: params[:token],
+          key_id: params[:key_id],
+          private_key: params[:private_key],
           package_name: params[:package_name],
           version_id: params[:version_id],
           aab_path: params[:aab_path]
@@ -17,7 +18,7 @@ module Fastlane
       end
 
       def self.description
-        "Publish an AAB file to RuStore"
+        "Upload an AAB file to an existing RuStore draft version"
       end
 
       def self.authors
@@ -25,7 +26,7 @@ module Fastlane
       end
 
       def self.details
-        "Uploads an Android App Bundle to an existing RuStore app version."
+        "Uploads an Android App Bundle to an existing RuStore draft version."
       end
 
       def self.available_options

data/lib/fastlane/plugin/rustored/actions/rustored_publish_apk_action.rb

@@ -9,7 +9,8 @@ module Fastlane
     class RustoredPublishApkAction < Action
       def self.run(params)
         Fastlane::Helper::RustoredHelper.publish_apk(
-          token: params[:token],
+          key_id: params[:key_id],
+          private_key: params[:private_key],
           package_name: params[:package_name],
           version_id: params[:version_id],
           services_type: params[:services_type],
@@ -19,7 +20,7 @@ module Fastlane
       end
 
       def self.description
-        "Publish an APK file to RuStore"
+        "Upload an APK file to an existing RuStore draft version"
       end
 
       def self.authors
@@ -27,7 +28,7 @@ module Fastlane
       end
 
       def self.details
-        "Uploads an APK to an existing RuStore app version."
+        "Uploads an APK to an existing RuStore draft version."
       end
 
       def self.available_options
@@ -44,7 +45,11 @@ module Fastlane
             env_name: "RUSTORE_SERVICES_TYPE",
             description: "The APK services type",
             optional: true,
-            type: String
+            type: String,
+            default_value: "Unknown",
+            verify_block: proc do |value|
+              UI.user_error!("services_type must be HMS or Unknown") unless %w[HMS Unknown].include?(value)
+            end
           ),
           FastlaneCore::ConfigItem.new(
             key: :is_main_apk,

data/lib/fastlane/plugin/rustored/helper/rustored_helper.rb

@@ -1,46 +1,51 @@
 require 'fastlane_core/ui/ui'
 require 'faraday'
-require 'json'
+require 'faraday_middleware'
+require_relative 'rustored_token_helper'
 
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
 
   module Helper
     class RustoredHelper
-      BASE_URL = 'https://public-api.rustore.ru/public/v1'
+      BASE_URL = 'https://public-api.rustore.ru'
 
       def self.client
         @client ||= Faraday.new(url: BASE_URL) do |f|
-          f.request(:json)
           f.request(:multipart)
           f.response(:json)
         end
       end
 
-      def self.publish_aab(token:, package_name:, version_id:, aab_path:)
-        UI.message("Publishing AAB to Rustore...")
+      def self.publish_aab(key_id:, private_key:, package_name:, version_id:, aab_path:)
+        UI.user_error!("AAB file not found: #{aab_path}") unless File.file?(aab_path)
+        UI.message("Uploading AAB to RuStore...")
 
-        response = client.post("/application/#{package_name}/version/#{version_id}/aab") do |req|
+        token = RustoredTokenHelper.get_token(key_id: key_id, private_key: private_key)
+
+        response = client.post("/public/v1/application/#{package_name}/version/#{version_id}/aab") do |req|
           req.headers['Public-Token'] = token
           req.body = {
             file: Faraday::UploadIO.new(aab_path, 'application/octet-stream')
           }
         end
 
-        if response.success? && response.body['code'] == 'OK'
-          UI.success("AAB published successfully!")
-        else
-          UI.error("Failed to publish AAB: #{response.status} - #{response.body['message']}")
-        end
+        check_response!(response, 'AAB')
+        UI.success("AAB uploaded successfully!")
+      rescue Faraday::Error => e
+        UI.user_error!("Failed to upload AAB: #{e.message}")
       end
 
-      def self.publish_apk(token:, package_name:, version_id:, services_type:, is_main_apk:, apk_path:)
-        UI.message("Publishing APK to Rustore...")
+      def self.publish_apk(key_id:, private_key:, package_name:, version_id:, services_type:, is_main_apk:, apk_path:)
+        UI.user_error!("APK file not found: #{apk_path}") unless File.file?(apk_path)
+        UI.message("Uploading APK to RuStore...")
 
-        response = client.post("/application/#{package_name}/version/#{version_id}/apk") do |req|
+        token = RustoredTokenHelper.get_token(key_id: key_id, private_key: private_key)
+
+        response = client.post("/public/v1/application/#{package_name}/version/#{version_id}/apk") do |req|
           req.headers['Public-Token'] = token
 
-          req.params['servicesType'] = services_type
+          req.params['servicesType'] = services_type if services_type
           req.params['isMainApk'] = is_main_apk
 
           req.body = {
@@ -48,12 +53,20 @@ module Fastlane
           }
         end
 
-        if response.success? && response.body['code'] == 'OK'
-          UI.success("APK published successfully!")
-        else
-          UI.error("Failed to publish APK: #{response.status} - #{response.body['message']}")
-        end
+        check_response!(response, 'APK')
+        UI.success("APK uploaded successfully!")
+      rescue Faraday::Error => e
+        UI.user_error!("Failed to upload APK: #{e.message}")
+      end
+
+      def self.check_response!(response, artifact)
+        body = response.body.kind_of?(Hash) ? response.body : {}
+        return if response.success? && body['code'] == 'OK'
+
+        error = body['message'] || body['code'] || 'Unknown RuStore response'
+        UI.user_error!("Failed to upload #{artifact}: #{response.status} - #{error}")
       end
+      private_class_method(:check_response!)
     end
   end
 end

data/lib/fastlane/plugin/rustored/helper/rustored_options.rb

@@ -6,12 +6,21 @@ module Fastlane
       def self.common_options
         [
           FastlaneCore::ConfigItem.new(
-            key: :token,
-            env_name: "RUSTORE_TOKEN",
-            description: "The token for authenticating with RuStore",
+            key: :key_id,
+            env_name: "RUSTORE_KEY_ID",
+            description: "The key id for authenticating with RuStore",
             optional: false,
             type: String
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :private_key,
+            env_name: "RUSTORE_PRIVATE_KEY",
+            description: "The private key for authenticating with RuStore",
+            optional: false,
+            type: String,
+            sensitive: true,
+            display_in_shell: false
+          ),
           FastlaneCore::ConfigItem.new(
             key: :package_name,
             env_name: "RUSTORE_PACKAGE_NAME",

data/lib/fastlane/plugin/rustored/helper/rustored_token_helper.rb

@@ -0,0 +1,58 @@
+require 'fastlane_core/ui/ui'
+require 'base64'
+require 'json'
+require 'openssl'
+require 'time'
+require 'faraday'
+require 'faraday_middleware'
+
+module Fastlane
+  UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
+
+  module Helper
+    class RustoredTokenHelper
+      BASE_URL = 'https://public-api.rustore.ru'
+
+      def self.client
+        @client ||= Faraday.new(url: BASE_URL) do |f|
+          f.request(:json)
+          f.response(:json)
+        end
+      end
+
+      def self.gen_token_signature(key_id:, private_key:, timestamp:)
+        private_key_data = Base64.strict_decode64(private_key)
+        rsa_private_key = OpenSSL::PKey::RSA.new(private_key_data)
+
+        message_to_sign = key_id + timestamp
+
+        digest = OpenSSL::Digest.new('SHA512')
+        signature_bytes = rsa_private_key.sign(digest, message_to_sign)
+        Base64.strict_encode64(signature_bytes)
+      end
+
+      def self.get_token(key_id:, private_key:)
+        timestamp = Time.now.utc.iso8601(3)
+        sig = gen_token_signature(key_id: key_id, private_key: private_key, timestamp: timestamp)
+
+        response = client.post('/public/auth') do |req|
+          req.body = {
+            keyId: key_id,
+            signature: sig,
+            timestamp: timestamp
+          }
+        end
+
+        body = response.body.kind_of?(Hash) ? response.body : {}
+        token = body.dig('body', 'jwe')
+        return token if response.success? && body['code'] == 'OK' && !token.to_s.empty?
+
+        UI.user_error!("Failed to get token: #{response.status} - #{body['message'] || body['code'] || 'Unknown RuStore response'}")
+      rescue ArgumentError, OpenSSL::PKey::PKeyError => e
+        UI.user_error!("Invalid RuStore private key: #{e.message}")
+      rescue Faraday::Error => e
+        UI.user_error!("Failed to get RuStore token: #{e.message}")
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-rustored
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - 06ED
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 email: hsbest123@gmail.com
 executables: []
 extensions: []
@@ -21,6 +49,7 @@ files:
 - lib/fastlane/plugin/rustored/actions/rustored_publish_apk_action.rb
 - lib/fastlane/plugin/rustored/helper/rustored_helper.rb
 - lib/fastlane/plugin/rustored/helper/rustored_options.rb
+- lib/fastlane/plugin/rustored/helper/rustored_token_helper.rb
 - lib/fastlane/plugin/rustored/version.rb
 homepage: https://github.com/06ED/fastlane-rustored
 licenses: