ddr-models 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6dc7a5d5bb5df96bd40adf20c437fbb22e7a96
-  data.tar.gz: 7a630a51f88806880c2d0ced9e7efa6c91f26719
+  metadata.gz: 47da234ecb43f36fb0eb336d31519cddf290a207
+  data.tar.gz: ff7d195e23915f0e127161c01f24d2044dc879d2
 SHA512:
-  metadata.gz: 9b6b2554e5dbea6205588dab1849c83e0f1f1878da663b8b4e3993d65fa547a57f85fb3db6e8ce723e7012f253ce4d2b542316c1b3053dd1ece270dbf2bbf1de
-  data.tar.gz: 8dcad69b15fe3dea3ba36393f8c5c374730bdcd9686c2acdf16c519d2f22843198b9fad41edef34c96642bd7f2e09fb42927e24674b0ac3478f64f0f9d266e28
+  metadata.gz: 3c435826a74310c1e70f2b8edf46569727edd0939a5863519bbe858a44313b1fb01dfdfd8cecb63d86399fc23e16205b80c634f73e4177c50d7ba1034fbdb2b4
+  data.tar.gz: dfce4af10755852dea51a93ebbed93b31aeef6f3b3b5672bfe5171a0cdd88c6b3b836752efaecee5e6b7c2a5419f9c82a9e8b4a37e0c6d0616cea18442fb92f0

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -2,10 +2,14 @@ require "devise/omniauth_callbacks_controller"
 
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   
-  # Shibboleth callback
   def shibboleth
-    @user = resource_class.from_omniauth(request.env["omniauth.auth"])
-    sign_in_and_redirect @user
+    user = resource_class.from_omniauth(request.env["omniauth.auth"])
+    set_flash_message :notice, :success, kind: "Duke NetID"
+    sign_in_and_redirect user
+  end
+
+  def after_sign_in_path_for(resource)
+    request.env["omniauth.origin"] || super
   end
 
 end

data/app/controllers/users/sessions_controller.rb

@@ -1,7 +1,17 @@
 class Users::SessionsController < Devise::SessionsController
 
+  def new
+    if Ddr::Auth.require_shib_user_authn
+      redirect_to user_omniauth_authorize_path(:shibboleth, origin: request.referrer)
+    else
+      store_location_for(:user, request.referrer)
+      super
+    end
+  end
+
   def after_sign_out_path_for(scope)
-    user_signed_out_path
+    return Ddr::Auth.sso_logout_url if Ddr::Auth.require_shib_user_authn
+    super
   end
 
 end

data/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,22 @@
+<h2>Login</h2>
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+  <div class="form-group">
+	<%= f.label :username %>
+	<%= f.text_field :username %>
+  </div>
+  <div class="form-group">
+	<%= f.label :password %>
+	<%= f.password_field :password %>
+  </div>
+  <% if devise_mapping.rememberable? -%>
+    <div class="form-group">
+	  <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+	</div>
+  <% end -%>
+  <div>
+	<%= f.submit "Login" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/shared/_links.erb

@@ -0,0 +1,9 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Login", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Login with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/config/initializers/devise.rb

@@ -238,7 +238,6 @@ Devise.setup do |config|
   # end
 
   config.warden do |manager|
-    manager.failure_app = Ddr::Auth::FailureApp
     # :superuser scope
     manager.serialize_into_session(:superuser) { |superuser| superuser.id }
     manager.serialize_from_session(:superuser) { |id| Devise.mappings[:user].to.find(id) }

data/config/routes.rb

@@ -1,6 +1,3 @@
 Rails.application.routes.draw do
   devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks", sessions: "users/sessions" }
-  devise_scope :user do
-    get "/users/signed_out", to: redirect("/"), as: "user_signed_out"
-  end
 end

data/lib/ddr/auth.rb

@@ -8,7 +8,6 @@ module Ddr
     autoload :GroupService
     autoload :GrouperService
     autoload :RemoteGroupService
-    autoload :FailureApp
 
     # Group authorized to act as superuser
     mattr_accessor :superuser_group
@@ -52,5 +51,9 @@ module Ddr
       false
     end
 
+    mattr_accessor :sso_logout_url do
+      "/Shibboleth.sso/Logout?return=https://shib.oit.duke.edu/cgi-bin/logout.pl"
+    end
+
   end
 end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "1.10.0"
