Skip to content

Commit

Permalink
Merge pull request #1072 from sul-dlss/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
ndushay authored Sep 21, 2020
2 parents 8eafa85 + 7a848da commit 751ca6c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 15 deletions.
9 changes: 9 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,12 @@ Rails/SquishedSQLHeredocs: # (new in 2.8)
Enabled: true
Rails/WhereNot: # (new in 2.8)
Enabled: true

Layout/BeginEndAlignment: # (new in 0.91)
Enabled: true
Lint/ConstantDefinitionInBlock: # (new in 0.91)
Enabled: true
Lint/IdentityComparison: # (new in 0.91)
Enabled: true
Lint/UselessTimes: # (new in 0.91)
Enabled: true
16 changes: 7 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ GEM
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
connection_pool (2.2.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crack (0.4.4)
crass (1.0.6)
daemons (1.3.1)
deep_merge (1.2.1)
Expand Down Expand Up @@ -267,7 +266,7 @@ GEM
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
netrc (0.11.0)
nio4r (2.5.3)
nio4r (2.5.4)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri-happymapper (0.8.1)
Expand Down Expand Up @@ -360,7 +359,7 @@ GEM
rdf-xsd (1.99.0)
rdf (~> 1.99)
redis (4.2.2)
regexp_parser (1.7.1)
regexp_parser (1.8.0)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
Expand Down Expand Up @@ -390,18 +389,18 @@ GEM
rspec-support (3.9.3)
rspec_junit_formatter (0.4.1)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.90.0)
rubocop (0.91.0)
parallel (~> 1.10)
parser (>= 2.7.1.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.3.0, < 1.0)
rubocop-ast (>= 0.4.0, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.4.0)
rubocop-ast (0.4.2)
parser (>= 2.7.1.4)
rubocop-rails (2.8.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.87.0)
Expand All @@ -420,7 +419,6 @@ GEM
mime-types
nokogiri
rest-client
safe_yaml (1.0.5)
scrub_rb (1.0.1)
sidekiq (6.1.2)
connection_pool (>= 2.2.2)
Expand Down
13 changes: 7 additions & 6 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ def check_auth_token
end

def decoded_auth_token
@decoded_auth_token ||= begin
body = JWT.decode(http_auth_header, Settings.dor.hmac_secret, true, algorithm: 'HS256').first
HashWithIndifferentAccess.new body
rescue StandardError
nil
end
@decoded_auth_token ||=
begin
body = JWT.decode(http_auth_header, Settings.dor.hmac_secret, true, algorithm: 'HS256').first
HashWithIndifferentAccess.new body
rescue StandardError
nil
end
end

def http_auth_header
Expand Down

0 comments on commit 751ca6c

Please sign in to comment.