Merge branch 'master' into snyk-fix-5d1b3c5f489825ed2c9971fa9afb2dc9

Gemfile

@@ -41,7 +41,7 @@ gem 'redis', '~> 4.2'
 gem 'jwt', '~> 2.2.2'
 gem 'oauth', '~> 0.5.1'
 
-gem 'doorkeeper', '~> 5.6.7'
+gem 'doorkeeper', '~> 5.6.8'
 gem 'repost', '~> 0.3.8'
 
 gem 'lodash-rails'

Gemfile.lock

@@ -154,7 +154,7 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.6.7)
+    doorkeeper (5.6.8)
       railties (>= 5)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
@@ -467,7 +467,7 @@ DEPENDENCIES
   byebug
   coffee-rails (~> 5.0, >= 5.0.0)
   coveralls
-  doorkeeper (~> 5.6.7)
+  doorkeeper (~> 5.6.8)
   dotenv-rails
   faraday
   font-awesome-sass (~> 6.4.0)

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.whitelisted_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

@@ -33,6 +33,7 @@ RAILS_SERVE_STATIC_FILES=true
 
 ## 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)