From 5035ff3164da88095ecf9f4be08c3ae9223a9226 Mon Sep 17 00:00:00 2001
From: Sean Crowe <1069588+crowesn@users.noreply.github.com>
Date: Thu, 27 Jan 2022 12:28:27 -0500
Subject: [PATCH 1/8] Upgrade to ruby-2.7.5 (#963)

Co-authored-by: crowesn <crowesn@gmail.com>
---
 .circleci/config.yml | 4 ++--
 .ruby-version        | 2 +-
 Dockerfile           | 2 +-
 Dockerfile.dev       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9edfeef4..c7d3abce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
         parameters:
             ruby_version:
                 type: string
-                default: 2.7.2
+                default: 2.7.5
             bundler_version:
                 type: string
                 default: 2.0.1
@@ -90,4 +90,4 @@ workflows:
     ci:
         jobs:
             - build:
-                name: ruby2-7-2
+                name: ruby2-7-5
diff --git a/.ruby-version b/.ruby-version
index 37c2961c..a603bb50 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.5
diff --git a/Dockerfile b/Dockerfile
index d6739ea1..fe9c67a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.5
+FROM ruby:2.7.5
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 131c5c47..eb68ec82 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM ruby:2.5.5
+FROM ruby:2.7.5
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

From 1eb0c1066893184d78d5b1339232a4e80b0830af Mon Sep 17 00:00:00 2001
From: Sean Crowe <1069588+crowesn@users.noreply.github.com>
Date: Thu, 27 Jan 2022 13:59:33 -0500
Subject: [PATCH 2/8] un-hide share tab (#961)

Co-authored-by: crowesn <crowesn@gmail.com>
---
 app/views/hyrax/base/_guts4form.html.erb  | 2 +-
 spec/features/create_article_spec.rb      | 3 +++
 spec/features/create_dataset_spec.rb      | 3 +++
 spec/features/create_document_spec.rb     | 3 +++
 spec/features/create_etd_spec.rb          | 3 +++
 spec/features/create_generic_work_spec.rb | 3 +++
 spec/features/create_image_spec.rb        | 3 +++
 spec/features/create_medium_spec.rb       | 3 +++
 spec/features/create_student_work_spec.rb | 3 +++
 9 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/views/hyrax/base/_guts4form.html.erb b/app/views/hyrax/base/_guts4form.html.erb
index 7c36918e..4e242beb 100644
--- a/app/views/hyrax/base/_guts4form.html.erb
+++ b/app/views/hyrax/base/_guts4form.html.erb
@@ -32,7 +32,7 @@
             </li>
         <% end %>
 
-        <li role="presentation" id="tab-share" class="hidden">
+        <li role="presentation" id="tab-share">
           <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
             <%= t("hyrax.works.form.tab.share") %>
           </a>
diff --git a/spec/features/create_article_spec.rb b/spec/features/create_article_spec.rb
index 60a2e682..3c6121a7 100644
--- a/spec/features/create_article_spec.rb
+++ b/spec/features/create_article_spec.rb
@@ -108,6 +108,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('article_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_dataset_spec.rb b/spec/features/create_dataset_spec.rb
index b664a079..5a1c4e8a 100644
--- a/spec/features/create_dataset_spec.rb
+++ b/spec/features/create_dataset_spec.rb
@@ -102,6 +102,9 @@
       fill_in('External Link', with: external_link)
       expect(page).to have_css("label.control-label.string.optional", text: "Required Software")
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('dataset_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_document_spec.rb b/spec/features/create_document_spec.rb
index 9c134b3c..f8b3c621 100644
--- a/spec/features/create_document_spec.rb
+++ b/spec/features/create_document_spec.rb
@@ -104,6 +104,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('document_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_etd_spec.rb b/spec/features/create_etd_spec.rb
index b40d7022..f0c6d197 100644
--- a/spec/features/create_etd_spec.rb
+++ b/spec/features/create_etd_spec.rb
@@ -115,6 +115,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('etd_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_generic_work_spec.rb b/spec/features/create_generic_work_spec.rb
index f275a53c..5d5fe2e9 100644
--- a/spec/features/create_generic_work_spec.rb
+++ b/spec/features/create_generic_work_spec.rb
@@ -102,6 +102,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('generic_work_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_image_spec.rb b/spec/features/create_image_spec.rb
index f2627b8d..9b75d615 100644
--- a/spec/features/create_image_spec.rb
+++ b/spec/features/create_image_spec.rb
@@ -104,6 +104,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('image_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_medium_spec.rb b/spec/features/create_medium_spec.rb
index d3fc54e8..fa3a910b 100644
--- a/spec/features/create_medium_spec.rb
+++ b/spec/features/create_medium_spec.rb
@@ -102,6 +102,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('medium_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')
diff --git a/spec/features/create_student_work_spec.rb b/spec/features/create_student_work_spec.rb
index 222ba671..b47aa1f5 100644
--- a/spec/features/create_student_work_spec.rb
+++ b/spec/features/create_student_work_spec.rb
@@ -113,6 +113,9 @@
       fill_in('Note', with: note)
       fill_in('External Link', with: external_link)
 
+      click_link('Sharing')
+      expect(page).to have_content("Regardless of the visibility settings for this work, you can also share it with other users and groups")
+
       choose('student_work_visibility_open')
       expect(page).not_to have_content('Please note, making something visible to the world (i.e. marking this as Open Access) may be viewed as publishing which could impact your ability to')
       check('agreement')

From 715da6f683052eaa29663384face3be0db6e475b Mon Sep 17 00:00:00 2001
From: Sean Crowe <1069588+crowesn@users.noreply.github.com>
Date: Thu, 27 Jan 2022 16:43:01 -0500
Subject: [PATCH 3/8] upgrade to hyrax 2.9.6 (#965)

Co-authored-by: crowesn <crowesn@gmail.com>
---
 Gemfile                                 |   2 +-
 Gemfile.lock                            | 259 ++++++++++++------------
 app/views/catalog/_search_form.html.erb |   5 +-
 3 files changed, 134 insertions(+), 132 deletions(-)

diff --git a/Gemfile b/Gemfile
index 62fa916a..c68c8770 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ gem 'equivalent-xml'
 gem 'grape'
 gem 'grape_on_rails_routes'
 gem 'hydra-role-management'
-gem 'hyrax', '2.9.4'
+gem 'hyrax', '2.9.6'
 gem 'mysql2', '~> 0.4.10'
 gem 'omniauth-openid'
 gem 'omniauth-shibboleth'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87440a44..399b939f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,7 +117,7 @@ GEM
       actionpack (>= 3.0.2, < 7.0)
       activemodel (>= 3.0.2, < 7.0)
       activesupport (>= 3.0.2, < 7.0)
-    active_encode (0.8.1)
+    active_encode (0.8.2)
       rails
       sprockets (< 4)
     activejob (5.1.7)
@@ -133,8 +133,8 @@ GEM
       activemodel (= 5.1.7)
       activesupport (= 5.1.7)
       arel (~> 8.0)
-    activerecord-import (1.2.0)
-      activerecord (>= 3.2)
+    activerecord-import (1.3.0)
+      activerecord (>= 4.2)
     activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -146,28 +146,28 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     almond-rails (0.3.0)
       rails (>= 4.2)
-    amazing_print (1.3.0)
+    amazing_print (1.4.0)
     arel (8.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.3.1.0)
+    autoprefixer-rails (10.4.2.0)
       execjs (~> 2)
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.486.0)
-    aws-sdk-core (3.119.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.550.0)
+    aws-sdk-core (3.125.5)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.53.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.98.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.111.3)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -329,12 +329,12 @@ GEM
     dropbox_api (0.1.18)
       faraday (<= 1.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.12.1)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
+      dry-configurable (~> 0.13, >= 0.13.0)
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
@@ -342,7 +342,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-inflector (0.2.1)
-    dry-initializer (3.0.4)
+    dry-initializer (3.1.1)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
@@ -351,9 +351,9 @@ GEM
     dry-monads (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.7)
-    dry-schema (1.7.0)
+    dry-schema (1.8.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
+      dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
@@ -373,26 +373,25 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.6.0)
+    dry-validation (1.7.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.5, >= 1.5.2)
-    ebnf (2.1.3)
-      amazing_print (~> 1.2)
+      dry-schema (~> 1.8, >= 1.8.0)
+    ebnf (2.3.0)
+      amazing_print (~> 1.4)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
+      rdf (~> 3.2)
       scanf (~> 1.0)
-      sxp (~> 1.1)
-      unicode-types (~> 1.6)
+      sxp (~> 1.2)
+      unicode-types (~> 1.7)
     email_validator (2.2.3)
       activemodel
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubi (1.10.0)
-    ethon (0.14.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     execjs (2.8.1)
     factory_bot (4.11.1)
@@ -408,7 +407,7 @@ GEM
       faraday (>= 0.7.4, < 1.0)
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
-    ffi (1.15.3)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -418,10 +417,10 @@ GEM
       activesupport (>= 4.0)
     flot-rails (0.0.7)
       jquery-rails
-    font-awesome-rails (4.7.0.7)
-      railties (>= 3.2, < 7)
-    geocoder (1.6.7)
-    globalid (0.5.2)
+    font-awesome-rails (4.7.0.8)
+      railties (>= 3.2, < 8.0)
+    geocoder (1.7.3)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     google-api-client (0.32.1)
       addressable (~> 2.5, >= 2.5.1)
@@ -454,8 +453,6 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
     hashdiff (1.0.1)
     hashie (4.1.0)
     hiredis (0.6.3)
@@ -468,7 +465,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http_logger (0.6.0)
+    http_logger (0.7.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -491,7 +488,7 @@ GEM
       deprecation
       mime-types (> 2.0, < 4.0)
       mini_magick (>= 3.2, < 5)
-    hydra-editor (5.0.4)
+    hydra-editor (5.0.5)
       active-fedora (>= 9.0.0)
       activerecord (~> 5.0)
       almond-rails (~> 0.1)
@@ -520,8 +517,8 @@ GEM
       hydra-derivatives (~> 3.0)
       hydra-file_characterization (~> 1.0)
       hydra-pcdm (>= 0.9)
-    hyrax (2.9.4)
-      active-fedora (>= 11.5.2, < 12.2)
+    hyrax (2.9.6)
+      active-fedora (>= 11.5.2, < 13)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
       blacklight (~> 6.14)
@@ -571,7 +568,7 @@ GEM
       signet
       solrizer (>= 3.4, < 5)
       tinymce-rails (~> 4.1)
-    i18n (1.8.10)
+    i18n (1.9.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iiif-image-api (0.2.0)
@@ -579,9 +576,10 @@ GEM
     iiif_manifest (0.5.0)
       activesupport (>= 4)
     iso8601 (0.9.1)
-    jbuilder (2.11.2)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jmespath (1.4.0)
+    jmespath (1.5.0)
     jquery-datatables-rails (3.4.0)
       actionpack (>= 3.1)
       jquery-rails
@@ -593,9 +591,9 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.5.1)
-    json-canonicalization (0.2.1)
-    json-ld (3.1.9)
+    json (2.6.1)
+    json-canonicalization (0.3.0)
+    json-ld (3.1.10)
       htmlentities (~> 4.3)
       json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
@@ -607,31 +605,31 @@ GEM
       rdf (~> 3.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.2.3)
+    jwt (2.3.0)
     kaltura (0.1.1)
       hashie (>= 1.0.0)
       httparty (>= 0.7.8)
-    kaminari (1.2.1)
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.2.1)
-      kaminari-activerecord (= 1.2.1)
-      kaminari-core (= 1.2.1)
-    kaminari-actionview (1.2.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.2.1)
-    kaminari-activerecord (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.2.1)
-    kaminari-core (1.2.1)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
     kaminari_route_prefix (0.1.1)
       kaminari (~> 1.0)
     language_list (1.2.1)
-    ld-patch (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
+    ld-patch (3.2.0)
+      ebnf (~> 2.2)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
     ldp (0.7.2)
       deprecation
       faraday
@@ -682,7 +680,8 @@ GEM
     llhttp-ffi (0.3.1)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    loofah (2.12.0)
+    logger (1.5.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -692,15 +691,16 @@ GEM
       rails (>= 5.0.0)
     mappy (0.1.0)
       activesupport
+    matrix (0.4.2)
     memoist (0.16.2)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
-    mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_portile2 (2.7.1)
+    minitest (5.15.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -722,8 +722,8 @@ GEM
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.12.3)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -731,7 +731,7 @@ GEM
       builder (>= 3.1.0)
       faraday
       faraday_middleware
-    oauth (0.5.6)
+    oauth (0.5.8)
     oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
@@ -755,7 +755,7 @@ GEM
     openseadragon (0.6.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
-    os (1.1.1)
+    os (1.1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -765,7 +765,7 @@ GEM
     public_suffix (4.0.6)
     pul_uv_rails (2.0.1)
     puma (3.12.6)
-    qa (5.6.0)
+    qa (5.7.0)
       activerecord-import
       deprecation
       faraday
@@ -774,7 +774,7 @@ GEM
       nokogiri (~> 1.6)
       rails (>= 5.0, < 6.2)
       rdf
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.0.8)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -804,7 +804,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
@@ -819,27 +819,26 @@ GEM
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdf (3.1.15)
-      hamster (~> 3.0)
+    rdf (3.2.3)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
-    rdf-isomorphic (3.1.1)
-      rdf (~> 3.1)
-    rdf-json (3.1.0)
-      rdf (~> 3.1)
+    rdf-aggregate-repo (3.2.0)
+      rdf (~> 3.2)
+    rdf-isomorphic (3.2.0)
+      rdf (~> 3.2)
+    rdf-json (3.2.0)
+      rdf (~> 3.2)
     rdf-microdata (3.1.1)
       htmlentities (~> 4.3)
       nokogiri (~> 1.10)
       rdf (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-n3 (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
-      sparql (~> 3.1, >= 3.1.4)
-      sxp (~> 1.1)
-    rdf-normalize (0.4.0)
-      rdf (~> 3.1)
+    rdf-n3 (3.2.0)
+      ebnf (~> 2.2)
+      rdf (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
+    rdf-normalize (0.5.0)
+      rdf (~> 3.2)
     rdf-rdfa (3.1.0)
       haml (~> 5.1)
       htmlentities (~> 4.3)
@@ -851,9 +850,9 @@ GEM
       rdf (~> 3.1)
       rdf-rdfa (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-reasoner (0.7.2)
-      rdf (~> 3.1, >= 3.1.12)
-      rdf-xsd (~> 3.1)
+    rdf-reasoner (0.8.0)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
     rdf-tabular (3.1.1)
       addressable (~> 2.3)
       bcp47 (~> 0.3, >= 0.3.3)
@@ -861,34 +860,34 @@ GEM
       rdf (~> 3.1)
       rdf-vocab (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-trig (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-turtle (~> 3.1)
-    rdf-trix (3.1.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-turtle (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
+    rdf-trig (3.2.0)
+      ebnf (~> 2.2)
+      rdf (~> 3.2)
+      rdf-turtle (~> 3.2)
+    rdf-trix (3.2.0)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-turtle (3.2.0)
+      ebnf (~> 2.3)
+      rdf (~> 3.2)
     rdf-vocab (3.1.4)
       rdf (~> 3.1)
-    rdf-xsd (3.1.1)
-      rdf (~> 3.1)
+    rdf-xsd (3.2.0)
+      rdf (~> 3.2)
       rexml (~> 3.2)
     redic (1.5.3)
       hiredis
     redis (4.1.4)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
-    redlock (1.2.1)
+    redlock (1.2.2)
       redis (>= 3.0.0, < 5.0)
     regexp_parser (2.1.1)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -903,7 +902,7 @@ GEM
       deprecation (>= 1.0.0)
       iiif-image-api (>= 0.1.0)
       railties (>= 4.2, < 7)
-    rsolr (2.3.0)
+    rsolr (2.4.0)
       builder (>= 2.1.2)
       faraday (>= 0.9.0)
     rspec-activemodel-mocks (1.1.0)
@@ -988,8 +987,9 @@ GEM
     selenium-webdriver (3.12.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    shex (0.6.1)
-      ebnf (~> 2.0)
+    shex (0.6.4)
+      ebnf (~> 2.1, >= 2.2)
+      htmlentities (~> 4.3)
       json-ld (~> 3.1)
       json-ld-preloaded (~> 3.1)
       rdf (~> 3.1)
@@ -1030,17 +1030,18 @@ GEM
       activesupport
       nokogiri
       xml-simple
-    sparql (3.1.7)
+    sparql (3.2.1)
       builder (~> 3.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.14)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql-client (~> 3.1, >= 3.1.2)
-      sxp (~> 1.1)
-    sparql-client (3.1.2)
+      ebnf (~> 2.2)
+      logger (~> 1.4)
+      rdf (~> 3.2, >= 3.2.3)
+      rdf-aggregate-repo (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql-client (~> 3.2)
+      sxp (~> 1.2, >= 1.2.1)
+    sparql-client (3.2.0)
       net-http-persistent (~> 4.0, >= 4.0.1)
-      rdf (~> 3.1)
+      rdf (~> 3.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -1057,8 +1058,9 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     ssrf_filter (1.0.7)
-    sxp (1.1.0)
-      rdf (~> 3.1)
+    sxp (1.2.1)
+      matrix
+      rdf (~> 3.2)
     sync (0.5.0)
     temple (0.8.2)
     term-ansicolor (1.7.1)
@@ -1070,7 +1072,7 @@ GEM
       sync
     tinymce-rails (4.9.11)
       railties (>= 3.1.1)
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -1089,7 +1091,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
-    unicode-types (1.6.0)
+    unicode-types (1.7.0)
     validatable (1.6.7)
     vcr (6.0.0)
     virtus (2.0.0)
@@ -1114,7 +1116,8 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xml-simple (1.1.8)
+    xml-simple (1.1.9)
+      rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -1155,7 +1158,7 @@ DEPENDENCIES
   grape_on_rails_routes
   hydra-remote_identifier!
   hydra-role-management
-  hyrax (= 2.9.4)
+  hyrax (= 2.9.6)
   jbuilder (~> 2.5)
   jquery-rails
   kaltura (= 0.1.1)
diff --git a/app/views/catalog/_search_form.html.erb b/app/views/catalog/_search_form.html.erb
index 7d59bc4c..118bf65b 100644
--- a/app/views/catalog/_search_form.html.erb
+++ b/app/views/catalog/_search_form.html.erb
@@ -35,9 +35,8 @@
               <%= link_to t("hyrax.search.form.option.my_collections.label_long"), "#",
                   data: { "search-option" => hyrax.my_collections_path, "search-label" => t("hyrax.search.form.option.my_collections.label_short") } %>
             </li>
-          <% end %>
-
-        </ul>
+          </ul>
+        <% end %>
       </div><!-- /.input-group-btn -->
     </div><!-- /.input-group -->
     

From 9123a0c8c1458eaf24621d88dc2b4747ee96e6a9 Mon Sep 17 00:00:00 2001
From: Sean Crowe <1069588+crowesn@users.noreply.github.com>
Date: Mon, 31 Jan 2022 16:28:57 -0500
Subject: [PATCH 4/8] ignore batch create mass assign warning (#962)

Co-authored-by: crowesn <crowesn@gmail.com>
---
 config/brakeman.ignore | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 config/brakeman.ignore

diff --git a/config/brakeman.ignore b/config/brakeman.ignore
new file mode 100644
index 00000000..3b1a0b5a
--- /dev/null
+++ b/config/brakeman.ignore
@@ -0,0 +1,26 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "Mass Assignment",
+      "warning_code": 70,
+      "fingerprint": "c58372ffa9750e7506995301196bc155ae5e14f7b5f01d301b8232036c8b2ca3",
+      "check_name": "MassAssignment",
+      "message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
+      "file": "app/controllers/hyrax/batch_uploads_controller.rb",
+      "line": 16,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params[:title].permit!",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Hyrax::BatchUploadsController",
+        "method": "create_update_job"
+      },
+      "user_input": null,
+      "confidence": "Medium",
+      "note": ""
+    }
+  ],
+  "updated": "2022-01-26 16:34:01 -0500",
+  "brakeman_version": "5.1.1"
+}

From fceb5e10b776648e93ddf362d704a82488b38cde Mon Sep 17 00:00:00 2001
From: Sean Crowe <1069588+crowesn@users.noreply.github.com>
Date: Thu, 3 Feb 2022 14:55:36 -0500
Subject: [PATCH 5/8] Upgrade rack, puma and browse-everything (#964)

* upgrade rack to 2.2.3

* update puma/browse-everything

Co-authored-by: crowesn <crowesn@gmail.com>
---
 Gemfile      |   6 +--
 Gemfile.lock | 134 +++++++++++++++++++++++++--------------------------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/Gemfile b/Gemfile
index c68c8770..22a05d41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,12 +11,12 @@ end
 gem 'bigdecimal', '1.3.5'
 
 # For BrowseEverything to work with Hyrax 2.x then we need to pin BE
-gem 'browse-everything', '1.0.2'
+gem 'browse-everything', '1.1.0'
 
 gem 'bulkrax', git: 'https://github.com/uclibs/bulkrax.git', ref: '4ad295999ff6c2f095ad3dc2fa67cd9a05f6b77f'
 gem 'hydra-remote_identifier', github: 'uclibs/hydra-remote_identifier', branch: 'scholar-datacite'
 gem 'kaltura', '0.1.1'
-gem 'rack', '2.0.8'
+gem 'rack', '2.2.3'
 gem 'sidekiq-limit_fetch'
 gem 'willow_sword', github: 'notch8/willow_sword'
 
@@ -28,7 +28,7 @@ gem 'rails', '~> 5.1.7'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '1.3.13'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3.8'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
diff --git a/Gemfile.lock b/Gemfile.lock
index 399b939f..dd7f669a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,10 +113,10 @@ GEM
       activesupport (>= 3.0.0)
       rdf (>= 2.0.2, < 4.0)
       rdf-vocab (>= 2.0, < 4.0)
-    active_attr (0.15.3)
-      actionpack (>= 3.0.2, < 7.0)
-      activemodel (>= 3.0.2, < 7.0)
-      activesupport (>= 3.0.2, < 7.0)
+    active_attr (0.15.4)
+      actionpack (>= 3.0.2, < 7.1)
+      activemodel (>= 3.0.2, < 7.1)
+      activesupport (>= 3.0.2, < 7.1)
     active_encode (0.8.2)
       rails
       sprockets (< 4)
@@ -154,8 +154,8 @@ GEM
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.550.0)
-    aws-sdk-core (3.125.5)
+    aws-partitions (1.551.0)
+    aws-sdk-core (3.125.6)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -216,21 +216,19 @@ GEM
     bootstrap_form (4.4.0)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    brakeman (5.1.1)
+    brakeman (5.2.1)
     breadcrumbs_on_rails (3.0.1)
-    browse-everything (1.0.2)
+    browse-everything (1.1.0)
       addressable (~> 2.5)
       aws-sdk-s3
       dropbox_api (>= 0.1.10)
       google-api-client (~> 0.23)
-      google_drive (~> 2.1)
-      googleauth (= 0.6.6)
-      puma (~> 3.11)
+      google_drive (>= 2.1, < 4)
+      googleauth (>= 0.6.6, < 1.0)
       rails (>= 4.2, < 6.0)
       ruby-box
       signet (~> 0.8)
       sprockets (~> 3.7)
-      thor (~> 0.19)
       typhoeus
     builder (3.2.4)
     bundler-audit (0.7.0.1)
@@ -268,7 +266,7 @@ GEM
       ssrf_filter (~> 1.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    clamby (1.6.6)
+    clamby (1.6.8)
     clipboard-rails (1.7.1)
     coderay (1.1.3)
     coercible (1.0.0)
@@ -308,9 +306,9 @@ GEM
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise-guests (0.7.0)
+    devise-guests (0.8.1)
       devise
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     docopt (0.5.0)
     domain_name (0.5.20190701)
@@ -422,26 +420,27 @@ GEM
     geocoder (1.7.3)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    google-api-client (0.32.1)
+    google-api-client (0.52.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
-    google_drive (2.1.3)
+      rexml
+      signet (~> 0.12)
+    google_drive (3.0.6)
       google-api-client (>= 0.11.0, < 1.0.0)
       googleauth (>= 0.5.0, < 1.0.0)
       nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.6.6)
+    googleauth (0.10.0)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.12)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    grape (1.5.3)
+      signet (~> 0.12)
+    grape (1.6.2)
       activesupport
       builder
       dry-types (>= 1.1)
@@ -454,19 +453,19 @@ GEM
       temple (>= 0.8.0)
       tilt
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     hiredis (0.6.3)
     htmlentities (4.3.4)
-    http (5.0.1)
-      addressable (~> 2.3)
+    http (5.0.4)
+      addressable (~> 2.8)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.3.0)
+      llhttp-ffi (~> 0.4.0)
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_logger (0.7.0)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -568,7 +567,7 @@ GEM
       signet
       solrizer (>= 3.4, < 5)
       tinymce-rails (~> 4.1)
-    i18n (1.9.0)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iiif-image-api (0.2.0)
@@ -593,16 +592,16 @@ GEM
       railties (>= 3.2.16)
     json (2.6.1)
     json-canonicalization (0.3.0)
-    json-ld (3.1.10)
+    json-ld (3.2.0)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
+      json-canonicalization (~> 0.3)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
-    json-ld-preloaded (3.1.6)
-      json-ld (~> 3.1)
-      rdf (~> 3.1)
+      multi_json (~> 1.15)
+      rack (~> 2.2)
+      rdf (~> 3.2)
+    json-ld-preloaded (3.2.0)
+      json-ld (~> 3.2)
+      rdf (~> 3.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     jwt (2.3.0)
@@ -677,7 +676,7 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    llhttp-ffi (0.3.1)
+    llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
     logger (1.5.0)
@@ -756,15 +755,16 @@ GEM
       rails (> 3.2.0)
     orm_adapter (0.5.0)
     os (1.1.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     parslet (2.0.0)
     posix-spawn (0.3.15)
     power_converter (0.1.2)
     public_suffix (4.0.6)
     pul_uv_rails (2.0.1)
-    puma (3.12.6)
+    puma (4.3.10)
+      nio4r (~> 2.0)
     qa (5.7.0)
       activerecord-import
       deprecation
@@ -775,7 +775,7 @@ GEM
       rails (>= 5.0, < 6.2)
       rdf
     racc (1.6.0)
-    rack (2.0.8)
+    rack (2.2.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-openid (1.4.2)
@@ -814,7 +814,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -832,7 +832,7 @@ GEM
       nokogiri (~> 1.10)
       rdf (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-n3 (3.2.0)
+    rdf-n3 (3.2.1)
       ebnf (~> 2.2)
       rdf (~> 3.2)
       sparql (~> 3.2)
@@ -882,7 +882,7 @@ GEM
       redis (>= 3.0.4)
     redlock (1.2.2)
       redis (>= 3.0.0, < 5.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -909,15 +909,15 @@ GEM
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-rails (4.1.2)
@@ -930,8 +930,8 @@ GEM
       rspec-support (~> 3.10)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
+    rspec-support (3.10.3)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.85.1)
       parallel (~> 1.10)
@@ -987,15 +987,15 @@ GEM
     selenium-webdriver (3.12.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    shex (0.6.4)
-      ebnf (~> 2.1, >= 2.2)
+    shex (0.7.1)
+      ebnf (~> 2.2)
       htmlentities (~> 4.3)
-      json-ld (~> 3.1)
-      json-ld-preloaded (~> 3.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
+      json-ld (~> 3.2)
+      json-ld-preloaded (~> 3.2)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
     show_me_the_cookies (5.0.1)
@@ -1065,10 +1065,10 @@ GEM
     temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.29.1)
+    tins (1.31.0)
       sync
     tinymce-rails (4.9.11)
       railties (>= 3.1.1)
@@ -1089,8 +1089,8 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8)
+    unicode-display_width (1.8.0)
     unicode-types (1.7.0)
     validatable (1.6.7)
     vcr (6.0.0)
@@ -1098,8 +1098,8 @@ GEM
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    warden (1.2.9)
+      rack (>= 2.0.9)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
@@ -1131,7 +1131,7 @@ DEPENDENCIES
   bixby (>= 1.0.0)
   bootstrap-sass (~> 3.4.1)
   brakeman
-  browse-everything (= 1.0.2)
+  browse-everything (= 1.1.0)
   bulkrax!
   bundler (~> 1.17)
   bundler-audit
@@ -1167,8 +1167,8 @@ DEPENDENCIES
   omniauth-openid
   omniauth-shibboleth
   orcid!
-  puma (~> 3.11)
-  rack (= 2.0.8)
+  puma (~> 4.3.8)
+  rack (= 2.2.3)
   rails (~> 5.1.7)
   rails-controller-testing
   rest-client

From 7324b596b9229e5ddd6156ca04bd2b39bb737924 Mon Sep 17 00:00:00 2001
From: Thomas Scherz <scherztc@ucmail.uc.edu>
Date: Tue, 21 Sep 2021 12:52:04 -0400
Subject: [PATCH 6/8] Overwrites Hyrax Resource Synce Controller.

---
 .rubocop.yml                                  |  1 +
 .../hyrax/resource_sync_controller.rb         | 56 +++++++++++++++
 .../hyrax/resource_sync_controller_spec.rb    | 71 +++++++++++++++++++
 3 files changed, 128 insertions(+)
 create mode 100644 app/controllers/hyrax/resource_sync_controller.rb
 create mode 100644 spec/controllers/hyrax/resource_sync_controller_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 6c7f08ee..1105cce6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -200,6 +200,7 @@ RSpec/ExampleLength:
     - 'app/api/**/*'
     - 'spec/api/*'
     - 'spec/unit/permission_spec.rb'
+    - 'spec/controllers/hyrax/resource_sync_controller_spec.rb'
 
 RSpec/ExpectActual:
   Enabled: false
diff --git a/app/controllers/hyrax/resource_sync_controller.rb b/app/controllers/hyrax/resource_sync_controller.rb
new file mode 100644
index 00000000..274b74da
--- /dev/null
+++ b/app/controllers/hyrax/resource_sync_controller.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+class Hyrax::ResourceSyncController < ApplicationController
+  include ActionController::RequestForgeryProtection
+  protect_from_forgery with: :null_session
+
+  # We don't need locale here
+  def default_url_options
+    super.except(:locale)
+  end
+
+  def source_description
+    render_from_cache_as_xml(:source_description)
+  end
+
+  def capability_list
+    render_from_cache_as_xml(:capability_list)
+  end
+
+  def change_list
+    render_from_cache_as_xml(:change_list)
+  end
+
+  def resource_list
+    render_from_cache_as_xml(:resource_list)
+  end
+
+  private
+
+  def build_change_list
+    Hyrax::ResourceSync::ChangeListWriter.new(capability_list_url: hyrax.capability_list_url,
+                                              resource_host: request.host).write
+  end
+
+  def build_resource_list
+    Hyrax::ResourceSync::ResourceListWriter.new(capability_list_url: hyrax.capability_list_url,
+                                                resource_host: request.host).write
+  end
+
+  def build_capability_list
+    Hyrax::ResourceSync::CapabilityListWriter.new(resource_list_url: hyrax.resource_list_url,
+                                                  change_list_url: hyrax.change_list_url,
+                                                  description_url: hyrax.source_description_url).write
+  end
+
+  def build_source_description
+    Hyrax::ResourceSync::SourceDescriptionWriter.new(capability_list_url: hyrax.capability_list_url).write
+  end
+
+  def render_from_cache_as_xml(resource_sync_type)
+    # Caching based on host, for multi-tenancy support
+    body = Rails.cache.fetch("#{resource_sync_type}_#{request.host}", expires_in: 1.week) do
+      send("build_#{resource_sync_type}")
+    end
+    render body: body, content_type: 'application/xml'
+  end
+end
diff --git a/spec/controllers/hyrax/resource_sync_controller_spec.rb b/spec/controllers/hyrax/resource_sync_controller_spec.rb
new file mode 100644
index 00000000..f421ca23
--- /dev/null
+++ b/spec/controllers/hyrax/resource_sync_controller_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+RSpec.describe Hyrax::ResourceSyncController do
+  routes { Hyrax::Engine.routes }
+  before do
+    Rails.cache.clear
+  end
+
+  describe "source_description" do
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Hyrax::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Hyrax::ResourceSync::SourceDescriptionWriter).to receive(:new).with(capability_list_url: capability_list).and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :source_description
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+
+  describe "capability_list" do
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Hyrax::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Hyrax::ResourceSync::CapabilityListWriter).to receive(:new).with(resource_list_url: "http://test.host/resourcelist", change_list_url: "http://test.host/changelist", description_url: "http://test.host/.well-known/resourcesync").and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :capability_list
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+
+  describe "resource_list" do
+    before do
+      Rails.cache.clear
+    end
+
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Hyrax::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Hyrax::ResourceSync::ResourceListWriter).to receive(:new).with(capability_list_url: capability_list, resource_host: "test.host").and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :resource_list
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+
+  describe "change_list" do
+    before do
+      Rails.cache.clear
+    end
+
+    let(:writer) { double }
+    let(:document) { '<xml>' }
+    let(:capability_list) { Hyrax::Engine.routes.url_helpers.capability_list_url(host: 'test.host') }
+
+    it "is successful" do
+      allow(Hyrax::ResourceSync::ChangeListWriter).to receive(:new).with(capability_list_url: capability_list, resource_host: "test.host").and_return(writer)
+      expect(writer).to receive(:write).and_return(document)
+      get :change_list
+      expect(response.content_type).to eq 'application/xml'
+      expect(response.body).to eq document
+    end
+  end
+end

From df7efceeeae38991483844d725a0522024b60587 Mon Sep 17 00:00:00 2001
From: LISA HAITZ <lisa.haitz@uc.edu>
Date: Fri, 28 Jan 2022 16:50:03 -0500
Subject: [PATCH 7/8] New Contact Form- Iframe embed

This is the new form created from jotform.
---
 app/views/hyrax/contact_form/new2.html.erb | 97 ++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 app/views/hyrax/contact_form/new2.html.erb

diff --git a/app/views/hyrax/contact_form/new2.html.erb b/app/views/hyrax/contact_form/new2.html.erb
new file mode 100644
index 00000000..0825b817
--- /dev/null
+++ b/app/views/hyrax/contact_form/new2.html.erb
@@ -0,0 +1,97 @@
+
+    <iframe
+      id="JotFormIFrame-220205071955146"
+      title="Scholar at UC Contact Form"
+      onload="window.parent.scrollTo(0,0)"
+      allowtransparency="true"
+      allowfullscreen="true"
+      allow="geolocation; microphone; camera"
+      src="https://form.jotform.com/220205071955146"
+      frameborder="0"
+      style="
+      min-width: 100%;
+      height:539px;
+      border:none;"
+      scrolling="no"
+    >
+    </iframe>
+    <script type="text/javascript">
+      var ifr = document.getElementById("JotFormIFrame-220205071955146");
+      if (ifr) {
+        var src = ifr.src;
+        var iframeParams = [];
+        if (window.location.href && window.location.href.indexOf("?") > -1) {
+          iframeParams = iframeParams.concat(window.location.href.substr(window.location.href.indexOf("?") + 1).split('&'));
+        }
+        if (src && src.indexOf("?") > -1) {
+          iframeParams = iframeParams.concat(src.substr(src.indexOf("?") + 1).split("&"));
+          src = src.substr(0, src.indexOf("?"))
+        }
+        iframeParams.push("isIframeEmbed=1");
+        ifr.src = src + "?" + iframeParams.join('&');
+      }
+      window.handleIFrameMessage = function(e) {
+        if (typeof e.data === 'object') { return; }
+        var args = e.data.split(":");
+        if (args.length > 2) { iframe = document.getElementById("JotFormIFrame-" + args[(args.length - 1)]); } else { iframe = document.getElementById("JotFormIFrame"); }
+        if (!iframe) { return; }
+        switch (args[0]) {
+          case "scrollIntoView":
+            iframe.scrollIntoView();
+            break;
+          case "setHeight":
+            iframe.style.height = args[1] + "px";
+            break;
+          case "collapseErrorPage":
+            if (iframe.clientHeight > window.innerHeight) {
+              iframe.style.height = window.innerHeight + "px";
+            }
+            break;
+          case "reloadPage":
+            window.location.reload();
+            break;
+          case "loadScript":
+            if( !window.isPermitted(e.origin, ['jotform.com', 'jotform.pro']) ) { break; }
+            var src = args[1];
+            if (args.length > 3) {
+                src = args[1] + ':' + args[2];
+            }
+            var script = document.createElement('script');
+            script.src = src;
+            script.type = 'text/javascript';
+            document.body.appendChild(script);
+            break;
+          case "exitFullscreen":
+            if      (window.document.exitFullscreen)        window.document.exitFullscreen();
+            else if (window.document.mozCancelFullScreen)   window.document.mozCancelFullScreen();
+            else if (window.document.mozCancelFullscreen)   window.document.mozCancelFullScreen();
+            else if (window.document.webkitExitFullscreen)  window.document.webkitExitFullscreen();
+            else if (window.document.msExitFullscreen)      window.document.msExitFullscreen();
+            break;
+        }
+        var isJotForm = (e.origin.indexOf("jotform") > -1) ? true : false;
+        if(isJotForm && "contentWindow" in iframe && "postMessage" in iframe.contentWindow) {
+          var urls = {"docurl":encodeURIComponent(document.URL),"referrer":encodeURIComponent(document.referrer)};
+          iframe.contentWindow.postMessage(JSON.stringify({"type":"urls","value":urls}), "*");
+        }
+      };
+      window.isPermitted = function(originUrl, whitelisted_domains) {
+        var url = document.createElement('a');
+        url.href = originUrl;
+        var hostname = url.hostname;
+        var result = false;
+        if( typeof hostname !== 'undefined' ) {
+          whitelisted_domains.forEach(function(element) {
+              if( hostname.slice((-1 * element.length - 1)) === '.'.concat(element) ||  hostname === element ) {
+                  result = true;
+              }
+          });
+          return result;
+        }
+      };
+      if (window.addEventListener) {
+        window.addEventListener("message", handleIFrameMessage, false);
+      } else if (window.attachEvent) {
+        window.attachEvent("onmessage", handleIFrameMessage);
+      }
+      </script>

From 418cced0a0c5302c05b55bdc9d5883c609a00082 Mon Sep 17 00:00:00 2001
From: Thomas Scherz <scherztc@ucmail.uc.edu>
Date: Mon, 31 Jan 2022 16:25:40 -0500
Subject: [PATCH 8/8] Cleans up contact form for jot form.

---
 .env.development                              |   4 -
 .env.test                                     |   6 +-
 app/assets/stylesheets/hyrax.scss             |   5 -
 .../hyrax/contact_form_controller.rb          |  60 --------
 app/models/hyrax/contact_form.rb              |  36 -----
 .../hyrax/contact_form/_directions.html.erb   |   1 -
 app/views/hyrax/contact_form/new.html.erb     | 142 ++++++++++++------
 app/views/hyrax/contact_form/new2.html.erb    |  97 ------------
 config/initializers/hyrax.rb                  |   4 +-
 config/initializers/load_captcha_configs.rb   |   3 -
 config/locales/hyrax.en.yml                   |   4 -
 config/recaptcha.yml                          |  11 --
 .../hyrax/contact_form_controller_spec.rb     | 122 ---------------
 spec/features/hyrax/contact_form_spec.rb      |  25 +--
 14 files changed, 102 insertions(+), 418 deletions(-)
 delete mode 100644 app/controllers/hyrax/contact_form_controller.rb
 delete mode 100644 app/models/hyrax/contact_form.rb
 delete mode 100644 app/views/hyrax/contact_form/_directions.html.erb
 delete mode 100644 app/views/hyrax/contact_form/new2.html.erb
 delete mode 100644 config/initializers/load_captcha_configs.rb
 delete mode 100644 config/recaptcha.yml
 delete mode 100644 spec/controllers/hyrax/contact_form_controller_spec.rb

diff --git a/.env.development b/.env.development
index ba127777..38019897 100644
--- a/.env.development
+++ b/.env.development
@@ -44,10 +44,6 @@ SCHOLAR_ANALYTICS_PRIVKEY_PATH=analytics_privkey_path
 SCHOLAR_ANALYTICS_PRIVKEY_SECRET=analytics_privkey_secret
 SCHOLAR_ANALYTICS_CLIENT_EMAIL=analytics_client_email
 
-# Google Re-captcha
-SCHOLAR_CAPTCHA_SITE_KEY=captcha_site_key
-SCHOLAR_CAPTCHA_SECRET_KEY=captcha_secret_key
-
 # ORCID
 ORCID_AUTHORIZE_URL=change_me
 ORCID_APP_ID=change_me
diff --git a/.env.test b/.env.test
index 80fc5ec4..adf36754 100644
--- a/.env.test
+++ b/.env.test
@@ -43,10 +43,6 @@ SCHOLAR_ANALYTICS_PRIVKEY_PATH=analytics_privkey_path
 SCHOLAR_ANALYTICS_PRIVKEY_SECRET=analytics_privkey_secret
 SCHOLAR_ANALYTICS_CLIENT_EMAIL=analytics_client_email
 
-# Google Re-captcha
-SCHOLAR_CAPTCHA_SITE_KEY=captcha_site_key
-SCHOLAR_CAPTCHA_SECRET_KEY=captcha_secret_key
-
 # ORCID
 ORCID_AUTHORIZE_URL=change_me
 ORCID_APP_ID=change_me
@@ -77,4 +73,4 @@ SCHOLAR_DOI_URL=https://api.test.datacite.org/dois
 API_KEY={ :development => 'testKey'}
 
 # XRay max log size in MB, must be an integer value
-SCHOLAR_XRAY_MAX_LOG_SIZE=10
\ No newline at end of file
+SCHOLAR_XRAY_MAX_LOG_SIZE=10
diff --git a/app/assets/stylesheets/hyrax.scss b/app/assets/stylesheets/hyrax.scss
index e55f2d1f..2bf36c6d 100644
--- a/app/assets/stylesheets/hyrax.scss
+++ b/app/assets/stylesheets/hyrax.scss
@@ -32,11 +32,6 @@
   padding-bottom: 10px;
 }
 
-.g-recaptcha {
-  margin-bottom: 20px;
-}
-
-
 div.profile a.btn-primary {
   margin-bottom: 20px;
 }
diff --git a/app/controllers/hyrax/contact_form_controller.rb b/app/controllers/hyrax/contact_form_controller.rb
deleted file mode 100644
index aa599ab1..00000000
--- a/app/controllers/hyrax/contact_form_controller.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-# frozen_string_literal: false
-
-module Hyrax
-  class ContactFormController < ApplicationController
-    extend ActiveSupport::Concern
-    before_action :build_contact_form
-
-    def new; end
-
-    def create
-      # not spam and a valid form
-      if @contact_form.valid? && passes_captcha_or_is_logged_in?
-        Hyrax::ContactMailer.contact(@contact_form).deliver_now
-        flash.now[:notice] = 'Thank you for your message!'
-        after_deliver
-        @contact_form = ContactForm.new
-      else
-        flash.now[:error] = 'Sorry, this message was not sent successfully. '
-        flash.now[:error] << 'You must complete the Captcha to confirm the form. ' unless passes_captcha_or_is_logged_in?
-        flash.now[:error] << @contact_form.errors.full_messages.map(&:to_s).join(", ")
-      end
-      render :new
-    rescue RuntimeError => exception
-      handle_create_exception(exception)
-    end
-
-    def handle_create_exception(exception)
-      logger.error("Contact form failed to send: #{exception.inspect}")
-      flash.now[:error] = 'Sorry, this message was not delivered.'
-      render :new
-    end
-
-    # Override this method if you want to perform additional operations
-    # when a email is successfully sent, such as sending a confirmation
-    # response to the user.
-    def after_deliver; end
-
-    def verify_google_recaptcha(key, response)
-      status = `curl "https://www.google.com/recaptcha/api/siteverify?secret=#{key}&response=#{response}"`
-      hash = JSON.parse(status)
-      hash["success"] == true
-    end
-
-    protected
-
-    def build_contact_form
-      @contact_form = Hyrax::ContactForm.new(contact_form_params)
-    end
-
-    def contact_form_params
-      return {} unless params.key?(:contact_form)
-      params.require(:contact_form).permit(:contact_method, :category, :name, :email, :subject, :message)
-    end
-
-    def passes_captcha_or_is_logged_in?
-      return true if current_user.present?
-      verify_google_recaptcha(CAPTCHA_SERVER['secret_key'], params["g-recaptcha-response"])
-    end
-  end
-end
diff --git a/app/models/hyrax/contact_form.rb b/app/models/hyrax/contact_form.rb
deleted file mode 100644
index c9335800..00000000
--- a/app/models/hyrax/contact_form.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  class ContactForm
-    include ActiveModel::Model
-    attr_accessor :contact_method, :category, :name, :email, :subject, :message
-    validates :email, :name, :subject, :message, presence: true
-    validates :email, format: /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i, allow_blank: true
-
-    # - can't use this without ActiveRecord::Base validates_inclusion_of :category, in: self.class.issue_types_for_locale
-
-    # They should not have filled out the `contact_method' field. That's there to prevent spam.
-    def spam?
-      contact_method.present?
-    end
-
-    # Declare the e-mail headers. It accepts anything the mail method
-    # in ActionMailer accepts.
-    def headers
-      {
-        subject: "#{Hyrax.config.subject_prefix} #{subject}",
-        to: Hyrax.config.contact_email,
-        from: email
-      }
-    end
-
-    def self.issue_types_for_locale
-      [
-        I18n.t('hyrax.contact_form.issue_types.depositing'),
-        I18n.t('hyrax.contact_form.issue_types.changing'),
-        I18n.t('hyrax.contact_form.issue_types.browsing'),
-        I18n.t('hyrax.contact_form.issue_types.reporting'),
-        I18n.t('hyrax.contact_form.issue_types.general')
-      ]
-    end
-  end
-end
diff --git a/app/views/hyrax/contact_form/_directions.html.erb b/app/views/hyrax/contact_form/_directions.html.erb
deleted file mode 100644
index eb6b09da..00000000
--- a/app/views/hyrax/contact_form/_directions.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= t('hyrax.contact_form.notice_html', href: link_to(t("hyrax.contact_form.help_resources_href"), main_app.help_path)) %>
diff --git a/app/views/hyrax/contact_form/new.html.erb b/app/views/hyrax/contact_form/new.html.erb
index a8df4174..0825b817 100644
--- a/app/views/hyrax/contact_form/new.html.erb
+++ b/app/views/hyrax/contact_form/new.html.erb
@@ -1,47 +1,97 @@
-<script src='https://www.google.com/recaptcha/api.js'></script>
-<div class="alert alert-info">
-  <%= render 'directions' %>
-</div>
 
-<h1>
-    <%= t('hyrax.contact_form.header') %>
-</h1>
-
-<% if user_signed_in? %>
-  <% nm = current_user.name %>
-  <% em = current_user.email %>
-<% else %>
-  <% nm = '' %>
-  <% em = '' %>
-<% end %>
-
-<%= form_for @contact_form, url: hyrax.contact_form_index_path,
-                            html: { class: 'form-horizontal' } do |f| %>
-  <%= f.text_field :contact_method, class: 'hide' %>
-
-  <div class="form-group">
-    <%= f.label :name, t('hyrax.contact_form.name_label'), class: "col-sm-2 control-label" %>
-    <div class="col-sm-10"><%= f.text_field :name, value: nm, class: 'form-control', required: true %></div>
-  </div>
-
-  <div class="form-group">
-    <%= f.label :email, t('hyrax.contact_form.email_label'), class: "col-sm-2 control-label" %>
-    <div class="col-sm-10"><%= f.text_field :email, value: em, class: 'form-control', required: true %></div>
-  </div>
-
-  <div class="form-group">
-    <%= f.label :subject, t('hyrax.contact_form.subject_label'), class: "col-sm-2 control-label" %>
-    <div class="col-sm-10"><%= f.text_field :subject, class: 'form-control', required: true %></div>
-  </div>
-
-  <div class="form-group">
-    <%= f.label :message, t('hyrax.contact_form.message_label'), class: "col-sm-2 control-label" %>
-    <div class="col-sm-10"><%= f.text_area :message, rows: 4, class: 'form-control', required: true %></div>
-  </div>
-
-  <% if current_user.blank? %>
-    <div class="g-recaptcha" data-sitekey= "<%=CAPTCHA_SERVER['site_key']%>"></div>
-  <% end %>
-
-  <%= f.submit value: t('hyrax.contact_form.button_label'), class: "btn btn-primary" %>
-<% end %>
+    <iframe
+      id="JotFormIFrame-220205071955146"
+      title="Scholar at UC Contact Form"
+      onload="window.parent.scrollTo(0,0)"
+      allowtransparency="true"
+      allowfullscreen="true"
+      allow="geolocation; microphone; camera"
+      src="https://form.jotform.com/220205071955146"
+      frameborder="0"
+      style="
+      min-width: 100%;
+      height:539px;
+      border:none;"
+      scrolling="no"
+    >
+    </iframe>
+    <script type="text/javascript">
+      var ifr = document.getElementById("JotFormIFrame-220205071955146");
+      if (ifr) {
+        var src = ifr.src;
+        var iframeParams = [];
+        if (window.location.href && window.location.href.indexOf("?") > -1) {
+          iframeParams = iframeParams.concat(window.location.href.substr(window.location.href.indexOf("?") + 1).split('&'));
+        }
+        if (src && src.indexOf("?") > -1) {
+          iframeParams = iframeParams.concat(src.substr(src.indexOf("?") + 1).split("&"));
+          src = src.substr(0, src.indexOf("?"))
+        }
+        iframeParams.push("isIframeEmbed=1");
+        ifr.src = src + "?" + iframeParams.join('&');
+      }
+      window.handleIFrameMessage = function(e) {
+        if (typeof e.data === 'object') { return; }
+        var args = e.data.split(":");
+        if (args.length > 2) { iframe = document.getElementById("JotFormIFrame-" + args[(args.length - 1)]); } else { iframe = document.getElementById("JotFormIFrame"); }
+        if (!iframe) { return; }
+        switch (args[0]) {
+          case "scrollIntoView":
+            iframe.scrollIntoView();
+            break;
+          case "setHeight":
+            iframe.style.height = args[1] + "px";
+            break;
+          case "collapseErrorPage":
+            if (iframe.clientHeight > window.innerHeight) {
+              iframe.style.height = window.innerHeight + "px";
+            }
+            break;
+          case "reloadPage":
+            window.location.reload();
+            break;
+          case "loadScript":
+            if( !window.isPermitted(e.origin, ['jotform.com', 'jotform.pro']) ) { break; }
+            var src = args[1];
+            if (args.length > 3) {
+                src = args[1] + ':' + args[2];
+            }
+            var script = document.createElement('script');
+            script.src = src;
+            script.type = 'text/javascript';
+            document.body.appendChild(script);
+            break;
+          case "exitFullscreen":
+            if      (window.document.exitFullscreen)        window.document.exitFullscreen();
+            else if (window.document.mozCancelFullScreen)   window.document.mozCancelFullScreen();
+            else if (window.document.mozCancelFullscreen)   window.document.mozCancelFullScreen();
+            else if (window.document.webkitExitFullscreen)  window.document.webkitExitFullscreen();
+            else if (window.document.msExitFullscreen)      window.document.msExitFullscreen();
+            break;
+        }
+        var isJotForm = (e.origin.indexOf("jotform") > -1) ? true : false;
+        if(isJotForm && "contentWindow" in iframe && "postMessage" in iframe.contentWindow) {
+          var urls = {"docurl":encodeURIComponent(document.URL),"referrer":encodeURIComponent(document.referrer)};
+          iframe.contentWindow.postMessage(JSON.stringify({"type":"urls","value":urls}), "*");
+        }
+      };
+      window.isPermitted = function(originUrl, whitelisted_domains) {
+        var url = document.createElement('a');
+        url.href = originUrl;
+        var hostname = url.hostname;
+        var result = false;
+        if( typeof hostname !== 'undefined' ) {
+          whitelisted_domains.forEach(function(element) {
+              if( hostname.slice((-1 * element.length - 1)) === '.'.concat(element) ||  hostname === element ) {
+                  result = true;
+              }
+          });
+          return result;
+        }
+      };
+      if (window.addEventListener) {
+        window.addEventListener("message", handleIFrameMessage, false);
+      } else if (window.attachEvent) {
+        window.attachEvent("onmessage", handleIFrameMessage);
+      }
+      </script>
diff --git a/app/views/hyrax/contact_form/new2.html.erb b/app/views/hyrax/contact_form/new2.html.erb
deleted file mode 100644
index 0825b817..00000000
--- a/app/views/hyrax/contact_form/new2.html.erb
+++ /dev/null
@@ -1,97 +0,0 @@
-
-    <iframe
-      id="JotFormIFrame-220205071955146"
-      title="Scholar at UC Contact Form"
-      onload="window.parent.scrollTo(0,0)"
-      allowtransparency="true"
-      allowfullscreen="true"
-      allow="geolocation; microphone; camera"
-      src="https://form.jotform.com/220205071955146"
-      frameborder="0"
-      style="
-      min-width: 100%;
-      height:539px;
-      border:none;"
-      scrolling="no"
-    >
-    </iframe>
-    <script type="text/javascript">
-      var ifr = document.getElementById("JotFormIFrame-220205071955146");
-      if (ifr) {
-        var src = ifr.src;
-        var iframeParams = [];
-        if (window.location.href && window.location.href.indexOf("?") > -1) {
-          iframeParams = iframeParams.concat(window.location.href.substr(window.location.href.indexOf("?") + 1).split('&'));
-        }
-        if (src && src.indexOf("?") > -1) {
-          iframeParams = iframeParams.concat(src.substr(src.indexOf("?") + 1).split("&"));
-          src = src.substr(0, src.indexOf("?"))
-        }
-        iframeParams.push("isIframeEmbed=1");
-        ifr.src = src + "?" + iframeParams.join('&');
-      }
-      window.handleIFrameMessage = function(e) {
-        if (typeof e.data === 'object') { return; }
-        var args = e.data.split(":");
-        if (args.length > 2) { iframe = document.getElementById("JotFormIFrame-" + args[(args.length - 1)]); } else { iframe = document.getElementById("JotFormIFrame"); }
-        if (!iframe) { return; }
-        switch (args[0]) {
-          case "scrollIntoView":
-            iframe.scrollIntoView();
-            break;
-          case "setHeight":
-            iframe.style.height = args[1] + "px";
-            break;
-          case "collapseErrorPage":
-            if (iframe.clientHeight > window.innerHeight) {
-              iframe.style.height = window.innerHeight + "px";
-            }
-            break;
-          case "reloadPage":
-            window.location.reload();
-            break;
-          case "loadScript":
-            if( !window.isPermitted(e.origin, ['jotform.com', 'jotform.pro']) ) { break; }
-            var src = args[1];
-            if (args.length > 3) {
-                src = args[1] + ':' + args[2];
-            }
-            var script = document.createElement('script');
-            script.src = src;
-            script.type = 'text/javascript';
-            document.body.appendChild(script);
-            break;
-          case "exitFullscreen":
-            if      (window.document.exitFullscreen)        window.document.exitFullscreen();
-            else if (window.document.mozCancelFullScreen)   window.document.mozCancelFullScreen();
-            else if (window.document.mozCancelFullscreen)   window.document.mozCancelFullScreen();
-            else if (window.document.webkitExitFullscreen)  window.document.webkitExitFullscreen();
-            else if (window.document.msExitFullscreen)      window.document.msExitFullscreen();
-            break;
-        }
-        var isJotForm = (e.origin.indexOf("jotform") > -1) ? true : false;
-        if(isJotForm && "contentWindow" in iframe && "postMessage" in iframe.contentWindow) {
-          var urls = {"docurl":encodeURIComponent(document.URL),"referrer":encodeURIComponent(document.referrer)};
-          iframe.contentWindow.postMessage(JSON.stringify({"type":"urls","value":urls}), "*");
-        }
-      };
-      window.isPermitted = function(originUrl, whitelisted_domains) {
-        var url = document.createElement('a');
-        url.href = originUrl;
-        var hostname = url.hostname;
-        var result = false;
-        if( typeof hostname !== 'undefined' ) {
-          whitelisted_domains.forEach(function(element) {
-              if( hostname.slice((-1 * element.length - 1)) === '.'.concat(element) ||  hostname === element ) {
-                  result = true;
-              }
-          });
-          return result;
-        }
-      };
-      if (window.addEventListener) {
-        window.addEventListener("message", handleIFrameMessage, false);
-      } else if (window.attachEvent) {
-        window.attachEvent("onmessage", handleIFrameMessage);
-      }
-      </script>
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 83f82b56..a8d248bc 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -28,10 +28,10 @@
   # config.admin_set_predicate = ::RDF::DC.isPartOf
 
   # Email recipient of messages sent via the contact form
-  config.contact_email = "scholar@uc.edu"
+  # config.contact_email = "scholar@uc.edu"
 
   # Text prefacing the subject entered in the contact form
-  config.subject_prefix = "Scholar@UC Contact form:"
+  # config.subject_prefix = "Scholar@UC Contact form:"
 
   # How many notifications should be displayed on the dashboard
   # config.max_notifications_for_dashboard = 5
diff --git a/config/initializers/load_captcha_configs.rb b/config/initializers/load_captcha_configs.rb
deleted file mode 100644
index 8fbf89e4..00000000
--- a/config/initializers/load_captcha_configs.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-CAPTCHA_SERVER = YAML.safe_load(ERB.new(File.read(Rails.root.join('config', 'recaptcha.yml'))).result)[Rails.env]
diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml
index 17e86122..81a39842 100644
--- a/config/locales/hyrax.en.yml
+++ b/config/locales/hyrax.en.yml
@@ -98,10 +98,6 @@ en:
         results_per_page: Results per page
         sort_by: Sort by
         works_in_collection: Items in this Collection
-    contact_form:
-      header: Contact the Scholar@UC Team
-      notice_html: 'Please us this form to send questions, feedback, or report a problem to the Scholar@UC team. You can also check %{href} for more information'
-      help_resources_href: 'Help Resources'
     file_sets:
       show_details:
         fixity_check: Fixity Check  
diff --git a/config/recaptcha.yml b/config/recaptcha.yml
deleted file mode 100644
index bb64e721..00000000
--- a/config/recaptcha.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# stores ReCaptcha image server url
-
-development:
-  site_key:   <%= ENV["SCHOLAR_CAPTCHA_SITE_KEY"] %>
-  secret_key: <%= ENV["SCHOLAR_CAPTCHA_SECRET_KEY"] %>
-test:
-  site_key:   <%= ENV["SCHOLAR_CAPTCHA_SITE_KEY"] %>
-  secret_key: <%= ENV["SCHOLAR_CAPTCHA_SECRET_KEY"] %>
-production:
-  site_key:   <%= ENV["SCHOLAR_CAPTCHA_SITE_KEY"] %>
-  secret_key: <%= ENV["SCHOLAR_CAPTCHA_SECRET_KEY"] %>
diff --git a/spec/controllers/hyrax/contact_form_controller_spec.rb b/spec/controllers/hyrax/contact_form_controller_spec.rb
deleted file mode 100644
index ecce82cf..00000000
--- a/spec/controllers/hyrax/contact_form_controller_spec.rb
+++ /dev/null
@@ -1,122 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Hyrax::ContactFormController do
-  routes { Hyrax::Engine.routes }
-  let(:user) { create(:user) }
-  let(:required_params) do
-    {
-      category: "Depositing content",
-      name: "Gandalf the Grey",
-      email: "gandalf@middle.earth",
-      subject: "When in doubt,",
-      message: "Follow your nose!"
-    }
-  end
-
-  describe 'while user is unauthenticated' do
-    it 'successfully allows reCaptcha' do
-      described_class.any_instance.stub(:verify_google_recaptcha).and_return(true)
-      Hyrax::ContactMailer.any_instance.stub(:mail).and_return(true)
-      post :create, params: { contact_form: required_params }
-      expect(flash[:notice]).to match(/Thank you for your message/)
-    end
-
-    it 'fails on reCaptcha failure' do
-      post :create, params: { contact_form: required_params }
-      expect(flash[:error]).to match(/You must complete the Captcha to confirm the form/)
-    end
-  end
-
-  describe "while user is authenticated" do
-    before { sign_in(user) }
-
-    describe "#new" do
-      subject { response }
-
-      before { get :new }
-      it { is_expected.to be_success }
-    end
-
-    describe "#create" do
-      subject { flash }
-
-      before { post :create, params: { contact_form: params } }
-      context "with the required parameters" do
-        let(:params) { required_params }
-
-        its(:notice) { is_expected.to eq("Thank you for your message!") }
-      end
-
-      context "without a name" do
-        let(:params)  { required_params.except(:name) }
-
-        its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Name can't be blank") }
-      end
-
-      context "without an email" do
-        let(:params)  { required_params.except(:email) }
-
-        its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Email can't be blank") }
-      end
-
-      context "without a subject" do
-        let(:params)  { required_params.except(:subject) }
-
-        its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Subject can't be blank") }
-      end
-
-      context "without a message" do
-        let(:params)  { required_params.except(:message) }
-
-        its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Message can't be blank") }
-      end
-
-      context "with an invalid email" do
-        let(:params)  { required_params.merge(email: "bad-wolf") }
-
-        its([:error]) { is_expected.to eq("Sorry, this message was not sent successfully. Email is invalid") }
-      end
-    end
-
-    describe "#after_deliver" do
-      context "with a successful email" do
-        it "calls #after_deliver" do
-          expect(controller).to receive(:after_deliver)
-          post :create, params: { contact_form: required_params }
-        end
-      end
-      context "with an unsuccessful email" do
-        it "does not call #after_deliver" do
-          expect(controller).not_to receive(:after_deliver)
-          post :create, params: { contact_form: required_params.except(:email) }
-        end
-      end
-    end
-
-    describe "test configuration values" do
-      context "for the contact form" do
-        it "check contact email" do
-          expect(Hyrax.config.contact_email).to eq 'scholar@uc.edu'
-        end
-        it "check form name" do
-          expect(Hyrax.config.subject_prefix).to eq 'Scholar@UC Contact form:'
-        end
-      end
-    end
-
-    context "when encoutering a RuntimeError" do
-      let(:logger) { double(info?: true) }
-
-      before do
-        allow(controller).to receive(:logger).and_return(logger)
-        allow(Hyrax::ContactMailer).to receive(:contact).and_raise(RuntimeError)
-      end
-      it "is logged via Rails" do
-        expect(logger).to receive(:error).with("Contact form failed to send: #<RuntimeError: RuntimeError>")
-        post :create, params: { contact_form: required_params }
-      end
-    end
-  end
-end
diff --git a/spec/features/hyrax/contact_form_spec.rb b/spec/features/hyrax/contact_form_spec.rb
index 2ef2bb2a..779753d2 100644
--- a/spec/features/hyrax/contact_form_spec.rb
+++ b/spec/features/hyrax/contact_form_spec.rb
@@ -3,31 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe "Sending an email via the contact form", type: :feature do
-  let(:user) { create(:user) }
-
-  describe "with unauthenticated user" do
+  describe "with Jot Iframe" do
     it "shows recaptcha dialog" do
       visit '/'
       click_link "Contact", match: :first
-      expect(page).to have_css('div.g-recaptcha')
-    end
-  end
-
-  describe "with authenticated user" do
-    before { sign_in(user) }
-
-    it "sends mail" do
-      visit '/'
-      click_link "Contact", match: :first
-      expect(page).to have_content "Contact the Scholar@UC Team"
-      expect(page).to have_link "Help Resources"
-      expect(page).not_to have_content "Issue Type"
-      fill_in "Your Name", with: "Test McPherson"
-      fill_in "Your Email", with: "archivist1@example.com"
-      fill_in "Message", with: "I am contacting you regarding ScholarSphere."
-      fill_in "Subject", with: "My Subject is Cool"
-      click_button "Send"
-      expect(page).to have_content "Thank you for your message!"
+      expect(page).to have_css('iframe')
+      page.html.should include('</iframe>')
     end
   end
 end