Skip to content

Remove before_filter #8

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

Merged
zachmargolis merged 3 commits into from
Aug 18, 2017
Merged

Remove before_filter #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e2297
Rails 5 compat: replace before_filter with before_action
zachmargolis Aug 18, 2017
4dd28b7
Update version in source control
zachmargolis Aug 18, 2017
25551f7
Remove ruby-2.0.0 from CI because nokogiri 1.8.0 is incompatible
zachmargolis Aug 18, 2017
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
rvm:
- 2.0.0
- 2.3.1
- 2.3.3
notifications:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ end
To generate the SAML Response it uses a default X.509 certificate and secret key... which isn't so secret.
You can find them in `SamlIdp::Default`. The X.509 certificate is valid until year 2032.
Obviously you shouldn't use these if you intend to use this in production environments. In that case,
within the controller set the properties `x509_certificate` and `secret_key` using a `prepend_before_filter`
within the controller set the properties `x509_certificate` and `secret_key` using a `prepend_before_action`
callback within the current request context or set them globally via the `SamlIdp.config.x509_certificate`
and `SamlIdp.config.secret_key` properties.

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/saml_idp/idp_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class IdpController < ActionController::Base

unloadable unless Rails::VERSION::MAJOR >= 4
protect_from_forgery
before_filter :validate_saml_request, only: [:new, :create]
before_action :validate_saml_request, only: [:new, :create]

def new
render template: "saml_idp/idp/new"
Expand Down
2 changes: 1 addition & 1 deletion lib/saml_idp/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# encoding: utf-8
module SamlIdp
VERSION = '0.4.0'
Copy link

@brodygov brodygov Aug 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't totally understand the version bump here

Copy link
Author

@zachmargolis zachmargolis Aug 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We were previously "upgrading" the gem in IDP by pointing at a different SHA in git. However the "version" in the Gemfile.lock was reporting itself as 0.4.0 when in fact our tag was named 0.4.2 so I figured I would try to true-up the version the gem reports itself as

VERSION = '0.4.3-18f'
end