Skip to content

Commit cac9d97

Browse files
authored
[NUOPEN-14] Remove deprecated urlsafe_csrf_tokens setting (#5718)
* Remove deprecated urlsafe_csrf_tokens setting * Remove order creation from transaction on order row importer * Fix rubocop warning * Refactor solution
1 parent 97537a8 commit cac9d97

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

app/models/order_import.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class OrderImport < ApplicationRecord
1414

1515
delegate :download_url, to: :error_file, prefix: true, allow_nil: true
1616

17-
def fetch_or_create_order!(row_importer)
18-
order_cache[row_importer.order_key] || create_order_from_imported_row!(row_importer)
17+
def fetch_or_create_order(row_importer)
18+
order_cache[row_importer.order_key] || create_order_from_imported_row(row_importer)
1919
end
2020

2121
#
@@ -74,8 +74,8 @@ def to_s
7474

7575
private
7676

77-
def create_order_from_imported_row!(row_importer)
78-
Order.create!(
77+
def create_order_from_imported_row(row_importer)
78+
Order.create(
7979
facility:,
8080
account: row_importer.account,
8181
user: row_importer.user,

app/services/order_row_importer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def add_error(message, options = {})
141141
def add_to_order
142142
ActiveRecord::Base.transaction do
143143
begin
144-
@order = field(:order_number).present? ? existing_order : @order_import.fetch_or_create_order!(self)
144+
@order = field(:order_number).present? ? existing_order : @order_import.fetch_or_create_order(self)
145145

146146
# The order adding feature has some quirky behavior because of the "order form"
147147
# feature: if you add multiple of a timed service, it creates multiple line items

config/environments/production.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# Full error reports are disabled and caching is turned on.
1616
config.consider_all_requests_local = false
1717
config.action_controller.perform_caching = true
18-
# https://github.com/rails/rails/compare/v5.2.5...v5.2.6#diff-6617298c89de9a6367092e0e98578354d77c5d2dac4316a8447c4ea1c33be0edR14
19-
config.action_controller.urlsafe_csrf_tokens = true
2018

2119
# Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
2220
# or in config/master.key. This key is used to decrypt credentials (and other encrypted files).

0 commit comments

Comments
 (0)