Skip to content

Commit

Permalink
trying to fix google sub cron issue
Browse files Browse the repository at this point in the history
  • Loading branch information
DaKingKong committed May 30, 2022
1 parent d587143 commit 54efe4f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ringcentral-google-drive-notification-add-in",
"version": "0.2.13",
"version": "0.2.14",
"description": "RingCentral Add-In App",
"keywords": [
"RingCentral",
Expand Down
33 changes: 19 additions & 14 deletions src/server/lib/oauth.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,28 @@ function getOAuthApp() {
}

async function checkAndRefreshAccessToken(googleUser) {
const dateNow = new Date();
if (googleUser && googleUser.refreshToken && (googleUser.tokenExpiredAt < dateNow || !googleUser.accessToken)) {
console.log(`refreshing token...revoking ${googleUser.accessToken}`);
const token = oauthApp.createToken(googleUser.accessToken, googleUser.refreshToken);
const { accessToken, refreshToken, expires } = await token.refresh();
console.log(`refreshing token...`);
await googleUser.update(
{
accessToken,
refreshToken,
tokenExpiredAt: expires,
}
);
try {
const dateNow = new Date();
if (googleUser && googleUser.refreshToken && (googleUser.tokenExpiredAt < dateNow || !googleUser.accessToken)) {
console.log(`refreshing token...revoking ${googleUser.accessToken}`);
const token = oauthApp.createToken(googleUser.accessToken, googleUser.refreshToken);
const { accessToken, refreshToken, expires } = await token.refresh();
console.log(`refreshing token...`);
await googleUser.update(
{
accessToken,
refreshToken,
tokenExpiredAt: expires,
}
);
}
}
catch (e) {
console.error(e.message);
}
}

async function revokeToken(googleUser){
async function revokeToken(googleUser) {
await checkAndRefreshAccessToken(googleUser);
await axios.post(
`https://oauth2.googleapis.com/revoke?token=${googleUser.refreshToken}`
Expand Down

0 comments on commit 54efe4f

Please sign in to comment.