f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-06 03:32:40 +00:00
Code Wiki Activity

Merge pull request #2522 from G-Ambatte/fixAccountLoginTime-#2521

Browse Source 
[AccountPage] Fix last login time
This commit is contained in:
Trevor Buckner
2022-11-28 17:19:31 -05:00
committed by GitHub
parent 090da33f33 420d703f9d
commit 5cd50f7138
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/app.js
View File

@@ -340,7 +340,7 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
if(req.account) { if(req.account) {
if(req.account.googleId) { if(req.account.googleId) {
try { try {
auth = await GoogleActions.authCheck(req.account, res); auth = await GoogleActions.authCheck(req.account, res, false);
} catch (e) { } catch (e) {
auth = undefined; auth = undefined;
console.log('Google auth check failed!'); console.log('Google auth check failed!');

4
server/googleActions.js
View File

@@ -22,7 +22,7 @@ google.options({ auth: serviceAuth || config.get('google_api_key') });
const GoogleActions = { const GoogleActions = {
authCheck : (account, res)=>{ authCheck : (account, res, updateTokens=true)=>{
if(!account || !account.googleId){ // If not signed into Google if(!account || !account.googleId){ // If not signed into Google
const err = new Error('Not Signed In'); const err = new Error('Not Signed In');
err.status = 401; err.status = 401;
@@ -40,7 +40,7 @@ const GoogleActions = {
refresh_token : account.googleRefreshToken refresh_token : account.googleRefreshToken
}); });
oAuth2Client.on('tokens', (tokens)=>{ updateTokens && oAuth2Client.on('tokens', (tokens)=>{
if(tokens.refresh_token) { if(tokens.refresh_token) {
account.googleRefreshToken = tokens.refresh_token; account.googleRefreshToken = tokens.refresh_token;
} }