+    VERSION = "1.11.0"
   end
 end

data/spec/controllers/users/sessions_controller_spec.rb

@@ -0,0 +1,25 @@
+RSpec.describe Users::SessionsController, type: :controller do
+
+  before { request.env["devise.mapping"] = Devise.mappings[:user] }
+
+  describe "#new" do
+    before { request.env["HTTP_REFERER"] = "/foo/bar" }
+    describe "when shibboleth user authentication is required" do
+      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { true } }
+      it "should redirect to the shib authn path, setting the origin to the previous page" do
+        get :new
+        expect(response).to redirect_to(user_omniauth_authorize_path(:shibboleth, origin: "/foo/bar"))
+      end
+    end
+
+    describe "when shibboleth user authentication is NOT required" do
+      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { false } }
+      it "should store the location of the previous page and render the 'new' template" do
+        expect(subject).to receive(:store_location_for).with(:user, "/foo/bar")
+        get :new
+        expect(response).to render_template(:new)
+      end
+    end
+  end
+
+end

data/spec/routing/user_routing_spec.rb

@@ -17,10 +17,4 @@ RSpec.describe "users router", type: :routing do
   it "should have a shibboleth authentication path helper" do
     expect(get: user_omniauth_authorize_path(:shibboleth)).to route_to(controller: 'users/omniauth_callbacks', action: 'passthru', provider: 'shibboleth')
   end
-  describe "redirects", type: :request do
-    it "should have a signed out path" do
-      get '/users/signed_out'
-      expect(response).to redirect_to('/')
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,8 @@ require "resque"
 
 Resque.inline = true
 
+OmniAuth.config.test_mode = true
+
 Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 
 DatabaseCleaner.strategy = :truncation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -294,6 +294,8 @@ files:
 - app/models/component.rb
 - app/models/item.rb
 - app/models/target.rb
+- app/views/devise/sessions/new.html.erb
+- app/views/devise/shared/_links.erb
 - config/initializers/active_fedora_base.rb
 - config/initializers/active_fedora_datastream.rb
 - config/initializers/devise.rb
@@ -314,7 +316,6 @@ files:
 - lib/ddr/actions/fixity_check.rb
 - lib/ddr/auth.rb
 - lib/ddr/auth/ability.rb
-- lib/ddr/auth/failure_app.rb
 - lib/ddr/auth/group_service.rb
 - lib/ddr/auth/grouper_service.rb
 - lib/ddr/auth/remote_group_service.rb
@@ -377,7 +378,7 @@ files:
 - lib/ddr/vocab.rb
 - lib/ddr/vocab/asset.rb
 - lib/ddr/vocab/roles.rb
-- spec/controllers/application_controller_spec.rb
+- spec/controllers/users/sessions_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -488,7 +489,7 @@ signing_key:
 specification_version: 4
 summary: Models used in the Duke Digital Repository
 test_files:
-- spec/controllers/application_controller_spec.rb
+- spec/controllers/users/sessions_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb

data/lib/ddr/auth/failure_app.rb

@@ -1,16 +0,0 @@
-module Ddr
-  module Auth
-    class FailureApp < Devise::FailureApp
-
-      def respond
-        if scope == :user && Ddr::Auth.require_shib_user_authn
-          store_location!
-          redirect_to user_omniauth_authorize_path(:shibboleth)
-        else
-          super
-        end
-      end
-
-    end
-  end
-end

data/spec/controllers/application_controller_spec.rb

@@ -1,22 +0,0 @@
-RSpec.describe ApplicationController, type: :controller do
-  controller do
-    before_action :authenticate_user!
-    def index; end
-  end
-  describe "authentication failure handling" do
-    describe "when shibboleth user authentication is required" do
-      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { true } }
-      it "should redirect to the shib authn path" do
-        get :index
-        expect(response).to redirect_to(user_omniauth_authorize_path(:shibboleth))
-      end
-    end
-    describe "when shibboleth user authentication is not required" do
-      before { allow(Ddr::Auth).to receive(:require_shib_user_authn) { false } }
-      it "should redirect to the new user session path" do
-        get :index
-        expect(response).to redirect_to(new_user_session_path)
-      end
-    end
-  end
-end