From b46e7041e3fd95425abbce3330b9d7eb0aa9eeba Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sun, 28 Nov 2021 09:25:12 -0500 Subject: [PATCH] cookies now work on all subdomains --- src/routers/account.js | 30 +++++++++++++++--------------- views/blog/blog.handlebars | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/routers/account.js b/src/routers/account.js index 1df4fcf..3930d56 100644 --- a/src/routers/account.js +++ b/src/routers/account.js @@ -53,9 +53,9 @@ router.get('/', async (request, response) => { const tokens = apiResponse.body; - response.cookie('refresh_token', tokens.refresh_token); - response.cookie('access_token', tokens.access_token); - response.cookie('token_type', tokens.token_type); + response.cookie('refresh_token', tokens.refresh_token, { domain : '.pretendo.network' }); + response.cookie('access_token', tokens.access_token, { domain : '.pretendo.network' }); + response.cookie('token_type', tokens.token_type, { domain : '.pretendo.network' }); apiResponse = await util.apiGetRequest('/v1/user', { 'Authorization': `${tokens.token_type} ${tokens.access_token}` @@ -122,9 +122,9 @@ router.get('/', async (request, response) => { const tokens = apiResponse.body; - response.cookie('refresh_token', tokens.refresh_token); - response.cookie('access_token', tokens.access_token); - response.cookie('token_type', tokens.token_type); + response.cookie('refresh_token', tokens.refresh_token, { domain : '.pretendo.network' }); + response.cookie('access_token', tokens.access_token, { domain : '.pretendo.network' }); + response.cookie('token_type', tokens.token_type, { domain : '.pretendo.network' }); apiResponse = await util.apiPostGetRequest('/v1/connections/add/discord', { 'Authorization': `${tokens.token_type} ${tokens.access_token}` @@ -198,15 +198,15 @@ router.post('/login', async (request, response) => { }); if (apiResponse.statusCode !== 200) { - response.cookie('error', apiResponse.body.error); + response.cookie('error', apiResponse.body.error, { domain: '.pretendo.network' }); return response.redirect('/account/login'); } const tokens = apiResponse.body; - response.cookie('refresh_token', tokens.refresh_token); - response.cookie('access_token', tokens.access_token); - response.cookie('token_type', tokens.token_type); + response.cookie('refresh_token', tokens.refresh_token, { domain : '.pretendo.network' }); + response.cookie('access_token', tokens.access_token, { domain : '.pretendo.network' }); + response.cookie('token_type', tokens.token_type, { domain : '.pretendo.network' }); response.redirect('/account'); }); @@ -221,7 +221,7 @@ router.get('/connect/discord', async (request, response) => { grantType: 'authorization_code', }); } catch (error) { - response.cookie('error', 'Invalid Discord authorization code. Please try again'); + response.cookie('error', 'Invalid Discord authorization code. Please try again', { domain: '.pretendo.network' }); return response.redirect('/account'); } @@ -255,9 +255,9 @@ router.get('/connect/discord', async (request, response) => { const tokens = apiResponse.body; - response.cookie('refresh_token', tokens.refresh_token); - response.cookie('access_token', tokens.access_token); - response.cookie('token_type', tokens.token_type); + response.cookie('refresh_token', tokens.refresh_token, { domain : '.pretendo.network' }); + response.cookie('access_token', tokens.access_token, { domain : '.pretendo.network' }); + response.cookie('token_type', tokens.token_type, { domain : '.pretendo.network' }); apiResponse = await util.apiPostGetRequest('/v1/connections/add/discord', { 'Authorization': `${tokens.token_type} ${tokens.access_token}` @@ -278,7 +278,7 @@ router.get('/connect/discord', async (request, response) => { } } - response.cookie('linked', 'Discord').redirect('/account'); + response.cookie('linked', 'Discord', { domain: '.pretendo.network' }).redirect('/account'); }); module.exports = router; \ No newline at end of file diff --git a/views/blog/blog.handlebars b/views/blog/blog.handlebars index 2fee266..714709b 100644 --- a/views/blog/blog.handlebars +++ b/views/blog/blog.handlebars @@ -43,5 +43,4 @@ {{> footer }} - \ No newline at end of file