BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sends dashboard token through Cookie instead of URL param

Browse Source
This commit is contained in:
Gustavo Trott 2021-08-30 14:20:39 -03:00
parent db5d313d69
commit ddb383cf05
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bbb-learning-dashboard/src/App.js
View File

@ -27,14 +27,27 @@ class App extends React.Component {
const urlSearchParams = new URLSearchParams(window.location.search);
const params = Object.fromEntries(urlSearchParams.entries());
if (typeof params.meeting === 'undefined') return;
if (typeof params.report === 'undefined') return;
fetch(`${params.meeting}/${params.report}/activity_report.json`)
.then((response) => response.json())
.then((json) => {
this.setState({ activitiesJson: json });
document.title = `Learning Dashboard - ${json.name}`;
let learningDashboardAccessToken = '';
if (typeof params.report !== 'undefined') {
learningDashboardAccessToken = params.report;
} else {
const cookieName = `learningDashboardAccessToken-${params.meeting}`;
const cDecoded = decodeURIComponent(document.cookie);
const cArr = cDecoded.split('; ');
cArr.forEach((val) => {
if (val.indexOf(`${cookieName}=`) === 0) learningDashboardAccessToken = val.substring((`${cookieName}=`).length);
});
}
if (learningDashboardAccessToken !== '') {
fetch(`${params.meeting}/${learningDashboardAccessToken}/activity_report.json`)
.then((response) => response.json())
.then((json) => {
this.setState({ activitiesJson: json });
document.title = `Learning Dashboard - ${json.name}`;
});
}
}
render() {
@ -159,8 +172,13 @@ class App extends React.Component {
<div className="grid gap-6 mb-8 md:grid-cols-2 xl:grid-cols-4">
<div aria-hidden="true" className="cursor-pointer" onClick={() => { this.setState({ tab: 'overview' }); }}>
<Card
name={intl.formatMessage({ id: 'app.learningDashboard.indicators.participants', defaultMessage: 'Participants' })}
number={Object.values(activitiesJson.users || {}).length}
name={
activitiesJson.endedOn === 0
? intl.formatMessage({ id: 'app.learningDashboard.indicators.participantsOnline', defaultMessage: 'Active Participants' })
: intl.formatMessage({ id: 'app.learningDashboard.indicators.participantsTotal', defaultMessage: 'Total Number Of Participants' })
}
number={Object.values(activitiesJson.users || {})
.filter((u) => activitiesJson.endedOn > 0 || u.leftOn === 0).length}
cardClass="border-pink-500"
iconClass="bg-pink-50 text-pink-500"
onClick={() => {

5
bigbluebutton-html5/imports/ui/components/learning-dashboard/service.js
View File

@ -29,7 +29,10 @@ const getLearningDashboardAccessToken = () => ((
) || {}).password || {}).learningDashboardAccessToken || null;
const openLearningDashboardUrl = (lang) => {
window.open(`/learning-dashboard/?meeting=${Auth.meetingID}&report=${getLearningDashboardAccessToken()}&lang=${lang}`, '_blank');
const cookieExpiresDate = new Date();
cookieExpiresDate.setTime(cookieExpiresDate.getTime() + 3600000);
document.cookie = `learningDashboardAccessToken-${Auth.meetingID}=${getLearningDashboardAccessToken()}; expires=${cookieExpiresDate.toGMTString()}; path=/`;
window.open(`/learning-dashboard/?meeting=${Auth.meetingID}&lang=${lang}`, '_blank');
};
export default {

3
bigbluebutton-html5/public/locales/en.json
View File

@ -892,7 +892,8 @@
"app.learningDashboard.dashboardTitle": "Learning Dashboard",
"app.learningDashboard.indicators.meetingStatusEnded": "Ended",
"app.learningDashboard.indicators.meetingStatusActive": "Active",
"app.learningDashboard.indicators.participants": "Participants",
"app.learningDashboard.indicators.participantsOnline": "Active Participants",
"app.learningDashboard.indicators.participantsTotal": "Total Number Of Participants",
"app.learningDashboard.indicators.polls": "Polls",
"app.learningDashboard.indicators.raiseHand": "Raise Hand",
"app.learningDashboard.indicators.activityScore": "Activity Score",