diff --git a/Gemfile b/Gemfile
index 70d09d03344a671b67b225f620c7f1ee2987d256..edec4b7f812caf2af0cb6b27f81ebd7c14e8f631 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'devise'
gem 'devise-i18n'
gem 'cancancan'
gem 'simple_form'
-gem 'simple_form_password_with_hints'
+gem 'simple_form_password_with_hints'#, path: '../simple_form_password_with_hints'
gem 'simple_form_bs5_file_input'#, path: '../simple_form_bs5_file_input'
gem 'enum_help'
gem 'enum-i18n'
diff --git a/Gemfile.lock b/Gemfile.lock
index d0e534202e69a3c7090556051aab303ee7a7787c..75035b78d269be03c6c4fe9f976243d541bde854 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -330,7 +330,11 @@ GEM
simple_form_bs5_file_input (0.0.3)
rails
simple_form
+<<<<<<< HEAD
+ simple_form_password_with_hints (0.0.4)
+=======
simple_form_password_with_hints (0.0.3)
+>>>>>>> 353f910894520e230e8ba00dd407158a1901b980
rails
simple_form
sinatra (2.1.0)
diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb
index eac3c8285a7b9cbfe9873ea92db139369f64e8ab..95edecc5134a3d398f39a27749fcb539805100d8 100644
--- a/app/models/communication/website.rb
+++ b/app/models/communication/website.rb
@@ -37,7 +37,11 @@ class Communication::Website < ApplicationRecord
end
def domain_url
- "https://#{ domain }"
+ "https://#{domain}"
+ end
+
+ def uploads_url
+ "#{domain_url}/wp-content/uploads"
end
def import!
diff --git a/app/models/communication/website/imported/with_rich_text.rb b/app/models/communication/website/imported/with_rich_text.rb
index 693eea20e238eda0d693c1df04fca0f0a65ddefc..a1ac94cdaca424f38ac642a8ab04cc07fffff8bc 100644
--- a/app/models/communication/website/imported/with_rich_text.rb
+++ b/app/models/communication/website/imported/with_rich_text.rb
@@ -5,7 +5,7 @@ module Communication::Website::Imported::WithRichText
def rich_text_with_attachments(text)
fragment = Nokogiri::HTML.fragment(text)
- images = fragment.css("img[src*=\"#{website.website.domain}\"]")
+ images = fragment.css("img[src*=\"#{website.website.uploads_url}\"]")
images.each do |image|
begin
url = image.attr('src')
diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb
index 6dbbde9097d0ed07b5064f8c99de0e3102e20efe..b389b460a43c48f1e2bc0828b6ac870f261ca7a1 100644
--- a/app/models/research/journal/article.rb
+++ b/app/models/research/journal/article.rb
@@ -11,7 +11,7 @@
# text :text
# title :string
# created_at :datetime not null
-# updated_at :date not null
+# updated_at :datetime not null
# research_journal_id :uuid not null
# research_journal_volume_id :uuid
# university_id :uuid not null
diff --git a/app/services/wordpress.rb b/app/services/wordpress.rb
index 927d5844416fcf2bfd27f3c986731b6172da6b2d..6eda98ebd7d11869424d9c327015387aac068d64 100644
--- a/app/services/wordpress.rb
+++ b/app/services/wordpress.rb
@@ -12,12 +12,18 @@ class Wordpress
def self.clean_html(html)
# Relaxed config : https://github.com/rgrove/sanitize/blob/main/lib/sanitize/config/relaxed.rb
+ # iframe attributes from MDN : https://developer.mozilla.org/fr/docs/Web/HTML/Element/iframe
fragment = Sanitize.fragment(html, Sanitize::Config.merge(Sanitize::Config::RELAXED,
attributes: Sanitize::Config::RELAXED[:attributes].merge({
all: Sanitize::Config::RELAXED[:attributes][:all].dup.delete('class'),
- 'a' => Sanitize::Config::RELAXED[:attributes]['a'].dup.delete('rel')
+ 'a' => Sanitize::Config::RELAXED[:attributes]['a'].dup.delete('rel'),
+ 'iframe' => [
+ 'allow', 'allowfullscreen', 'allowpaymentrequest', 'csp', 'height', 'loading',
+ 'name', 'referrerpolicy', 'sandbox', 'src', 'srcdoc', 'width', 'align',
+ 'frameborder', 'longdesc', 'marginheight', 'marginwidth', 'scrolling'
+ ]
}),
- elements: Set.new(Sanitize::Config::RELAXED[:elements]).delete('div'),
+ elements: Set.new(Sanitize::Config::RELAXED[:elements]).delete('div') + ['iframe'],
whitespace_elements: {
'div' => { :before => "", :after => "" }
}
diff --git a/app/views/application/_bugsnag.html.erb b/app/views/application/_bugsnag.html.erb
index 11eccb31e7e8a0420355c1208dec1efd7bdb81ef..9847d93b66881498989b2da4fd3977202e86e777 100644
--- a/app/views/application/_bugsnag.html.erb
+++ b/app/views/application/_bugsnag.html.erb
@@ -5,6 +5,11 @@
apiKey: "<%= j ENV['BUGSNAG_JAVASCRIPT_KEY'] %>",
releaseStage: "<%= j ENV['APPLICATION_ENV'] %>"
});
+ Bugsnag.addOnError(function (event) {
+ if (event.originalError === 'ResizeObserver loop limit exceeded') {
+ return false;
+ }
+ });
<% if user_signed_in? %>
Bugsnag.setUser("<%= j current_user.id %>", "<%= j current_user.email %>", "<%= j current_user.to_s %>");
<% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 2fa016e40a00457d3e4f11a005ff62b253637121..3b75d9b9f394c2c1f2e1f9c1611697d822dbdb7b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -287,7 +287,7 @@ ActiveRecord::Schema.define(version: 2021_10_26_142142) do
t.uuid "research_journal_id", null: false
t.uuid "research_journal_volume_id"
t.datetime "created_at", precision: 6, null: false
- t.date "updated_at", null: false
+ t.datetime "updated_at", precision: 6, null: false
t.uuid "updated_by_id"
t.text "abstract"
t.text "references"
diff --git a/test/controllers/university/schools_controller_test.rb b/test/controllers/university/schools_controller_test.rb
deleted file mode 100644
index cebe7f55a5bdc06fcd9c08ed034b1dc15fa303fc..0000000000000000000000000000000000000000
--- a/test/controllers/university/schools_controller_test.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require "test_helper"
-
-class University::SchoolsControllerTest < ActionDispatch::IntegrationTest
- setup do
- @university_school = university_schools(:one)
- end
-
- test "should get index" do
- get university_schools_url
- assert_response :success
- end
-
- test "should get new" do
- get new_university_school_url
- assert_response :success
- end
-
- test "should create university_school" do
- assert_difference('University::School.count') do
- post university_schools_url, params: { university_school: { address: @university_school.address, city: @university_school.city, country: @university_school.country, latitude: @university_school.latitude, longitude: @university_school.longitude, name: @university_school.name, university_id: @university_school.university_id, zipcode: @university_school.zipcode } }
- end
-
- assert_redirected_to university_school_url(University::School.last)
- end
-
- test "should show university_school" do
- get university_school_url(@university_school)
- assert_response :success
- end
-
- test "should get edit" do
- get edit_university_school_url(@university_school)
- assert_response :success
- end
-
- test "should update university_school" do
- patch university_school_url(@university_school), params: { university_school: { address: @university_school.address, city: @university_school.city, country: @university_school.country, latitude: @university_school.latitude, longitude: @university_school.longitude, name: @university_school.name, university_id: @university_school.university_id, zipcode: @university_school.zipcode } }
- assert_redirected_to university_school_url(@university_school)
- end
-
- test "should destroy university_school" do
- assert_difference('University::School.count', -1) do
- delete university_school_url(@university_school)
- end
-
- assert_redirected_to university_schools_url
- end
-end
diff --git a/test/fixtures/university/schools.yml b/test/fixtures/university/schools.yml
deleted file mode 100644
index b6652d0a125c108e1971eb272513858472a21172..0000000000000000000000000000000000000000
--- a/test/fixtures/university/schools.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
- university: one
- name: MyString
- address: MyString
- zipcode: MyString
- city: MyString
- country: MyString
- latitude: 1.5
- longitude: 1.5
-
-two:
- university: two
- name: MyString
- address: MyString
- zipcode: MyString
- city: MyString
- country: MyString
- latitude: 1.5
- longitude: 1.5
diff --git a/test/models/university/school_test.rb b/test/models/university/school_test.rb
deleted file mode 100644
index f27e5f1bc3f59599f98bd9da8a352812f7af9c03..0000000000000000000000000000000000000000
--- a/test/models/university/school_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require "test_helper"
-
-class University::SchoolTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/models/wordpress_test.rb b/test/models/wordpress_test.rb
index 24a52105065998323c288470a1937e894eb23424..8ab63b607b573857e7b79040e48b339d81c14740 100644
--- a/test/models/wordpress_test.rb
+++ b/test/models/wordpress_test.rb
@@ -61,6 +61,7 @@ class WordpressTest < ActiveSupport::TestCase
end
test "authorize iframes" do
-
+ assert_equal "<figure><iframe loading=\"lazy\" title=\"Le Bachelor Universitaire de Technologie, qu'est-ce que c'est ? - LES IUT\" width=\"640\" height=\"360\" src=\"https://www.youtube.com/embed/5xbeKHi0txk?feature=oembed\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen=\"\"></iframe></figure>",
+ Wordpress.clean_html('<figure class="wp-block-embed is-type-video is-provider-youtube wp-block-embed-youtube wp-embed-aspect-16-9 wp-has-aspect-ratio"><div class="wp-block-embed__wrapper"><iframe loading="lazy" title="Le Bachelor Universitaire de Technologie, qu'est-ce que c'est ? - LES IUT" width="640" height="360" src="https://www.youtube.com/embed/5xbeKHi0txk?feature=oembed" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div></figure>')
end
end