Ensure token validity check happens correctly

calcom · Feb 23, 2023 · da13b67 · da13b67
1 parent f3a397f
commit da13b67
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/app-store/zohocrm/lib/CalendarService.ts b/packages/app-store/zohocrm/lib/CalendarService.ts
@@ -138,12 +138,13 @@ export default class ZohoCrmCalendarService implements Calendar {
     if (!this.client_secret)
       throw new HttpError({ statusCode: 400, message: "Zoho CRM client_secret missing." });
     const credentialKey: any = credential.key;
-    const isTokenValid = (token: any) =>
-      token &&
-      token.token_type &&
-      token.access_token &&
-      token.expiryDate &&
-      (token.expires_in || token.expiryDate) < Date.now();
+    const isTokenValid = (token: any) => {
+      const isValid = token && token.access_token && token.expiryDate && token.expiryDate < Date.now();
+      if (isValid) {
+        this.accessToken = token.access_token;
+      }
+      return isValid;
+    };
 
     const refreshAccessToken = async (credentialKey: any) => {
       try {
@@ -189,8 +190,7 @@ export default class ZohoCrmCalendarService implements Calendar {
     };
 
     return {
-      getToken: () =>
-        isTokenValid(credential.key) ? Promise.resolve([]) : refreshAccessToken(credentialKey),
+      getToken: () => (isTokenValid(credentialKey) ? Promise.resolve([]) : refreshAccessToken(credentialKey)),
     };
   };