omniauth-applicaster 1.7.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b63f2fa4077da4d8afbd421b6b62e7a462196732
-  data.tar.gz: f3016a73e3db235b262f7dbc78acaccd4f844836
+SHA256:
+  metadata.gz: d9bcca69fcde5b2efaf200357c1f787f5e36936ecc8027fdaff673b14fba079d
+  data.tar.gz: 722a0df2373c6c06b00383576550a7e977f5b33c8a454e913e3f09674e75dd85
 SHA512:
-  metadata.gz: 82c0e7c6be01c4f3a48e3bc9d0e863b696f1e98b7656cbf96cba356c08b0148a9f8a0d212c19cdb2c74d83209c4e77563ec720dd40450570afaff5c17297e61d
-  data.tar.gz: 3e9d851c6deebfc37f21effcb5f1502f197e3dd18bd56ac7050c290c96b07f6a8c86614bcca87d9883fb1816a047971f109688056533157157da61930cd5d9a1
+  metadata.gz: 4339cf40df8f62781ab957c3cf92cd5692aeb2bdc5d0fd6401a856ebf656fd6b703ef11f8d175c2383c2f721cb7a01c1d71a858a5cf646b406487c99f020a5a1
+  data.tar.gz: 4a183580fc81efbd62fb8b70533a0f9e99aace2d6467d0f8d87dffb410b4c2118b3f933f3c83de354cfd82494acc58ea0f993fa236a328afd4551b2392ec4536

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'pry'
+gem 'excon', '< 0.63'

data/lib/applicaster/accounts.rb

@@ -20,7 +20,7 @@ module Applicaster
 
         Faraday.new(conn_opts) do |conn|
           if options[:token]
-            conn.request :oauth2, options[:token]
+            conn.request :oauth2, options[:token], token_type: "param"
           end
 
           conn.request :json
@@ -38,24 +38,30 @@ module Applicaster
 
 
           conn.response :json, content_type: /\bjson$/
+          conn.response :raise_error
           # conn.response :logger, Rails.logger
           # conn.response :logger, Logger.new(STDOUT)
-          conn.response :raise_error
-
           conn.adapter config.faraday_adapter
         end
       end
 
       def user_from_token(token)
-        Applicaster::Accounts::User.new(
+        Rails.logger.info("Fetching user with token: #{token}")
+        user = Applicaster::Accounts::User.new(
           connection(token: token)
             .get("/api/v1/users/current.json")
             .body
         )
+        if user.nil?
+          Rails.logger.error("[Login Failed] -  User fetch failed. Token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
+        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}")
           nil
         else
+          Rails.logger.error("[Login Failed] - Error fetching user. Token: #{token}, IP: #{request.remote_ip}, User Agent: #{request.user_agent}, Error: #{e.message}")
           raise
         end
       end
@@ -66,13 +72,20 @@ module Applicaster
             .get("/api/v1/users/#{id}.json")
             .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}")
+        nil
       end
 
       def accounts_from_token(token)
+        Rails.logger.info("Fetching accounts with token: #{token}")
         connection(token: token)
           .get("/api/v1/accounts.json")
           .body
           .map {|a| Account.new(a) }
+      rescue Faraday::ClientError => e
+        Rails.logger.error("Failed to fetch accounts. Token: #{token}, Error: #{e.message}")
+        raise
       end
 
       def config
@@ -89,12 +102,16 @@ module Applicaster
           config.client_secret,
           site: config.base_url,
           authorize_url: "/oauth/authorize",
-        )
+          auth_scheme: :basic_auth,
+          )
       end
     end
 
     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}")
+      raise
     end
 
     def accounts
@@ -102,8 +119,10 @@ module Applicaster
     end
 
     def find_user_by_id(id)
+      Rails.logger.info("Finding user by ID: #{id}")
       self.class.user_by_id_and_token(id, client_credentials_token.token)
     rescue Faraday::ResourceNotFound
+      Rails.logger.error("[Login Failed] - User not found by ID: #{id}")
       nil
     end
 
