add ability to preupload presentations (#409)

* add ability to preupload presentations

* update gemfile.lock

Author: Mariam05

.gitignore

@@ -46,3 +46,5 @@ yarn-debug.log*
 
 /vendor/bundle/
 /yarn.lock
+
+.idea

Gemfile

@@ -77,6 +77,7 @@ group :test do
 end
 
 group :production do
+  gem 'google-cloud-storage', '~> 1.8', require: false
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -110,3 +111,6 @@ gem 'logging', '~> 2.3'
 gem 'lograge', '~> 0.14.0'
 gem 'remote_syslog_logger'
 gem 'syslog'
+
+# So we can upload files to Digital Ocean Spaces (S3-compatible)
+gem 'aws-sdk-s3', require: false

Gemfile.lock

@@ -79,6 +79,24 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.1132.0)
+    aws-sdk-core (3.227.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.167.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
     bigbluebutton-api-ruby (1.9.1)
       childprocess (>= 1.0.1)
@@ -119,7 +137,10 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
+    declarative (0.0.20)
     diff-lcs (1.5.1)
+    digest-crc (0.7.0)
+      rake (>= 12.0.0, < 14.0.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
     dotenv (3.1.6)
@@ -141,29 +162,69 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.17.0)
-    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     globalid (1.2.1)
       activesupport (>= 6.1)
+    google-apis-core (0.18.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
+      mini_mime (~> 1.0)
+      mutex_m
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+    google-apis-iamcredentials_v1 (0.24.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.54.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (2.3.1)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.56.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-core (~> 0.13)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
+      google-cloud-core (~> 1.6)
+      googleauth (~> 1.9)
+      mini_mime (~> 1.0)
+    google-logging-utils (0.2.0)
+    googleauth (1.14.0)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
     hashdiff (1.1.2)
     hashie (5.0.0)
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
+    httpclient (2.9.0)
+      mutex_m
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.9.0)
+    jmespath (1.6.2)
+    json (2.13.2)
     jwt (2.9.3)
       base64
     language_server-protocol (3.17.0.3)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     little-plugger (1.1.4)
-    logger (1.6.3)
+    logger (1.7.0)
     logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
@@ -188,7 +249,6 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1203)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.8)
     minitest (5.25.4)
     multi_json (1.15.0)
     multi_xml (0.7.1)
@@ -207,10 +267,9 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -229,6 +288,7 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
+    os (1.1.4)
     pagy (9.3.3)
     parallel (1.26.3)
     parser (3.3.6.0)
@@ -242,7 +302,7 @@ GEM
     puma (5.6.9)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.14)
+    rack (2.2.17)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
@@ -294,14 +354,19 @@ GEM
     remote_syslog_logger (1.0.4)
       syslog_protocol
     repost (0.4.2)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
     request_store (1.7.0)
       rack (>= 1.4)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.4.0)
