From 420d703f9d95b908e72ff408213c6b182f061034 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 29 Nov 2022 10:00:23 +1300 Subject: [PATCH] Add updateTokens param to GoogleActions/authCheck --- server/app.js | 2 +- server/googleActions.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/app.js b/server/app.js index 5c4a1ca5f..f847ac2dc 100644 --- a/server/app.js +++ b/server/app.js @@ -340,7 +340,7 @@ app.get('/account', asyncHandler(async (req, res, next)=>{ if(req.account) { if(req.account.googleId) { try { - auth = await GoogleActions.authCheck(req.account, res); + auth = await GoogleActions.authCheck(req.account, res, false); } catch (e) { auth = undefined; console.log('Google auth check failed!'); diff --git a/server/googleActions.js b/server/googleActions.js index 4ccf7a1dd..0417fff43 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -22,7 +22,7 @@ google.options({ auth: serviceAuth || config.get('google_api_key') }); const GoogleActions = { - authCheck : (account, res)=>{ + authCheck : (account, res, updateTokens=true)=>{ if(!account || !account.googleId){ // If not signed into Google const err = new Error('Not Signed In'); err.status = 401; @@ -40,7 +40,7 @@ const GoogleActions = { refresh_token : account.googleRefreshToken }); - oAuth2Client.on('tokens', (tokens)=>{ + updateTokens && oAuth2Client.on('tokens', (tokens)=>{ if(tokens.refresh_token) { account.googleRefreshToken = tokens.refresh_token; }