killbill-aviate 1.1.0.pre.8 → 1.1.0.pre.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9a61754eb5cdc016175eff105c47d1880d215296a2610a2565e5f9c790342e
-  data.tar.gz: 0e4065fb702a9081639dc3b4ca3f6e0ad08623c4ed43e76cd0bb141793df29fa
+  metadata.gz: ea3985ee1127fe9cbbc0a1896232e62c30141e42d473124a6e7e90a14fc00e95
+  data.tar.gz: ed28ef7bfc826edfaa466507a8420e881643d80c8a87b300d77c9245271f836c
 SHA512:
-  metadata.gz: 36f92def06ac140459a9da79c6bb184aa5c0c474377c75a24ddbfb65a3c136f3b7f794c239a0f2ffa02c6c8c53468780d9f9df6c0fe61b90e9d92b09c58b0b5a
-  data.tar.gz: 1e361ade02913a25f54f949490f5b31f901223307bc12deeff2044a5d2369fa541ea60df7a06b501f21074caf49b303940b2f0b716424a2d70b796bd3b9ebb5f
+  metadata.gz: 11f19b4f4d638a8ab19a2bdf37a047d3c5e0ad6f961bf3bcf820cde4b659e1602cd128c4d0783a35ffea9d8b743bdd64f530ea1f4d01c5850ca585f7bcd166bb
+  data.tar.gz: bdb605b58476704ab73016eb59588f880376a97803b56ad8c0379e029c74bd87b9d5895ce6321e20445a57271d53f190b231bea92d2811b10abe7a1be3783d02

data/app/controllers/aviate/configuration_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'aviate/client'
-require 'securerandom'
 
 module Aviate
   class ConfigurationController < Aviate::EngineController
@@ -16,11 +15,14 @@ module Aviate
       response = Killbill::Aviate::AviateClient.authenticate(email, password, cached_options_for_klient)
 
       if response.is_a?(Hash) && response['token']
-        reference_token = SecureRandom.hex(16)
-        session[:aviate_token_ref] = reference_token
-
-        # Store actual JWT in Rails cache using the reference token
-        Rails.cache.write("aviate_jwt_#{reference_token}", response['token'], expires_in: 1.hour)
+        # Store JWT in encrypted cookie
+        cookies.encrypted[:jwt_token] = {
+          value: response['token'],
+          httponly: true,
+          secure: Rails.env.production?,
+          same_site: :strict,
+          expires: 1.hour.from_now
+        }
         flash[:notice] = t('aviate.configuration.authentication_success')
       else
         flash[:error] = t('aviate.configuration.authentication_failed')
@@ -30,11 +32,12 @@ module Aviate
     end
 
     def session_destroy
-      if session[:aviate_token_ref].present?
-        jwt_cache_key = "aviate_jwt_#{session[:aviate_token_ref]}"
-        Rails.cache.delete(jwt_cache_key)
-        session.delete(:aviate_token_ref)
-      end
+      # Delete JWT cookie
+      cookies.delete(:jwt_token)
+      
+      # Clean up any existing session references
+      session.delete(:aviate_token_ref)
+      
       flash[:notice] = t('aviate.configuration.logout_success')
       redirect_to aviate_root_path
     end

data/app/controllers/aviate/engine_controller.rb

@@ -63,5 +63,19 @@ module Aviate
       flash[:error] = t('flashes.errors.wallet_authentication_failed')
       redirect_to aviate_engine.aviate_root_path
     end
+
+    private
+
+    def options_for_klient
+      # Get the base options from parent class
+      base_options = super
+      
+      # Add JWT token from cookies if available
+      if cookies.encrypted[:jwt_token].present?
+        base_options.merge(jwt_token: cookies.encrypted[:jwt_token])
+      else
+        base_options
+      end
+    end
   end
 end

data/app/views/aviate/configuration/index.html.erb

@@ -15,9 +15,12 @@
         </div>
         <div class="d-flex justify-content-end">
           <%= link_to "Logout", aviate_session_destroy_path, 
-                      method: :delete, 
-                      class: "btn btn-outline-secondary",
-                      confirm: "Are you sure you want to logout from Aviate?" %>
+            class: "btn btn-outline-secondary",
+            data: {
+              turbo_method: :delete,
+              turbo_confirm: "Are you sure you want to logout from Aviate?"
+            } 
+          %>
         </div>
       <% else %>
         <div class="configuration-form">

data/app/views/aviate/wallets/_form.html.erb

@@ -106,8 +106,6 @@ window.addEventListener('load', function() {
       return;
     }
     this.focus();
-    this.type = 'text';
-    this.type = 'date';
   });
 });
 <% end %>

data/config/routes.rb

@@ -5,7 +5,7 @@ Aviate::Engine.routes.draw do
 
   scope '/configuration' do
     match '/session_create' => 'configuration#session_create', :via => :post, :as => 'aviate_session_create'
-    match '/session_destroy' => 'configuration#session_destroy', :via => :delete, :as => 'aviate_session_destroy'
+    match '/session_destroy' => 'configuration#session_destroy', :via => [:get, :delete], :as => 'aviate_session_destroy'
   end
 
   resources :accounts, param: :account_id do

data/lib/aviate/client.rb

@@ -90,8 +90,8 @@ module Killbill
           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&.dig(:api_key)
+          request['X-Killbill-ApiSecret'] = options&.dig(:api_secret)
           request['Authorization'] = "Basic #{auth}"
           request.body = {}.to_json
           response = http.request(request)
@@ -103,6 +103,8 @@ module Killbill
         private
 
         def build_request_options(options)
+          return {} if options.nil?
+
           request_options = {
             api_key: options[:api_key],
             api_secret: options[:api_secret]

data/lib/aviate/version.rb

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

metadata

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