ayushya/watchparty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.5.1/chip fix

Browse Source
This commit is contained in:
ayushya
2020-07-25 19:30:57 -04:00
parent 6f7a8c0f6f
commit 1e2386713e
4 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/Chat.js
+1 -1
View File
@@ -431,7 +431,7 @@ export default class Chat extends Component {
className="party-controls-users-chip" className="party-controls-users-chip"
clickable clickable
size="small" size="small"
label={usersOnCall[id].info.name} label={usersOnCall[id].info.name || ' '}
/> />
) : null; ) : null;
})} })}
functions/modules/createRoom.js
+17
View File
@@ -46,6 +46,23 @@ module.exports = async (req, res) => {
err err
); );
}); });
await admin
.firestore()
.collection('rooms')
.doc(bodydata.partyName)
.collection('messages')
.add({
uid: '<system>',
name: '',
text: `Voice calls are unavailable temporarily.`,
time: new Date(),
})
.catch((err) => {
console.error(
`Failed to add system voice call message : \n\t Room: ${bodydata.partyName}`,
err
);
});
await admin await admin
.firestore() .firestore()
.collection('rooms') .collection('rooms')
functions/modules/tokenRefresher.js
+18 -17
View File
@@ -1,20 +1,21 @@
const VoxeetSecret = require('../VoxeetSecret.json'); const VoxeetSecret = require('../VoxeetSecret.json');
module.exports = async (req, res) => { module.exports = async (req, res) => {
const { key, secret } = VoxeetSecret; res.status(403).send({ message: 'Voice calls are unavailable temporarily.' });
const credentials = btoa(encodeURI(key) + ':' + encodeURI(secret)); // const { key, secret } = VoxeetSecret;
const headers = { // const credentials = btoa(encodeURI(key) + ':' + encodeURI(secret));
'Content-Type': 'application/json', // const headers = {
'Cache-Control': 'no-cache', // 'Content-Type': 'application/json',
Authorization: 'Basic ' + credentials, // 'Cache-Control': 'no-cache',
}; // Authorization: 'Basic ' + credentials,
const oauth = await fetch(VoxeetSecret.refreshURL, { // };
method: 'POST', // const oauth = await fetch(VoxeetSecret.refreshURL, {
headers, // method: 'POST',
body: JSON.stringify({ // headers,
refresh_token: req.params.token, // body: JSON.stringify({
}), // refresh_token: req.params.token,
}) // }),
.then((oauthResponse) => oauthResponse.json()) // })
.catch((err) => res.status(500).send(err)); // .then((oauthResponse) => oauthResponse.json())
if (oauth) res.status(200).send(oauth); // .catch((err) => res.status(500).send(err));
// if (oauth) res.status(200).send(oauth);
}; };
functions/modules/tokenValidator.js
+18 -17
View File
@@ -1,21 +1,22 @@
const VoxeetSecret = require('../VoxeetSecret.json'); const VoxeetSecret = require('../VoxeetSecret.json');
const fetch = require('node-fetch'); const fetch = require('node-fetch');
module.exports = async (req, res) => { module.exports = async (req, res) => {
const { key, secret } = VoxeetSecret; res.status(403).send({ message: 'Voice calls are unavailable temporarily.' });
const credentials = Buffer.from(encodeURI(key) + ':' + encodeURI(secret)).toString('base64'); // const { key, secret } = VoxeetSecret;
const headers = { // const credentials = Buffer.from(encodeURI(key) + ':' + encodeURI(secret)).toString('base64');
'Content-Type': 'application/json', // const headers = {
'Cache-Control': 'no-cache', // 'Content-Type': 'application/json',
Authorization: 'Basic ' + credentials, // 'Cache-Control': 'no-cache',
}; // Authorization: 'Basic ' + credentials,
const oauth = await fetch(VoxeetSecret.validateURL, { // };
method: 'POST', // const oauth = await fetch(VoxeetSecret.validateURL, {
headers, // method: 'POST',
body: JSON.stringify({ // headers,
grant_type: 'client_credentials', // body: JSON.stringify({
}), // grant_type: 'client_credentials',
}) // }),
.then((oauthResponse) => oauthResponse.json()) // })
.catch((err) => res.status(500).send(err)); // .then((oauthResponse) => oauthResponse.json())
if (oauth) res.status(200).send(oauth); // .catch((err) => res.status(500).send(err));
// if (oauth) res.status(200).send(oauth);
}; };