Merge branch 'master' into master-legacy

berkmancenter · Aug 30, 2019 · 15d6a83 · 15d6a83
2 parents dbbd77b + c567ba6
commit 15d6a83
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -35,7 +35,10 @@ def active_advanced_search_parameters?
   end
 
   def can_see_full_notice_version?(notice)
-    return true if can?(:view_full_version, notice)
+    whitelisted_notices = (ENV['WHITELISTED_NOTICES_FULL'] || []).split(',')
+
+    return true if can?(:view_full_version, notice) ||
+                   whitelisted_notices.include?(notice.id.to_s)
 
     TokenUrl.valid?(params[:access_token], notice)
   end

diff --git a/spec/integration/viewing_notices.spec.rb b/spec/integration/viewing_notices.spec.rb
@@ -56,6 +56,14 @@
     check_full_works_urls
   end
 
+  scenario 'as an anonymous user viewing whitelisted notice' do
+    ENV['WHITELISTED_NOTICES_FULL'] = "1234,#{Notice.last.id}"
+
+    visit notice_url(Notice.last)
+
+    check_full_works_urls
+  end
+
   def check_full_works_urls
     within('#works') do
       expect(page).to have_content 'http://www.example.com/original_work.pdf'