+    retriable (3.1.2)
+    rexml (3.4.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -343,7 +408,7 @@ GEM
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -361,6 +426,11 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.0)
+    signet (0.20.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -393,13 +463,15 @@ GEM
     tins (1.37.1)
       bigdecimal
       sync
+    trailblazer-option (0.1.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
+    uber (0.1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (3.1.2)
@@ -436,12 +508,13 @@ GEM
     zeitwerk (2.6.18)
 
 PLATFORMS
-  ruby
   x86_64-linux
+  x86_64-linux-musl
 
 DEPENDENCIES
   action-cable-testing
   activerecord-session_store (>= 2.1.0)
+  aws-sdk-s3
   bigbluebutton-api-ruby (~> 1.9.1)
   bigdecimal
   byebug
@@ -451,6 +524,7 @@ DEPENDENCIES
   dotenv-rails (>= 3.1.1)
   factory_bot_rails (>= 6.4.3)
   faker
+  google-cloud-storage (~> 1.8)
   jbuilder (~> 2.11, >= 2.11.5)
   json
   listen (>= 3.0.5, < 3.2)

app/controllers/concerns/bbb_helper.rb

@@ -32,7 +32,7 @@ def bbb
     @bbb_credentials ||= initialize_bbb_credentials
     bbb_url = remove_slash(@bbb_credentials.endpoint(@chosen_room.tenant))
     bbb_secret = @bbb_credentials.secret(@chosen_room.tenant)
-    BigBlueButton::BigBlueButtonApi.new(bbb_url, bbb_secret, '1.0', Rails.logger)
+    BigBlueButton::BigBlueButtonApi.new(bbb_url, bbb_secret, '1.8', Rails.logger)
   rescue StandardError => e
     logger.error("Error in creating BBB object: #{e}")
     raise RoomsError::CustomError.new(code: 500, message: 'There was an error initializing BigBlueButton credentials', key: 'BigBlueButton Error')
@@ -90,8 +90,23 @@ def create_meeting
     add_ext_params('create', create_options)
     logger.debug("[BbbHelper] create_options for room #{@chosen_room.id}: #{create_options}")
 
-    # Send the create request.
-    bbb.create_meeting(@chosen_room.name, @chosen_room.handler, create_options)
+    begin
+      if @chosen_room.presentation.attached?
+        modules = BigBlueButton::BigBlueButtonModules.new
+        url = rails_blob_url(@chosen_room.presentation).gsub('&', '%26')
+        name = @chosen_room.presentation.filename
+        logger.info("Support: Room #{@chosen_room.id} starting using presentation #{name}: #{url}")
+        modules.add_presentation(:url, url, name)
+        # Send the create request.
+        bbb.create_meeting(@chosen_room.name, @chosen_room.handler, create_options, modules)
+      else
+        # Send the create request.
+        bbb.create_meeting(@chosen_room.name, @chosen_room.handler, create_options)
+      end
+    rescue BigBlueButton::BigBlueButtonException => e
+      Rails.logger.error("BigBlueButton failed on create: #{e.key}: #{e.message}")
+      raise e
+    end
   end
 
   # Perform ends meeting for the current room.

app/controllers/rooms_controller.rb

@@ -118,6 +118,25 @@ def update
     end
   end
 
+  def remove_presentation
+    begin
+      @room.presentation.purge
+
+      flash[:success] = "I18n.t('room.preupload_remove_success')"
+    rescue StandardError => e
+      logger.error("Support: Error in removing room presentation: #{e}")
+      flash[:alert] = "I18n.t('room.preupload_remove_error')"
+    end
+
+    redirect_back(fallback_location: room_path(@room))
+  end
+
+  # Returns a list of allowed file types
+  def allowed_file_types
+    Rails.configuration.allowed_file_types
+  end
+  helper_method :allowed_file_types
+
   # DELETE /rooms/1
   # DELETE /rooms/1.json
   def destroy
@@ -264,6 +283,12 @@ def revoke_shared_code
 
   private
 
+  # Checks if the file extension is allowed
+  def valid_file_type
+    Rails.configuration.allowed_file_types.split(',')
+         .include?(File.extname(room_params[:presentation].original_filename.downcase))
+  end
+
   def set_error(error, status, domain = 'room')
     @room = @user = nil
     @error = {
@@ -413,6 +438,7 @@ def room_params
       :code,
       :shared_code,
       :use_shared_code,
+      :presentation,
       settings: Room.stored_attributes[:settings]
     )
   end

app/models/room.rb

@@ -18,6 +18,8 @@
 class Room < ApplicationRecord
   include BrokerHelper
 
+  has_one_attached :presentation
+
   before_save :default_values
 
   store_accessor :settings, %i[lockSettingsDisableCam lockSettingsDisableMic lockSettingsDisablePrivateChat lockSettingsDisablePublicChat lockSettingsDisableNote]

app/views/rooms/_form.html.erb

@@ -70,6 +70,37 @@
   <%= form.hidden_field :moderator, value: @room.moderator %>
   <%= form.hidden_field :viewer, value: @room.viewer %> 
 
+  <!-- Pre-upload Presentation -->
+  <details>
+    <summary class="text-black"><%= t('default.room.settings.preuploadPresentation') %> 
+      <%= image_tag('lock.svg', width: '15', height: '15', alt: 'lock', class: 'lock-icon-placement lock-visibility', title: 'Disabled because "Use Shared Code" is enabled') %>
+    </summary>
+
+    <% if @room.presentation.attached? %>
+      <div class="block  p-6 w-full border border-gray-200 rounded-lg shadow-md bg-gray-100 dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700">
+      <span><b><%= t('default.room.preupload.current') %>: </b></span>
+        <%= link_to "#{@room.presentation.filename}", rails_blob_url(@room.presentation, disposition: 'attachment'), target: '_blank', class: 'hover:bg-transparent hover:text-bbb-blue' %>
+        <%= link_to remove_presentation_path(@room, :launch_nonce => @launch_nonce), method: :post, class: "px-4 py-3 font-sans text-xl hover:bg-transparent check-disabled" do %>
+             <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 hover:stroke-bbb-blue" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+                <path stroke-linecap="round" stroke-linejoin="round" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+              </svg>
+        <% end %>
+      </div>
+    <% else %>
+      <div class="mb-5">
+        <label for="presentation_upload" class="flex w-full items-center text-sm border border-gray-300 rounded-lg cursor-pointer bg-gray-50 hover:bg-gray-100 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 text-left overflow-hidden">
+          <span class=" text-white px-4 py-3 flex-shrink-0 w-36 text-center bg-blue-950 hover:bg-blue-950/80">
+            Upload File
+          </span>
+          <%= form.file_field :presentation, id: 'presentation_upload', class: "w-full text-gray-500 truncate", accept: allowed_file_types %>
+        </label>
+      </div>
+    <% end %>
+
+  </details>
+  
+  <hr>
+
   <% @lockSettings = @room.settings.select { |key, value| key.start_with?("lock")} %>
   <% @recordingSettings = @room.settings.select { |key, value| Room::RECORDING_SETTINGS.include?(key.to_sym)} %>
   <% @roomSettings = @room.settings.select { |key, value| Room::ROOM_SETTINGS.include?(key.to_sym)} %>

config/application.rb

@@ -78,5 +78,9 @@ class Application < Rails::Application
     config.handler_legacy_api_enabled = (config.handler_legacy_api_endpoint && config.handler_legacy_api_secret)
 
     config.handler_legacy_new_room_enabled = ENV.fetch('HANDLER_LEGACY_NEW_ROOM_ENABLED', 'true').casecmp?('true')
+
+    # File types allowed in preupload presentation
+    config.allowed_file_types = '.doc,.docx,.ppt,.pptx,.pdf,.xls,.xlsx,.txt,.rtf,.odt,.ods,.odp,.odg,.odc,.odi,.jpg,.jpeg,.png'
+    config.active_storage.routes_prefix = '/rooms/rails/active_storage'
   end
 end

config/environments/development.rb

@@ -49,7 +49,7 @@
   config.action_controller.perform_caching = true
 
   # Store uploaded files on the local file system (see config/storage.yml for options)
-  config.active_storage.service = :local
+  config.active_storage.service = ENV.fetch('CLOUD_PROVIDER', 'local').downcase.to_sym
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false