ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BBB link support for planner Join buttons 

When the BBB plugin is enabled, meetings are handled thru
the canvas conferences feature. This commit adds the
canvas conferences/:id/join to the regex list

closes LS-2879
flag=none

test plan:
  - go to /plugins/big_blue_button
  - see https://instructure.atlassian.net/wiki/spaces/CE/pages/751045246/Configuring+BBB+with+Canvas
    for config info
  - go to /courses/:id/conferences and create a new conference
  - right-click on the Start button and copy the link address
  - go to /calendar and create a new course calendar event
  - insert the conference URL in the event's location or details field and save
    (the "Add BigBlueButton" button that adds a conferencing link in the calendar event
     does not currently work for the planner's Join buttons. That's a future ticket)
  - as a student, so to your planner
  > expect a Join button with the calendar event
  - click the button
  > expec to join the conference
    (BBB conferences are strange. I think they only work once)

Change-Id: Ie6cd508d44c1c85b108ced3c45bae3879ba434c5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/280179
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Jackson Howe <jackson.howe@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
This commit is contained in:
Ed Schiebel 2021-12-02 13:49:36 -05:00
parent fca3312001
commit c94ec0a964
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/dynamic_settings.yml.example
View File

@ -15,12 +15,20 @@ development:
signing-secret: "astringthatisactually32byteslong"
# regexes for matching online meeting urls in calendar events
# one per line. will get | or'd together to form the regex
# that's eventually used. overrides default values in
# lib/api/v1/planner_item.rb:online_meeting_url, if present
# that's eventually used.
# Values here override the default values in
# lib/api/v1/planner_item.rb:online_meeting_url
# The example values here match what is (currently) in planner_item.rb
online-meeting-url-regex: |-
# https:\/\/[\w-]+\.zoom\.us\/\d+(\?[\w\/\-=%]*)?
# https:\/\/[\w-]+\.webex\.com\/meet\/[\w.\/\-=%]+(\?[\w\/\-=%]*)?
# (... and so on)
https:\/\/[\w-]+\.zoom\.us\/\d+(\?[\w\/\-=%]*)?
https:\/\/[\w-]+\.zoom\.us\/my\/[\w.]+(\?[\w\/\-=%]*)?
https:\/\/[\w-]+\.zoom\.us\/j\/\d+(\?[\w\/\-=%]*)?
https:\/\/teams\.microsoft\.com\/l\/meetup-join\/[\w.\/\-=%]+(\?[\w\/\-=%]*)?
https:\/\/teams\.live\.com\/meet\/\d+(\?[\w\/\-=%]*)?
https:\/\/[\w-]+\.webex\.com\/meet\/[\w.\/\-=%]+(\?[\w\/\-=%]*)?
https:\/\/[\w-]+\.webex\.com\/\w+\/j\.php(\?[\w\/\-=%]*)?
https:\/\/meet\.google\.com\/[\w\/\-=%]+(\?[\w\/\-=%]*)?
https?:\/\/.*\/conferences\/\d+\/join
datadog-rum:
application_id: "27627d1e-8a4f-4645-b390-bb396fc83c81"
client_token: "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q7r"

1
lib/api/v1/planner_item.rb
View File

@ -268,6 +268,7 @@ module Api::V1::PlannerItem
https:\/\/[\w-]+\.webex\.com\/meet\/[\w.\/\-=%]+(\?[\w\/\-=%]*)?
https:\/\/[\w-]+\.webex\.com\/\w+\/j\.php(\?[\w\/\-=%]*)?
https:\/\/meet\.google\.com\/[\w\/\-=%]+(\?[\w\/\-=%]*)?
https?:\/\/.*\/conferences\/\d+\/join
REGEX
url_regex_str = config["online-meeting-url-regex"] || default_regex
url_regex_str = url_regex_str.split("\n").join("|")

2
spec/lib/api/v1/planner_item_spec.rb
View File

@ -143,6 +143,7 @@ describe Api::V1::PlannerItem do
https://meet146.webex.com/meet146/j.php?MTID=mb0f63c6586178c903f161b109886066b
https://meet-146.webex.com/meet/pr-._25535050184
https://meet.google.com/sbs-ycbe-yhu
https://myschool.instructure.com/courses/17/conferences/19/join
]
end
@ -164,6 +165,7 @@ describe Api::V1::PlannerItem do
https://tea-ms.microsoft.com/l/meetup-join/19%3ameeting_MjAyMjU4Y2QtZTc0Mi00OTI1LTllYTUtNjEzNTBhMjY3OTZi%40thread.v2/0?context=%7B%22Tid%22%3A%22b8e866dc-ae4d-482d-8ebb-6ef626b97a42%22%2C%22Oid%22%3A%22ac200842-2ec5-494e-83db-dfddc8939907%22%7D
https://teams.micro-soft.com/l/meetup-join/19%3ameeting_MjAyMjU4Y2QtZTc0Mi00OTI1LTllYTUtNjEzNTBhMjY3OTZi%40thread.v2/0?context=%7B%22Tid%22%3A%22b8e866dc-ae4d-482d-8ebb-6ef626b97a42%22%2C%22Oid%22%3A%22ac200842-2ec5-494e-83db-dfddc8939907%22%7D
https://tea-ms.live.com/meet/93298311589140
https://myschool.instructure.com/courses/17/conferences
]
end