Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all CSRF checks from API endpoints #1186

Merged
merged 1 commit into from
Nov 11, 2023
Merged

Remove all CSRF checks from API endpoints #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions app/controllers/api_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class ApiController < ::ApplicationController
include Rails::Pagination
protect_from_forgery with: :null_session
skip_before_action :verify_authenticity_token, if: :json_web_token_present?
skip_before_action :verify_authenticity_token
before_action :authenticate_user!
after_action :verify_authorized
rescue_from ActiveRecord::RecordNotFound, with: :record_not_found_json
Expand All @@ -22,8 +22,4 @@ def live_entry_unavailable(resource)
{reportText: "Live entry for #{resource.name} is currently unavailable. " +
"Please enable live entry access through the admin/settings page."}
end

def json_web_token_present?
!!current_user&.has_json_web_token
end
end
2 changes: 0 additions & 2 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ def self.search_name_email(search_param)
"#{search_param}%", "#{search_param}%", "%#{search_param}%")
end

attr_accessor :has_json_web_token

def to_s
slug
end
Expand Down
1 change: 0 additions & 1 deletion config/initializers/core_extensions/devise/strategies/jwt_strategy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ def authenticate!

env["devise.skip_trackable"] = true
user = User.find(payload["sub"])
user.has_json_web_token = true
success! user
rescue JWT::ExpiredSignature
fail! "Auth token has expired"
Expand Down
Loading