killbill-aviate 1.1.0.pre.1 → 1.1.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89879b3fdf628ffa251342e2854f21eb8c8f3b6c738a4d5404bb3f064c4e5275
-  data.tar.gz: 46977fab39f39d8737d4a611b4acd9e8be807bdf6c64b202d86dd68df2a5c690
+  metadata.gz: 351076bf3541d8c1b1b5cf46260a021bd2ac3bb5584c76882e74b5a326f91187
+  data.tar.gz: 914e1a98a10116f44fd42023a8f1903b5081efbdc6f1589a37cce61a76fbda29
 SHA512:
-  metadata.gz: e575203964276a13d2e1453211524a413e3176fa926c0a90d23b1005f92ad19a112bcd965f4da776818b174e989f067e0ec59e4db6a4767dbffa65154194a5dc
-  data.tar.gz: ba5e453cf98615607bfce226040827a511e3c7528de4826ccf0d0749fa8b3ae34a21163aeac995d4af22922023d29ba3859f298427822ffd511b3d97c57ffe00
+  metadata.gz: c659ff041b0dfc03cf2e0f1faf53c5f8ebf1b6344f5a88f7b490c14143b9cf4d80ba770d11e22e2614e4210fa80ee2cfb195713604b8001f085dc82491edd5b2
+  data.tar.gz: 97229f4998ae1519b5b48579424e85aa182486c3f5ab7bbe164e9f918a3eeed999c372391a76294408ce0f830c39bef627124d45ff064a6a6b550bf615814f15

data/lib/aviate/client.rb

@@ -8,7 +8,19 @@ module Killbill
       class << self
         def aviate_plugin_available?(options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/health/data"
-          KillBillClient::API.get path, {}, get_token(options)
+          
+          # Build options with proper header format for KillBillClient
+          request_options = {
+            api_key: options[:api_key],
+            api_secret: options[:api_secret]
+          }
+          
+          # Add Authorization header if JWT token is present
+          if options[:jwt_token].present?
+            request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" }
+          end
+          
+          KillBillClient::API.get path, {}, request_options
 
           [true, nil]
         rescue KillBillClient::API::ResponseError => e
@@ -28,7 +40,17 @@ module Killbill
 
         def retrieve_wallets(account_id, options = nil)
           path = "#{KILLBILL_AVIATE_PREFIX}/wallet/#{account_id}"
-          response = KillBillClient::API.get path, {}, get_token(options)
+          
+          request_options = {
+            api_key: options[:api_key],
+            api_secret: options[:api_secret]
+          }
+          
+          if options[:jwt_token].present?
+            request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" }
+          end
+          
+          response = KillBillClient::API.get path, {}, request_options
           JSON.parse(response.body)
         end
 
@@ -41,7 +63,17 @@ module Killbill
             expDurationUnit: wallet_params[:exp_duration_unit],
             expDurationLength: wallet_params[:exp_duration_length]
           }
-          response = KillBillClient::API.put path, body.to_json, {}, get_token(options)
+          
+          request_options = {
+            api_key: options[:api_key],
+            api_secret: options[:api_secret]
+          }
+          
+          if options[:jwt_token].present?
+            request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" }
+          end
+          
+          response = KillBillClient::API.put path, body.to_json, {}, request_options
           response.code
         end
 
@@ -64,7 +96,16 @@ module Killbill
             }
           }
 
-          response = KillBillClient::API.post path, body.to_json, {}, get_token(options)
+          request_options = {
+            api_key: options[:api_key],
+            api_secret: options[:api_secret]
+          }
+          
+          if options[:jwt_token].present?
+            request_options[:head] = { 'Authorization' => "Bearer #{options[:jwt_token]}" }
+          end
+
+          response = KillBillClient::API.post path, body.to_json, {}, request_options
           JSON.parse(response.body)
         rescue StandardError => e
           JSON.parse(e.message)
@@ -77,11 +118,12 @@ module Killbill
           base_url = KillBillClient::API.base_uri
           uri = URI("#{base_url}#{path}")
           http = Net::HTTP.new(uri.host, uri.port)
-
+          http.use_ssl = (uri.scheme == 'https')
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
           request = Net::HTTP::Post.new(uri.path)
           request['Content-Type'] = 'application/json'
-          request['X-killbill-apiKey'] = options[:api_key]
-          request['X-killbill-apisecret'] = options[:api_secret]
+          request['X-Killbill-ApiKey'] = options[:api_key]
+          request['X-Killbill-ApiSecret'] = options[:api_secret]
           request['Authorization'] = "Basic #{auth}"
           request.body = {}.to_json
           response = http.request(request)
@@ -89,15 +131,6 @@ module Killbill
         rescue StandardError => e
           e.message.to_s
         end
-
-        private
-
-        def get_token(options = nil)
-          {
-            api_key: options[:api_key],
-            api_secret: options[:api_secret]
-          }.merge({ bearer: options[:jwt_token].to_s })
-        end
       end
     end
   end

data/lib/aviate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aviate
-  VERSION = '1.1.0.pre.1'
+  VERSION = '1.1.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre.1
+  version: 1.1.0.pre.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-13 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui