Merge branch 'master' of github.com:bigbluebutton/bbb-lti-broker into…

… merge-upstream-changes

Gemfile

@@ -10,7 +10,7 @@ gem 'rails', '~> 6.1', '>= 6.1.7.5'
 # Use postgres as the database for Active Record
 gem 'pg', '>= 0.4.4'
 # Use Puma as the app server
-gem 'puma', '>= 6.3.1'
+gem 'puma', '>= 6.4.2'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6.0.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -54,7 +54,7 @@ gem 'ims-lti', git: 'https://github.com/blindsidenetworks/ims-lti.git', tag: 'v2
 
 gem 'simple_oauth', git: 'https://github.com/blindsidenetworks/simple_oauth.git', tag: 'v0.3.1.1'
 
-gem 'activerecord-session_store', '>=2.1.0'
+gem 'activerecord-session_store', '>= 2.1.0'
 
 # frontend
 gem 'bootstrap', '~> 4.5.0'

Gemfile.lock

@@ -248,8 +248,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0808)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
-    minitest (5.19.0)
+    mini_portile2 (2.8.5)
+    minitest (5.20.0)
     minitest-stub_any_instance (1.0.3)
     mono_logger (1.1.2)
     multi_json (1.15.0)
@@ -268,10 +268,10 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nokogiri (1.15.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.5-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.14)
     oauthenticator (1.4.1)
@@ -290,7 +290,7 @@ GEM
     psych (5.1.0)
       stringio
     public_suffix (5.0.3)
-    puma (6.3.1)
+    puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.1)
@@ -334,7 +334,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -392,7 +392,7 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    rubocop (1.56.1)
+    rubocop (1.56.2)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -452,7 +452,7 @@ GEM
       tins (~> 1.0)
     terser (1.1.17)
       execjs (>= 0.3.0, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.2.0)
     timeout (0.4.0)
     tins (1.32.1)
@@ -485,7 +485,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   ruby
@@ -517,7 +517,7 @@ DEPENDENCIES
   oauthenticator (~> 1.4, >= 1.4.1)
   pg (>= 0.4.4)
   prometheus_exporter
-  puma (>= 6.3.1)
+  puma (>= 6.4.2)
   rails (~> 6.1, >= 6.1.7.5)
   rails_admin (~> 3.0)
   rails_lti2_provider!

config/cable.yml

@@ -6,5 +6,4 @@ test:
 
 production:
   adapter: <%= ENV['CABLE_ADAPTER'] || 'async' %>
-  # adapter: redis
-  # url: redis://localhost:6379/1
+  channel_prefix: <%= ENV.fetch("REDIS_PREFIX") { "bbb-lti-broker" } %>

config/environments/development.rb

@@ -27,7 +27,7 @@
   config.cache_classes = false
 
   # Whitelist IPs
-  config.web_console.allowed_ips = '10.0.0.0/16'
+  config.web_console.allowed_ips = '0.0.0.0/0'
 
   # Do not eager load code on boot.
   config.eager_load = false

dotenv

@@ -43,6 +43,9 @@ CONSUMER_SECRET=secret
 ## Database name for production can be omitted from DATABASE_URL
 ## DB_NAME=database_production
 
+## Enable redis for actioncable
+# REDIS_URL=redis://myuser:mypass@localhost
+REDIS_PREFIX=bbb-lti-broker
 
 # Only needed for Docker Compose.
 ## Change DOCKER_REPO when using a repo other than bigbluebutton

lib/tasks/db_apps.rake

@@ -81,10 +81,8 @@ namespace :db do
         puts("App '#{args[:name]}' does not exist, it can not be deleted")
         exit(1)
       end
-      blti_apps.each do |app|
-        app.delete
-        puts("App '#{args[:name]}' was deleted")
-      end
+      blti_apps.each(&:destroy)
+      puts("Apps with name '#{args[:name]}' were successfully destroyed")
     rescue StandardError => e
       puts(e.backtrace)
       exit(1)