Merge pull request #320 from jetstreamapp/bug/312

Download file - authorize google does not allow folder selection
jetstreamapp · Apr 21, 2023 · 841297a · 841297a
2 parents 6922d5b + 75dd25d
commit 841297a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libs/shared/ui-utils/src/lib/hooks/useGoogleApi.ts b/libs/shared/ui-utils/src/lib/hooks/useGoogleApi.ts
@@ -43,6 +43,7 @@ export function useGoogleApi({ clientId, scopes = [SCOPES['drive.file']] }: Goog
     | undefined
   >();
   const tokenExpiration = useRef<Maybe<Date>>(_tokenExpiration);
+  const [currentTokenExpiration, setCurrentTokenExpiration] = useState<Maybe<Date>>(tokenExpiration.current);
   const [gapiScriptLoaded, gapiScriptLoadError] = useInjectScriptGapi();
   const [gisScriptLoaded, gisScriptLoadError] = useInjectScriptGis();
   const [loading, setLoading] = useState(!_apiLoaded);
@@ -75,6 +76,7 @@ export function useGoogleApi({ clientId, scopes = [SCOPES['drive.file']] }: Goog
     if (response.error !== undefined) {
       _tokenExpiration = null;
       tokenExpiration.current = _tokenExpiration;
+      setCurrentTokenExpiration(tokenExpiration.current);
       setError(response.error);
       if (tokenCallback.current) {
         tokenCallback.current.reject(response);
@@ -83,6 +85,7 @@ export function useGoogleApi({ clientId, scopes = [SCOPES['drive.file']] }: Goog
     } else {
       _tokenExpiration = addSeconds(new Date(), Number(response.expires_in));
       tokenExpiration.current = _tokenExpiration;
+      setCurrentTokenExpiration(tokenExpiration.current);
       setError(null);
       if (tokenCallback.current) {
         tokenCallback.current.resolve(response);
@@ -136,8 +139,8 @@ export function useGoogleApi({ clientId, scopes = [SCOPES['drive.file']] }: Goog
   }, [rollbar]);
 
   const isTokenValid = useCallback(() => {
-    return !!tokenClient.current && !!tokenResponse.current && !!tokenExpiration.current && isAfter(tokenExpiration.current, new Date());
-  }, []);
+    return !!tokenClient.current && !!tokenResponse.current && !!currentTokenExpiration && isAfter(currentTokenExpiration, new Date());
+  }, [currentTokenExpiration]);
 
   const getToken = useCallback(() => {
     return new Promise<google.accounts.oauth2.TokenResponse>((resolve, reject) => {
@@ -163,6 +166,7 @@ export function useGoogleApi({ clientId, scopes = [SCOPES['drive.file']] }: Goog
     _tokenResponse = tokenResponse.current;
     _tokenExpiration = null;
     tokenExpiration.current = _tokenExpiration;
+    setCurrentTokenExpiration(tokenExpiration.current);
   }, []);
 
   return {