forked from External/greenlight
Merge pull request #175 from joshua-arts/webhooks
Add active meetings on landing page.
This commit is contained in:
commit
a2f2f7f44c
|
@ -0,0 +1,159 @@
|
||||||
|
// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
|
||||||
|
//
|
||||||
|
// Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify it under the
|
||||||
|
// terms of the GNU Lesser General Public License as published by the Free Software
|
||||||
|
// Foundation; either version 3.0 of the License, or (at your option) any later
|
||||||
|
// version.
|
||||||
|
//
|
||||||
|
// BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
// PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License along
|
||||||
|
// with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
// Handles live updating and initial population of the previous meetings and active meetings lists on
|
||||||
|
// the landing page using custom Actioncable events.
|
||||||
|
|
||||||
|
MEETINGS = {}
|
||||||
|
LOADING_DELAY = 1250 // milliseconds.
|
||||||
|
|
||||||
|
updatePreviousMeetings = function(){
|
||||||
|
$("ul.previously-joined li").each(function(idx, li) {
|
||||||
|
previous_meeting = $(li);
|
||||||
|
if(Object.keys(MEETINGS).indexOf(previous_meeting.text()) > -1){
|
||||||
|
previous_meeting.remove()
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
handleUser = function(data, n){
|
||||||
|
if(data['role'] == 'MODERATOR'){
|
||||||
|
MEETINGS[data['meeting']]['moderators'] += n
|
||||||
|
} else {
|
||||||
|
MEETINGS[data['meeting']]['participants'] += n
|
||||||
|
}
|
||||||
|
updateMeetingText(MEETINGS[data['meeting']])
|
||||||
|
}
|
||||||
|
|
||||||
|
updateMeetingText = function(meeting){
|
||||||
|
$('#' + meeting['name'].replace(' ', '_')).html('<a>' + meeting['name'] + '</a> <i>(' +
|
||||||
|
meeting['participants'] + ((meeting['participants'] == 1) ? ' user, ' : ' users, ') +
|
||||||
|
meeting['moderators'] + ((meeting['moderators'] == 1) ? ' mod)' : ' mods)'))
|
||||||
|
}
|
||||||
|
|
||||||
|
initialPopulate = function(){
|
||||||
|
$.get(window.location.origin + '/rooms/' + $('body').data('current-user') + '/request', function(data){
|
||||||
|
meetings = data['meetings']
|
||||||
|
for(var i = 0; i < meetings.length; i++){
|
||||||
|
name = meetings[i]['meetingName']
|
||||||
|
participants = parseInt(meetings[i]['participantCount'])
|
||||||
|
moderators = parseInt(meetings[i]['moderatorCount'])
|
||||||
|
// Create meeting.
|
||||||
|
MEETINGS[name] = {'name': name,
|
||||||
|
'participants': participants - moderators,
|
||||||
|
'moderators': moderators}
|
||||||
|
if(isPreviouslyJoined(name)){
|
||||||
|
renderActiveMeeting(MEETINGS[name])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).done(function(){
|
||||||
|
// Remove from previous meetings if they are active.
|
||||||
|
updatePreviousMeetings();
|
||||||
|
$('.hidden-list').show();
|
||||||
|
$('.fa-spinner').hide();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
isPreviouslyJoined = function(meeting){
|
||||||
|
joinedMeetings = localStorage.getItem('joinedRooms-' + $('body').data('current-user')).split(',');
|
||||||
|
return joinedMeetings.indexOf(meeting) >= 0
|
||||||
|
}
|
||||||
|
|
||||||
|
renderActiveMeeting = function(m){
|
||||||
|
var meeting_item = $('<li id = ' + m['name'].replace(' ', '_') + '><a>' + m['name'] + '</a>' +
|
||||||
|
' <i>(' + m['participants'] + ((m['participants'] == 1) ? ' user, ' : ' users, ') +
|
||||||
|
m['moderators'] + ((m['moderators'] == 1) ? ' mod)' : ' mods)') + '</i>' + '</li>')
|
||||||
|
$('.actives').append(meeting_item);
|
||||||
|
|
||||||
|
// Set up join on click.
|
||||||
|
meeting_item.click(function(){
|
||||||
|
joinMeeting(name);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
removeActiveMeeting = function(meeting){
|
||||||
|
$('#' + meeting['name'].replace(' ', '_')).remove()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Directly join a meeting from active meetings.
|
||||||
|
joinMeeting = function(meeting_name){
|
||||||
|
var name = $('.meeting-user-name').val();
|
||||||
|
Meeting.getInstance().setUserName(localStorage.getItem('lastJoinedName'));
|
||||||
|
Meeting.getInstance().setMeetingId(meeting_name);
|
||||||
|
|
||||||
|
// a user name is set, join the user into the session
|
||||||
|
if (name !== undefined && name !== null) {
|
||||||
|
var jqxhr = Meeting.getInstance().getJoinMeetingResponse();
|
||||||
|
if (jqxhr) {
|
||||||
|
jqxhr.done(function(data) {
|
||||||
|
if (data.messageKey === 'wait_for_moderator') {
|
||||||
|
waitForModerator(Meeting.getInstance().getURL());
|
||||||
|
} else {
|
||||||
|
$(location).attr("href", data.response.join_url);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
jqxhr.fail(function(xhr, status, error) {
|
||||||
|
console.info("meeting join failed");
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
$('.meeting-user-name').parent().addClass('has-error');
|
||||||
|
}
|
||||||
|
|
||||||
|
// if not user name was set it means we must ask for a name
|
||||||
|
} else {
|
||||||
|
$(location).attr("href", Meeting.getInstance().getURL());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only need to register for logged in users.
|
||||||
|
$(document).on('turbolinks:load', function(){
|
||||||
|
if($('body').data('current-user')){
|
||||||
|
|
||||||
|
MEETINGS = {}
|
||||||
|
$('.actives').empty();
|
||||||
|
|
||||||
|
if(!App.messages){
|
||||||
|
App.messages = App.cable.subscriptions.create('RefreshMeetingsChannel', {
|
||||||
|
received: function(data) {
|
||||||
|
console.log('Recieved ' + data['method'] + ' action for ' + data['meeting'] + '.')
|
||||||
|
if(isPreviouslyJoined(data['meeting'])){
|
||||||
|
if(data['method'] == 'create'){
|
||||||
|
// Create an empty meeting.
|
||||||
|
MEETINGS[data['meeting']] = {'name': data['meeting'],
|
||||||
|
'participants': 0,
|
||||||
|
'moderators': 0}
|
||||||
|
|
||||||
|
renderActiveMeeting(MEETINGS[data['meeting']])
|
||||||
|
updatePreviousMeetings();
|
||||||
|
} else if(data['method'] == 'destroy'){
|
||||||
|
removeActiveMeeting(MEETINGS[data['meeting']])
|
||||||
|
PreviousMeetings.append([data['meeting']])
|
||||||
|
delete MEETINGS[data['meeting']]
|
||||||
|
} else if(data['method'] == 'join'){
|
||||||
|
handleUser(data, 1)
|
||||||
|
updateMeetingText(MEETINGS[data['meeting']])
|
||||||
|
} else if(data['method'] == 'leave'){
|
||||||
|
handleUser(data, -1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Populating active meetings.');
|
||||||
|
setTimeout(initialPopulate, LOADING_DELAY);
|
||||||
|
}
|
||||||
|
});
|
|
@ -19,7 +19,7 @@
|
||||||
width: 100px;
|
width: 100px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.previously-joined {
|
.previously-joined, .actives {
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
margin:auto;
|
margin:auto;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
|
@ -90,6 +90,11 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fa-spinner {
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.youtube-red {
|
.youtube-red {
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
|
||||||
|
#
|
||||||
|
# Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify it under the
|
||||||
|
# terms of the GNU Lesser General Public License as published by the Free Software
|
||||||
|
# Foundation; either version 3.0 of the License, or (at your option) any later
|
||||||
|
# version.
|
||||||
|
#
|
||||||
|
# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public License along
|
||||||
|
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
class RefreshMeetingsChannel < ApplicationCable::Channel
|
||||||
|
def subscribed
|
||||||
|
stream_from "refresh_meetings"
|
||||||
|
end
|
||||||
|
end
|
|
@ -111,8 +111,8 @@ class BbbController < ApplicationController
|
||||||
head(:ok) && return unless validate_checksum
|
head(:ok) && return unless validate_checksum
|
||||||
|
|
||||||
begin
|
begin
|
||||||
data = JSON.parse(read_body(request))
|
data = JSON.parse(params['event'])
|
||||||
treat_callback_event(data["event"])
|
treat_callback_event(data)
|
||||||
rescue Exception => e
|
rescue Exception => e
|
||||||
logger.error "Error parsing webhook data. Data: #{data}, exception: #{e.inspect}"
|
logger.error "Error parsing webhook data. Data: #{data}, exception: #{e.inspect}"
|
||||||
|
|
||||||
|
@ -277,6 +277,15 @@ class BbbController < ApplicationController
|
||||||
else
|
else
|
||||||
logger.error "Bad format for event #{event}, won't process"
|
logger.error "Bad format for event #{event}, won't process"
|
||||||
end
|
end
|
||||||
|
elsif eventName == "meeting_created_message"
|
||||||
|
# Fire an Actioncable event that updates _previously_joined for the client.
|
||||||
|
actioncable_event('create', params['id'])
|
||||||
|
elsif eventName == "meeting_destroyed_event"
|
||||||
|
actioncable_event('destroy', params['id'])
|
||||||
|
elsif eventName == "user_joined_message"
|
||||||
|
actioncable_event('join', params['id'], event['payload']['user']['role'])
|
||||||
|
elsif eventName == "user_left_message"
|
||||||
|
actioncable_event('leave', params['id'], event['payload']['user']['role'])
|
||||||
else
|
else
|
||||||
logger.info "Callback event will not be treated. Event name: #{eventName}"
|
logger.info "Callback event will not be treated. Event name: #{eventName}"
|
||||||
end
|
end
|
||||||
|
@ -284,15 +293,32 @@ class BbbController < ApplicationController
|
||||||
render head(:ok) && return
|
render head(:ok) && return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def actioncable_event(method, id, role = 'none')
|
||||||
|
ActionCable.server.broadcast 'refresh_meetings',
|
||||||
|
method: method,
|
||||||
|
meeting: id,
|
||||||
|
role: role
|
||||||
|
end
|
||||||
|
|
||||||
# Validates the checksum received in a callback call.
|
# Validates the checksum received in a callback call.
|
||||||
# If the checksum doesn't match, renders an ok and aborts execution.
|
# If the checksum doesn't match, renders an ok and aborts execution.
|
||||||
def validate_checksum
|
def validate_checksum
|
||||||
secret = ENV['BIGBLUEBUTTON_SECRET']
|
secret = ENV['BIGBLUEBUTTON_SECRET']
|
||||||
checksum = params["checksum"]
|
checksum = params["checksum"]
|
||||||
data = read_body(request)
|
return false unless checksum
|
||||||
|
|
||||||
|
# Decode and break the body into parts.
|
||||||
|
parts = URI.decode_www_form(read_body(request))
|
||||||
|
|
||||||
|
# Convert the data into the correct checksum format, replace ruby hash arrows.
|
||||||
|
converted_data = {parts[0][0]=>parts[0][1],parts[1][0]=>parts[1][1].to_i}.to_s.gsub!('=>', ':')
|
||||||
|
|
||||||
|
# Manually remove the space between the two elements.
|
||||||
|
converted_data[converted_data.rindex("timestamp") - 2] = ''
|
||||||
|
|
||||||
callback_url = uri_remove_param(request.original_url, "checksum")
|
callback_url = uri_remove_param(request.original_url, "checksum")
|
||||||
|
|
||||||
checksum_str = "#{callback_url}#{data}#{secret}"
|
checksum_str = "#{callback_url}#{converted_data}#{secret}"
|
||||||
calculated_checksum = Digest::SHA1.hexdigest(checksum_str)
|
calculated_checksum = Digest::SHA1.hexdigest(checksum_str)
|
||||||
|
|
||||||
if calculated_checksum != checksum
|
if calculated_checksum != checksum
|
||||||
|
|
|
@ -34,6 +34,10 @@ class LandingController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def send_data
|
||||||
|
render json: bbb.get_meetings
|
||||||
|
end
|
||||||
|
|
||||||
def wait_for_moderator
|
def wait_for_moderator
|
||||||
render layout: false
|
render layout: false
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,9 +13,36 @@
|
||||||
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
# with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<div class="previously-joined-wrapper hidden">
|
<% if current_user %>
|
||||||
|
<div class="previously-joined-wrapper hidden">
|
||||||
|
<div class = 'row'>
|
||||||
|
<div class = 'col-xs-3 col-xs-offset-2'>
|
||||||
|
<div class="list-group text-center hidden-list" hidden>
|
||||||
|
<h4><%= t('previous_meetings') %></h4>
|
||||||
|
<ul class="previously-joined"></ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class = 'col-xs-2'>
|
||||||
|
<br><br>
|
||||||
|
<i class="fa fa-spinner fa-spin fa-3x" aria-hidden="true"></i>
|
||||||
|
</div>
|
||||||
|
<div class = 'col-xs-3'>
|
||||||
|
<div class="list-group text-center hidden-list" hidden>
|
||||||
|
<h4><%= t('active_meetings') %></h4>
|
||||||
|
<ul class="actives"></ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% else %>
|
||||||
|
<div class="previously-joined-wrapper hidden">
|
||||||
|
<div class = 'row'>
|
||||||
|
<div class = 'col-xs-4 col-xs-offset-4'>
|
||||||
<div class="list-group text-center">
|
<div class="list-group text-center">
|
||||||
<h4><%= t('previous_meetings') %></h4>
|
<h4><%= t('previous_meetings') %></h4>
|
||||||
<ul class="previously-joined"></ul>
|
<ul class="previously-joined"></ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
|
@ -66,7 +66,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
<div class='header'>
|
<div class='header'>
|
||||||
<span class="logo-wrapper pull-left">
|
<span class="logo-wrapper pull-left">
|
||||||
|
<% if current_user %>
|
||||||
|
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), meeting_room_path('rooms', User.find(current_user).encrypted_id) %>
|
||||||
|
<% else %>
|
||||||
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
|
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
|
||||||
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<!-- End of Header -->
|
<!-- End of Header -->
|
||||||
|
|
|
@ -9,3 +9,4 @@ Rails.application.config.assets.version = '1.0'
|
||||||
# Precompile additional assets.
|
# Precompile additional assets.
|
||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||||
Rails.application.config.assets.precompile += %w( fa/gl-fa.css )
|
Rails.application.config.assets.precompile += %w( fa/gl-fa.css )
|
||||||
|
Rails.application.config.assets.precompile += %w( active_meetings.js )
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
en-US:
|
en-US:
|
||||||
actions: Actions
|
actions: Actions
|
||||||
|
active_meetings: (active meetings)
|
||||||
admin_room_title: Welcome %{user}
|
admin_room_title: Welcome %{user}
|
||||||
are_you: Are you %{name}?
|
are_you: Are you %{name}?
|
||||||
are_you_sure: Are you sure?
|
are_you_sure: Are you sure?
|
||||||
|
|
|
@ -50,6 +50,7 @@ Rails.application.routes.draw do
|
||||||
post '/:room_id/:id/callback', to: 'bbb#callback', :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
post '/:room_id/:id/callback', to: 'bbb#callback', :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
||||||
|
|
||||||
# routes shared between meetings and rooms
|
# routes shared between meetings and rooms
|
||||||
|
get '/(:room_id)/request', to: 'landing#send_data', :defaults => { :format => 'xml' }
|
||||||
get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
get '/(:room_id)/:id/join', to: 'bbb#join', defaults: {room_id: nil, format: 'json'}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
||||||
get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
get '/(:room_id)/:id', to: 'landing#resource', as: :meeting_room, defaults: {room_id: nil}, :constraints => {:id => disallow_slash, :room_id => disallow_slash}
|
||||||
end
|
end
|
||||||
|
|
|
@ -176,7 +176,7 @@ class BbbControllerTest < ActionController::TestCase
|
||||||
"meeting_id": "f344d42cc5ea2fbb7fe64edabce42dae5dc1c0c5-1487709353538"}},
|
"meeting_id": "f344d42cc5ea2fbb7fe64edabce42dae5dc1c0c5-1487709353538"}},
|
||||||
"timestamp": 1488557092}
|
"timestamp": 1488557092}
|
||||||
|
|
||||||
request.env['RAW_POST_DATA'] = data.to_json
|
request.env['RAW_POST_DATA'] = URI.encode_www_form(data)
|
||||||
Digest::SHA1.hexdigest(
|
Digest::SHA1.hexdigest(
|
||||||
"#{data[:event][:payload][:metadata][:'gl-webhooks-callback-url']}#{data.to_json}#{secret}")
|
"#{data[:event][:payload][:metadata][:'gl-webhooks-callback-url']}#{data.to_json}#{secret}")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue