From 39c397b05a817cd0d67e1cac97b0b428906fe72f Mon Sep 17 00:00:00 2001
From: Fred Dixon <ffdixon@gmail.com>
Date: Sun, 28 Feb 2016 13:59:45 -0500
Subject: [PATCH] Update API demos to work with https
---
bbb-api-demo/src/main/webapp/create.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo1.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo10.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo11.jsp | 4 ++--
bbb-api-demo/src/main/webapp/demo12.jsp | 4 ++--
bbb-api-demo/src/main/webapp/demo2.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo6.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo7.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo8.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo9.jsp | 2 +-
bbb-api-demo/src/main/webapp/demoHTML5.jsp | 2 +-
bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp | 3 +--
bbb-api-demo/src/main/webapp/demo_openid.jsp | 10 +---------
13 files changed, 15 insertions(+), 24 deletions(-)
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/create.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo1.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo10.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo12.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo2.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo6.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo7.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo8.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo9.jsp
mode change 100755 => 100644 bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp
diff --git a/bbb-api-demo/src/main/webapp/create.jsp b/bbb-api-demo/src/main/webapp/create.jsp
old mode 100755
new mode 100644
index 523c1a95cb..01be4a3e97
--- a/bbb-api-demo/src/main/webapp/create.jsp
+++ b/bbb-api-demo/src/main/webapp/create.jsp
@@ -277,7 +277,7 @@ function mycallback() {
// the meeting was created.
String joinURL = getJoinURLViewer(request.getParameter("username"), request.getParameter("meetingID"));
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo1.jsp b/bbb-api-demo/src/main/webapp/demo1.jsp
old mode 100755
new mode 100644
index ed0c3e15cd..0f95336218
--- a/bbb-api-demo/src/main/webapp/demo1.jsp
+++ b/bbb-api-demo/src/main/webapp/demo1.jsp
@@ -90,7 +90,7 @@ if (request.getParameterMap().isEmpty()) {
String joinURL = getJoinURL(request.getParameter("username"), "Demo Meeting", "false", null, null, null);
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo10.jsp b/bbb-api-demo/src/main/webapp/demo10.jsp
old mode 100755
new mode 100644
index df7b6b4690..dfcad3892b
--- a/bbb-api-demo/src/main/webapp/demo10.jsp
+++ b/bbb-api-demo/src/main/webapp/demo10.jsp
@@ -265,7 +265,7 @@ with BigBlueButton; if not, If not, see <http://www.gnu.org/licenses/>.
//
String welcomeMsg = "<br>Welcome to %%CONFNAME%%!<br><br>For help see our <a href=\"event:http://www.bigbluebutton.org/content/videos\"><u>tutorial videos</u></a>.<br><br>To join the voice bridge for this meeting click the headset icon in the upper-left <b>(you can mute yourself in the Listeners window)</b>.<br><br>This meeting is being recorded.";
String joinURL = getJoinURL(username, meetingID, "true", welcomeMsg, metadata, null);
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
window.location.href="<%=joinURL%>";
diff --git a/bbb-api-demo/src/main/webapp/demo11.jsp b/bbb-api-demo/src/main/webapp/demo11.jsp
index de2850ba0d..49f7a8f206 100644
--- a/bbb-api-demo/src/main/webapp/demo11.jsp
+++ b/bbb-api-demo/src/main/webapp/demo11.jsp
@@ -97,11 +97,11 @@ if (request.getParameterMap().isEmpty()) {
String joinURL = getJoinMeetingURL(request.getParameter("username"), "Demo Meeting", "mp", clientURL );
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
- window.location.href="<%=joinURL%>";
+ window.location.href="<%=joinURL%>";
</script>
<%
diff --git a/bbb-api-demo/src/main/webapp/demo12.jsp b/bbb-api-demo/src/main/webapp/demo12.jsp
old mode 100755
new mode 100644
index 6ae8a4bf3a..67e870dc9b
--- a/bbb-api-demo/src/main/webapp/demo12.jsp
+++ b/bbb-api-demo/src/main/webapp/demo12.jsp
@@ -160,7 +160,7 @@ Author: Jesus Federico <jesus@123it.ca>
//Set skin
Element skinElement = (Element) doc.getElementsByTagName("skinning").item(0);
- skinElement.setAttribute("url", "http://" + getBigBlueButtonIP() + "/client/branding/css/" + param_Skin + ".css.swf" );
+ skinElement.setAttribute("url", "https://" + getBigBlueButtonIP() + "/client/branding/css/" + param_Skin + ".css.swf" );
//Set layout
Element layoutElement = (Element) doc.getElementsByTagName("layout").item(0);
@@ -210,7 +210,7 @@ Author: Jesus Federico <jesus@123it.ca>
String url = BigBlueButtonURL.replace("bigbluebutton/","demo/");
String joinURL = getJoinURLwithDynamicConfigXML(username, confname, configXML);
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("https://") || joinURL.startsWith("https://")) {
%>
<h2>Customized sessions using a dynamic config.xml, submit</h2>
diff --git a/bbb-api-demo/src/main/webapp/demo2.jsp b/bbb-api-demo/src/main/webapp/demo2.jsp
old mode 100755
new mode 100644
index 0eecdf5f24..d441990571
--- a/bbb-api-demo/src/main/webapp/demo2.jsp
+++ b/bbb-api-demo/src/main/webapp/demo2.jsp
@@ -110,7 +110,7 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
// String joinURL = getJoinURL(username, meetingID, "false", "<br>Welcome to course: %%CONFNAME%%.<br>", null, preUploadPDF );
String joinURL = getJoinURL(username, meetingID, "false", null, null, null );
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo6.jsp b/bbb-api-demo/src/main/webapp/demo6.jsp
old mode 100755
new mode 100644
index 3cd5ec9f04..7a094550aa
--- a/bbb-api-demo/src/main/webapp/demo6.jsp
+++ b/bbb-api-demo/src/main/webapp/demo6.jsp
@@ -144,7 +144,7 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
String preUploadPDF = "<?xml version='1.0' encoding='UTF-8'?><modules><module name='presentation'><document url='"+url+"pdfs/matterhorn.pdf'/></module></modules>";
String joinURL = getJoinURL(username, confname, "true", null, metadata, preUploadPDF);
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo7.jsp b/bbb-api-demo/src/main/webapp/demo7.jsp
old mode 100755
new mode 100644
index 123ee2421b..5e5f6046db
--- a/bbb-api-demo/src/main/webapp/demo7.jsp
+++ b/bbb-api-demo/src/main/webapp/demo7.jsp
@@ -101,7 +101,7 @@
String joinURL = getJoinURLXML(uname, "Join and Upload example", welcomeMsg, xml );
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
window.location.href="<%=joinURL%>";
diff --git a/bbb-api-demo/src/main/webapp/demo8.jsp b/bbb-api-demo/src/main/webapp/demo8.jsp
old mode 100755
new mode 100644
index 33239ae445..a44d6715bf
--- a/bbb-api-demo/src/main/webapp/demo8.jsp
+++ b/bbb-api-demo/src/main/webapp/demo8.jsp
@@ -78,7 +78,7 @@
String meetingID = presentationFileName.replace("pdfs/","").replace(".pdf","").replace(".pptx","");
String joinURL = getJoinURL(username, meetingID, "false", welcomeMsg, null, xml );
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
window.location.href="<%=joinURL%>";
diff --git a/bbb-api-demo/src/main/webapp/demo9.jsp b/bbb-api-demo/src/main/webapp/demo9.jsp
old mode 100755
new mode 100644
index 1d8f36a620..dfd2d25df9
--- a/bbb-api-demo/src/main/webapp/demo9.jsp
+++ b/bbb-api-demo/src/main/webapp/demo9.jsp
@@ -92,7 +92,7 @@ if (request.getParameterMap().isEmpty()) {
//
String joinURL = getJoinURL(request.getParameter("username"), "Demo Meeting", "false", null, null);
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demoHTML5.jsp b/bbb-api-demo/src/main/webapp/demoHTML5.jsp
index 47e2d944a2..4b9a550b77 100644
--- a/bbb-api-demo/src/main/webapp/demoHTML5.jsp
+++ b/bbb-api-demo/src/main/webapp/demoHTML5.jsp
@@ -100,7 +100,7 @@ if (request.getParameterMap().isEmpty()) {
// redirect towards the html5 client which is waiting for the following parameters
String html5url = ip + "/html5client/" + meetingId + "/" + userId + "/" + authToken;
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp b/bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp
old mode 100755
new mode 100644
index 61960a96dd..83ef01eaae
--- a/bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp
+++ b/bbb-api-demo/src/main/webapp/demo_mozilla_persona.jsp
@@ -132,7 +132,6 @@ function loggedIn(res){
Gson gson = new Gson();
HashMap<String,String> map = gson.fromJson(jsonResp, new TypeToken<Map<String, String>>() {}.getType());
-
if(map.get("status").equalsIgnoreCase("okay")){
joinURL = getJoinURL(map.get("email"), "Demo Meeting", "false", null, null, null);
}
@@ -143,7 +142,7 @@ function loggedIn(res){
// String preUploadPDF = "<?xml version='1.0' encoding='UTF-8'?><modules><module name='presentation'><document url='"+url+"pdfs/sample.pdf'/></module></modules>";
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
diff --git a/bbb-api-demo/src/main/webapp/demo_openid.jsp b/bbb-api-demo/src/main/webapp/demo_openid.jsp
index d293298bc2..757a79e2ea 100644
--- a/bbb-api-demo/src/main/webapp/demo_openid.jsp
+++ b/bbb-api-demo/src/main/webapp/demo_openid.jsp
@@ -86,14 +86,6 @@ if (request.getParameterMap().isEmpty()) {
<FORM id="form1" NAME="form1" METHOD="GET" ACTION="#">
<table cellpadding="5" cellspacing="5" style="width: 400px; ">
<tbody>
- <tr>
- <td> </td>
- <td style="text-align: left ">
- <a href="#" id="google" title="Sign-in with Google OpenID">
- <img src="images/google.png" alt="Sign in"></br>
- </a>
- </td>
- </tr>
<tr>
<td> </td>
<td style="text-align: left ">
@@ -147,7 +139,7 @@ if (request.getParameterMap().isEmpty()) {
Authentication authentication = manager.getAuthentication(request, mac_key, alias);
String joinURL = getJoinURL(authentication.getFullname(), "Demo Meeting", null, null, null, null );
- if (joinURL.startsWith("http://")) {
+ if (joinURL.startsWith("http://") || joinURL.startsWith("https://")) {
%>
<script language="javascript" type="text/javascript">
--
GitLab