@@ -117,6 +136,9 @@ module Applicaster
       @client_credentials_token ||= self.class.oauth_client
         .client_credentials
         .get_token
+    rescue OAuth2::Error => e
+      Rails.logger.error("[Login Failed] - Failed to get client credentials token. Error: #{e.message}")
+      raise
     end
   end
 end

data/lib/applicaster/auth_helpers.rb

@@ -10,6 +10,7 @@ module Applicaster
 
     def authenticate_user!
       unless current_user
+        log_unauthorized_access
         store_location!
         redirect_to '/auth/applicaster'
       end
@@ -25,10 +26,10 @@ module Applicaster
 
     def store_location!
       session[:path_before_login] = if request.get?
-                                      request.fullpath
-                                    else
-                                      request.referrer
-                                    end
+        request.fullpath
+      else
+        request.referrer
+      end
     end
 
     def clear_omniauth_credentials
@@ -41,6 +42,31 @@ module Applicaster
       Applicaster::Accounts.user_from_token(current_access_token).tap do |user|
         clear_omniauth_credentials unless user
       end
+    rescue Faraday::ClientError => e
+      log_failed_user_fetch(e)
+      nil
+    end
+
+    def log_unauthorized_access
+      user_email = current_user&.email || "Unknown User"
+      user_ip = request.remote_ip
+      user_agent = request.user_agent
+      requested_path = request.fullpath
+
+      Rails.logger.error(
+        "[Unauthorized Access Attempt] - User: #{user_email}, IP: #{user_ip}, User Agent: #{user_agent}, Requested Path: #{requested_path}. Redirecting to '/auth/applicaster'."
+      )
+    end
+
+    def log_failed_user_fetch(exception)
+      user_email = current_user&.email || session[:omniauth_credentials]&.fetch(:email, "Unknown User")
+      user_ip = request.remote_ip
+      user_agent = request.user_agent
+      requested_path = request.fullpath
+
+      Rails.logger.error(
+        "[User Fetch Failed] - User: #{user_email}, IP: #{user_ip}, User Agent: #{user_agent}, Requested Path: #{requested_path}. Error: #{exception.message}",
+      )
     end
   end
 end

data/lib/applicaster/sessions_controller_mixin.rb

@@ -1,25 +1,32 @@
 module Applicaster
   module SessionsControllerMixin
     def new
+      Rails.logger.info("New session initiated. Redirecting to /auth/applicaster. IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
       redirect_to "/auth/applicaster"
     end
 
     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}")
 
       redirect_to(session.delete(:path_before_login) || '/')
     end
 
     def destroy
-      reset_session
+      user_email = current_user.email rescue "Unknown"
+      Rails.logger.info("Session destroyed for user: #{user_email}. IP: #{request.remote_ip}, User Agent: #{request.user_agent}")
 
-      redirect_to "/"
+      reset_session
+      redirect_to config.base_url
     end
 
     def failure
-      Rails.logger.warn({
-        message: "Omniauth error with strategy '#{params[:strategy]}': #{params[:message]}",
+      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],
       })
       flash[:notice] = "There was a problem logging in"
       redirect_to "/"

data/lib/omniauth-applicaster/version.rb

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

data/omniauth-applicaster.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "omniauth-oauth2"
-  spec.add_dependency "faraday", "~> 0.9.1"
+  spec.add_dependency "faraday", "~> 0.11"
+  spec.add_dependency "oauth2", "> 1.3.1"
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "excon"
   spec.add_dependency "virtus"

data/spec/support/webmock_stubs_helper.rb

@@ -10,8 +10,9 @@ module WebmockStubsHelper
   end
 
   def stub_client_credentials_request
-    stub_request(:post, "https://client-id:client-secret@#{accounts_host}/oauth/token")
+    stub_request(:post, "https://#{accounts_host}/oauth/token")
       .with(:body => {"grant_type"=>"client_credentials"})
+      .with(basic_auth: ["client-id", "client-secret"])
       .to_return(successful_json_response(access_token: "client-credentials-token"))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-applicaster
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Neer Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -193,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Omniauth strategy for http://accounts.applicaster.com