summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo <mo.khan@gmail.com>2018-01-27 12:08:47 -0700
committermo <mo.khan@gmail.com>2018-01-27 12:08:47 -0700
commit85bcdbed3d243f36584043360579f3c81ce5728e (patch)
tree060db677075fb7703e005817ce145d16ba8b79eb
parent1c50f4f5c239658964dd01251f53b546d8318fe8 (diff)
issuer -> entity_id
-rw-r--r--app/controllers/application_controller.rb10
-rw-r--r--app/controllers/service_providers_controller.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a8bc362..ca42aa2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,12 +2,12 @@ class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
helper_method :current_user, :current_user?
- def current_user(issuer = params[:entity_id])
- return nil unless session[issuer].present?
- User.new(session[issuer].with_indifferent_access)
+ def current_user(entity_id = params[:entity_id])
+ return nil unless session[entity_id].present?
+ User.new(session[entity_id].with_indifferent_access)
end
- def current_user?(issuer)
- current_user(issuer).present?
+ def current_user?(entity_id)
+ current_user(entity_id).present?
end
end
diff --git a/app/controllers/service_providers_controller.rb b/app/controllers/service_providers_controller.rb
index 92f0ef0..2803817 100644
--- a/app/controllers/service_providers_controller.rb
+++ b/app/controllers/service_providers_controller.rb
@@ -14,7 +14,7 @@ class ServiceProvidersController < ApplicationController
def create
configuration = Saml::Kit::Configuration.new do |config|
- config.issuer = service_provider_url(id: SecureRandom.uuid)
+ config.entity_id = service_provider_url(id: SecureRandom.uuid)
params[:signing_certificates].to_i.times do |n|
config.generate_key_pair_for(use: :signing)
end