Git_Mirror/Werewolf
1
0
Fork 0
mirror of https://github.com/AlecM33/Werewolf.git synced 2025-12-26 07:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

send existing cookie on join call

Browse Source
This commit is contained in:
AlecM33
2022-01-25 18:05:35 -05:00
parent 14e158c0b4
commit 2c9e7c14f8
5 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server/api/GamesAPI.js
View File

@@ -27,7 +27,7 @@ const corsOptions = process.env.NODE_ENV.trim() === 'development'
};
router.use(cors(corsOptions));
// router.options('/:code/players', cors(corsOptions));
router.options('/:code/players', cors(corsOptions));
if (process.env.NODE_ENV.trim() === 'production') { // in prod, limit clients to creating 5 games per 10 minutes.
router.use('/create', apiLimiter);
@@ -50,7 +50,6 @@ router.post('/create', function (req, res) {
});
router.get('/:code/availability', function (req, res) {
console.log(req.params.code);
const availabilityPromise = gameManager.checkAvailability(req.params.code);
availabilityPromise.then((result) => {
if (result === 404) {
@@ -67,17 +66,19 @@ router.get('/:code/availability', function (req, res) {
});
router.patch('/:code/players', function (req, res) {
console.log(req.body);
if (
req.body === null
|| !validateAccessCode(req.body.accessCode)
|| !validateName(req.body.playerName)
|| !validateCookie(req.body.localCookie)
|| !validateCookie(req.body.sessionCookie)
) {
res.status(400).send();
} else {
const game = gameManager.activeGameRunner.activeGames[req.body.accessCode];
if (game) {
gameManager.joinGame(game, req.body.playerName).then((data) => {
let inUseCookie = gameManager.environment === globals.ENVIRONMENT.PRODUCTION ? req.body.localCookie : req.body.sessionCookie
gameManager.joinGame(game, req.body.playerName, inUseCookie).then((data) => {
res.status(200).send({ cookie: data, environment: gameManager.environment });
}).catch((code) => {
res.status(code).send();
@@ -96,11 +97,9 @@ function validateName (name) {
return typeof name === 'string' && name.length > 0 && name.length <= 30;
}
// function validateCookie (cookie) {
// return cookie === null
// || (typeof cookie !== 'string' && cookie !== false)
// || (cookie.length !== globals.USER_SIGNATURE_LENGTH && cookie !== false);
// }
function validateCookie (cookie) {
return cookie === null || cookie === false || (typeof cookie === 'string' && cookie.length === globals.USER_SIGNATURE_LENGTH)
}
function validateAccessCode (accessCode) {
return /^[a-zA-Z0-9]+$/.test(accessCode) && accessCode.length === globals.ACCESS_CODE_LENGTH;