omniauth-applicaster 1.9.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9bcca69fcde5b2efaf200357c1f787f5e36936ecc8027fdaff673b14fba079d
-  data.tar.gz: 722a0df2373c6c06b00383576550a7e977f5b33c8a454e913e3f09674e75dd85
+  metadata.gz: 2082b22a6f4f98d7ffabb53f47c992f357d551fa689692172d4b3c27600c810a
+  data.tar.gz: 46d156b5ede9274f2725a136d2af9658ae1f82d28f737415d0bd273f2a73b886
 SHA512:
-  metadata.gz: 4339cf40df8f62781ab957c3cf92cd5692aeb2bdc5d0fd6401a856ebf656fd6b703ef11f8d175c2383c2f721cb7a01c1d71a858a5cf646b406487c99f020a5a1
-  data.tar.gz: 4a183580fc81efbd62fb8b70533a0f9e99aace2d6467d0f8d87dffb410b4c2118b3f933f3c83de354cfd82494acc58ea0f993fa236a328afd4551b2392ec4536
+  metadata.gz: 3b113f436fa3a9474913cf36d757fff9ab04695c4038e91ada024a22c6549f86b454129ac6ab4b5c8a8761f6d83a4362b54b114bddc50807796f47066e057697
+  data.tar.gz: 47260b3abf6278bdaa91bed92b1259c7f85c31fd1dbbe6ff24d197c52c83f02fee6769485e1570919cc1feda4116bcb3c2eba9c341f54b205c1e8a6fc8185760

data/README.md

@@ -23,6 +23,7 @@ See [Omniauth](https://github.com/intridea/omniauth) for setting up omniauth.
 Applicaster::Accounts.configure do |config|
   config.client_id = "my-service-uid"
   config.client_secret = "my-service-secret"
+  config.request_proc = -> { Thread.current[:request] }
 
   if Rails.env.development?
     # Use local accounts service with Pow when in development
@@ -49,6 +50,12 @@ projects.
 ```ruby
 class ApplicationController < ActionController::Base
   include Applicaster::AuthHelpers
+
+  before_action :set_request_in_thread
+
+  def set_request_in_thread
+    Thread.current[:request] = request
+  end
 end
 ```
 

data/lib/applicaster/accounts/configuration.rb

@@ -25,6 +25,8 @@ module Applicaster
 
       attribute :faraday_adapter, nil, default: :excon
 
+      # Add the request_proc attribute
+      attribute :request_proc, Proc, default: proc { nil }
 
       def default_base_url
         ENV["ACCOUNTS_BASE_URL"] || "https://accounts.applicaster.com/"

data/lib/applicaster/accounts.rb

@@ -45,6 +45,17 @@ module Applicaster
         end
       end
 
+      def current_request
+        config.request_proc.call if config.request_proc
+      end
+
+      def log_with_request_context(message)
+        request = current_request
+        log_message = "#{message}, IP: #{request&.remote_ip}, User Agent: #{request&.user_agent}"
+
+        Rails.logger.error(log_message)
+      end
+
       def user_from_token(token)
         Rails.logger.info("Fetching user with token: #{token}")
         user = Applicaster::Accounts::User.new(
@@ -53,15 +64,15 @@ module Applicaster
             .body
         )
         if user.nil?
-          Rails.logger.error("[Login Failed] -  User fetch failed. Token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
+          Rails.logger.error("[Login Failed] - User fetch failed. Token: #{token}")
         end
         user
       rescue Faraday::ClientError => e
         if e.response && e.response[:status] == 401
-          Rails.logger.error("[Login Failed] - Unauthorized access attempt detected. Invalid token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}, Error: #{e.message}")
+          log_with_request_context("[Login Failed] - Unauthorized access attempt detected. Invalid token: #{token}, Error: #{e.message}")
           nil
         else
-          Rails.logger.error("[Login Failed] - Error fetching user. Token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}, Error: #{e.message}")
+          log_with_request_context("[Login Failed] - Error fetching user. Token: #{token}, Error: #{e.message}")
           raise
         end
       end
@@ -73,7 +84,7 @@ module Applicaster
             .body
         )
       rescue Faraday::ResourceNotFound
-        Rails.logger.error("[Login Failed] - User not found. ID: #{id}, Token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
+        log_with_request_context("[Login Failed] - User not found. ID: #{id}, Token: #{token}")
         nil
       end
 
@@ -110,7 +121,7 @@ module Applicaster
     def user_data_from_omniauth(omniauth_credentials)
       access_token(omniauth_credentials).get("/api/v1/users/current.json").parsed
     rescue Faraday::ClientError => e
-      Rails.logger.error("[Login Failed] - Failed to fetch user data from Omniauth. Error: #{e.message}")
+      log_with_request_context("[Login Failed] - Failed to fetch user data from Omniauth. Error: #{e.message}")
       raise
     end
 
@@ -137,7 +148,7 @@ module Applicaster
         .client_credentials
         .get_token
     rescue OAuth2::Error => e
-      Rails.logger.error("[Login Failed] - Failed to get client credentials token. Error: #{e.message}")
+      log_with_request_context("[Login Failed] - Failed to get client credentials token. Error: #{e.message}")
       raise
     end
   end

data/lib/applicaster/sessions_controller_mixin.rb

@@ -7,7 +7,7 @@ module Applicaster
 
     def create
       session[:omniauth_credentials] = omniauth_credentials
-      Rails.logger.info("Session created successfully for user. IP: #{request.remote_ip}, User Agent: #{request.user_agent}, Params: #{safe_user_params.inspect}")
+      Rails.logger.info("Session created successfully for user. IP: #{request.remote_ip}, User Agent: #{request.user_agent}, Params: #{params[:origin].inspect}")
 
       redirect_to(session.delete(:path_before_login) || '/')
     end
@@ -17,13 +17,12 @@ module Applicaster
       Rails.logger.info("Session destroyed for user: #{user_email}. IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
 
       reset_session
-      redirect_to config.base_url
+      redirect_to "/"
     end
 
     def failure
       Rails.logger.error({
         message: "[Login Failed] - Omniauth error with strategy '#{params[:strategy]}': #{params[:message]}",
-        origin: params[:origin],
         IP: request.remote_ip,
         UserAgent: request.user_agent,
         Params: params[:origin],

data/lib/omniauth-applicaster/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Applicaster
-    VERSION = "1.9.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-applicaster
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Neer Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-01 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler