diff --git a/.env.development b/.env.development index 5a3f515c3..c87c5dc64 100644 --- a/.env.development +++ b/.env.development @@ -42,4 +42,4 @@ MCONF_EMAIL_TRACK_CLICKED=true # MCONF_OMNIAUTH_FACEBOOK_SECRET='yourfacebooksecret' # Flag to use authentication on playback url -# MCONF_PLAYBACK_URL_AUTH='true' +# MCONF_PLAYBACK_URL_AUTH=true diff --git a/Gemfile.lock b/Gemfile.lock index 746c43261..41a6596ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT GIT remote: https://github.com/mconf/bigbluebutton_rails.git - revision: 820bfeb38ca23de2a89b6cc37f850d626f67e527 + revision: fedfa6010a660e31e81cc27197063b4d60f6f0a5 branch: master specs: bigbluebutton_rails (2.2.0) diff --git a/config/application.rb b/config/application.rb index 9aaa0ddb5..4d14bc7c8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -126,6 +126,9 @@ class Application < Rails::Application # Set if to false to use the old model based on the `record` flag on the `create` API call. config.per_user_record_permissions = ENV['MCONF_PER_USER_RECORD_PERMISSIONS'] == 'true' + # Authenticate playback URLs for recordings + config.playback_url_authentication = ENV['MCONF_PLAYBACK_URL_AUTH'] == 'true' + # Themes: configure assets paths here! # config.assets.paths << Rails.root.join("app", "assets", "themes", "my-theme", "stylesheets") # config.assets.paths << Rails.root.join("app", "assets", "themes", "my-theme", "images") diff --git a/config/initializers/bigbluebutton_rails.rb b/config/initializers/bigbluebutton_rails.rb index 3b7187b8b..ae3b5b435 100644 --- a/config/initializers/bigbluebutton_rails.rb +++ b/config/initializers/bigbluebutton_rails.rb @@ -6,7 +6,7 @@ BigbluebuttonRails.configure do |config| config.guest_support = true - config.playback_url_authentication = ENV['MCONF_PLAYBACK_URL_AUTH'] == 'true' + config.playback_url_authentication = true #Rails.application.config.playback_url_authentication # Set the invitation URL to the full URL of the room config.get_invitation_url = Proc.new do |room| diff --git a/db/migrate/20171114142537_bigbluebutton_rails_to230.rb b/db/migrate/20171114142537_bigbluebutton_rails_to230.rb index 1706c25d1..4a73143d5 100644 --- a/db/migrate/20171114142537_bigbluebutton_rails_to230.rb +++ b/db/migrate/20171114142537_bigbluebutton_rails_to230.rb @@ -2,10 +2,12 @@ class BigbluebuttonRailsTo230 < ActiveRecord::Migration def up rename_column :bigbluebutton_rooms, :param, :slug rename_column :bigbluebutton_servers, :param, :slug + add_column :bigbluebutton_recordings, :recording_users, :text end def down rename_column :bigbluebutton_servers, :slug, :param rename_column :bigbluebutton_rooms, :slug, :param + remove_column :bigbluebutton_recordings, :recording_users end end diff --git a/db/schema.rb b/db/schema.rb index 10e6047e2..98414ab31 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -120,15 +120,16 @@ t.string "recordid" t.string "meetingid" t.string "name" - t.boolean "published", default: false - t.boolean "available", default: true + t.boolean "published", default: false + t.boolean "available", default: true t.datetime "created_at" t.datetime "updated_at" t.text "description" t.integer "meeting_id" - t.integer "size", limit: 8, default: 0 - t.decimal "start_time", precision: 14, scale: 0 - t.decimal "end_time", precision: 14, scale: 0 + t.integer "size", limit: 8, default: 0 + t.decimal "start_time", precision: 14, scale: 0 + t.decimal "end_time", precision: 14, scale: 0 + t.text "recording_users" end add_index "bigbluebutton_recordings", ["recordid"], name: "index_bigbluebutton_recordings_on_recordid", unique: true, using: :btree