diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9dda0b4..d87a821 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,9 +12,6 @@ def allow_geoblacklight_params # root will be used as new_session_path # Shim because we're not using Devise's :database_authenticatable - # def new_session_path(_scope) - # new_user_session_path - # end # @param [String] return_url address that calnet will redirect to post-logout # @return [String] uri to the calnet sso page diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 8fc0b72..ff2cd57 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,8 +1,4 @@ class SessionsController < ApplicationController - # def new - # return_url = params[:url] || request.referer || root_path - # redirect_to user_calnet_omniauth_authorize_path(url: return_url) - # end def destroy sign_out current_user if signed_in? diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 004fceb..614c4af 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -274,7 +274,6 @@ config.sign_out_via = :get config.omniauth :cas, name: :calnet, - # url: "https://auth#{'-test' unless Rails.env.production?}.berkeley.edu", host: "auth#{'-test' unless Rails.env.production?}.berkeley.edu", login_url: '/cas/login', logout_url: '/cas/logout', diff --git a/config/routes.rb b/config/routes.rb index 5bea5fc..a828629 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,6 @@ devise_for :users, controllers: { omniauth_callbacks: 'omniauth_callbacks' } devise_scope :user do - # get 'users/sign_in', to: 'sessions#new', as: :new_user_session get 'users/sign_out', to: 'sessions#destroy', as: :destroy_user_session end