shakha 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b5eb8fae72d4a779316f8266fc29f1078bf5b31c11a5d90ae922f46d3e37928
-  data.tar.gz: 95bc2e261d8a08c818ad75b4beefc8e5a4fa97802ef5cf28afdfbe7a895cdcc1
+  metadata.gz: 111afb5f4917b2fb01033e9b93c37fabc0b099a886c7cce7eb80d4485e69e9a1
+  data.tar.gz: '008356dd3f1538432a84ff2e83c2b6d32e3ec5962ed252c79c8dc3229677c16d'
 SHA512:
-  metadata.gz: 0ee17e65c726cb0564e720fb73648b74567fcfb1edae5befbd14a16942ca877d5c007cfc8b622fed8c949211de3bf5b792fdff1190482bfdd414351b451e6204
-  data.tar.gz: 2205e02b9c9ebde26def46da665011571a5071a50bd79eaf6bb2d7075aed353d2d3b52eff1d6986113bf612ce2a6e2244e200e53b4aadf2b4c7fba8020ed354b
+  metadata.gz: 369843a745888523d8d3392e1111804d7113247005654de91c2fc75436a5a799ea505ad20858dbc057f9e81f5f3179dcaec77cd084923f3a1ae0121bcdb45960
+  data.tar.gz: 8bb91783e33cbac949565f21abded2d958b652b95f62b62f3d51eaabeaaf979224163376c98e58d25ecae57fbd41556f4a0db7c2415316e24e3778700e06af1e

data/app/controllers/shakha/application_controller.rb

@@ -5,7 +5,6 @@ module Shakha
     include ErrorHandler
     include ControllerHelpers
     include RateLimiter
-    include Auditable
 
     protect_from_forgery with: :exception
 

data/app/controllers/shakha/auth_controller.rb

@@ -6,6 +6,7 @@ require "uri"
 module Shakha
   class AuthController < ApplicationController
     include PKCEMixin
+    include Auditable
 
     skip_before_action :verify_authenticity_token, only: [:callback, :token]
 
@@ -177,7 +178,9 @@ module Shakha
       session_record = Shakha::Session.create!(
         user: user,
         client: client,
-        jti: SecureRandom.uuid
+        jti: SecureRandom.uuid,
+        ip_address: request.remote_ip,
+        user_agent: request.user_agent
       )
 
       cookies.encrypted[:shakha_session_token] = {

data/app/controllers/shakha/session_controller.rb

@@ -2,6 +2,7 @@
 
 module Shakha
   class SessionController < ApplicationController
+    include Auditable
     skip_before_action :verify_authenticity_token, only: [:check]
 
     def index
@@ -61,11 +62,7 @@ module Shakha
 
       cookies.delete(:shakha_session_token) if session.token == current_session&.token
 
-      ActiveSupport::Notifications.instrument("shakha.session_revoked", {
-        session_id: session.id,
-        user_id: current_user.id,
-        ip: request.remote_ip
-      })
+      log_session_revoked(session)
 
       render json: { status: "revoked" }
     end

data/lib/shakha/auditable.rb

@@ -5,15 +5,15 @@ module Shakha
     extend ActiveSupport::Concern
 
     included do
-      after_action :log_sign_in, only: [:callback]
-      after_action :log_sign_out, only: [:destroy]
-      after_action :log_token_exchange, only: [:token]
+      after_action :log_sign_in
+      after_action :log_sign_out
+      after_action :log_token_exchange
     end
 
     private
 
     def log_sign_in
-      return unless response.successful? && @current_user
+      return unless action_name == "callback" && response.successful? && @current_user
 
       ActiveSupport::Notifications.instrument("shakha.sign_in", {
         user_id: @current_user&.id,

data/lib/shakha/rate_limiter.rb

@@ -20,7 +20,7 @@ module Shakha
     end
 
     def check_rate_limit(key, max:, period:)
-      return unless Shakha.config.rate_limiting_enabled?
+      return unless Shakha.config.rate_limiting_enabled
 
       cache_key = "shakha-rate:#{key}:#{request.remote_ip}"
 

data/lib/shakha/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shakha
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakha
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Asrat