Throw invalid token exception for video import (#1222)

* Throw invalid token exception for video import Summary: Capture and throw invalid token exception for video import Test Plan: ./gradlew test --------- Co-authored-by: Srujith Mallidi <[email protected]>
dtinit · Mar 24, 2023 · 44a52ce · 44a52ce
1 parent dfa7c2e
commit 44a52ce
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...rc/main/java/org/datatransferproject/datatransfer/google/videos/GoogleVideosImporter.java b/...rc/main/java/org/datatransferproject/datatransfer/google/videos/GoogleVideosImporter.java
@@ -32,6 +32,7 @@
 package org.datatransferproject.datatransfer.google.videos;
 
 import com.google.api.gax.core.FixedCredentialsProvider;
+import com.google.api.gax.rpc.ApiException;
 import com.google.api.gax.rpc.InvalidArgumentException;
 import com.google.api.gax.rpc.UnauthenticatedException;
 import com.google.auth.oauth2.AccessToken;
@@ -325,6 +326,14 @@ private Pair<String, Long> uploadMediaItem(UUID jobId, VideoModel inputVideo,
         uploadToken = uploadResponse.getUploadToken().get();
       }
       return Pair.of(uploadToken, tmp.length());
+    } catch (ApiException ex) {
+      // temp check as exception is not captured and wrapped into UploadMediaItemResponse
+      Throwable cause = ex.getCause();
+      String message = cause.getMessage();
+      if (message.contains("invalid_grant")) {
+        throw new InvalidTokenException("Token has been expired or revoked", cause);
+      }
+      throw new IOException("An error was encountered while uploading the video.", cause);
     } finally {
       //noinspection ResultOfMethodCallIgnored
       tmp.delete();