update onedrive tokens to allow longer sessions (#185)

* retrieving a new accesstoken for each upload

* update refreshtoken when retrieving a new accesstoken

Author: StillGreen-san

DriveBackup/src/main/java/ratismal/drivebackup/uploaders/Authenticator.java

@@ -7,10 +7,8 @@
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
-import ratismal.drivebackup.UploadThread.UploadLogger;
 import ratismal.drivebackup.handler.commandHandler.BasicCommands;
 import ratismal.drivebackup.plugin.DriveBackup;
-import ratismal.drivebackup.uploaders.googledrive.GoogleDriveUploader;
 import ratismal.drivebackup.util.Logger;
 import ratismal.drivebackup.util.MessageUtil;
 import ratismal.drivebackup.util.NetUtil;
@@ -198,12 +196,12 @@ public static void linkSuccess(CommandSender initiator, @NotNull AuthenticationP
         BasicCommands.sendBriefBackupList(initiator);
     }
 
-    private static void saveRefreshToken(@NotNull AuthenticationProvider provider, String token) throws Exception {
+    public static void saveRefreshToken(@NotNull AuthenticationProvider provider, String token) throws IOException {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("refresh_token", token);
-        FileWriter file = new FileWriter(provider.getCredStoreLocation());
-        file.write(jsonObject.toString());
-        file.close();
+        try (FileWriter file = new FileWriter(provider.getCredStoreLocation())) {
+            file.write(jsonObject.toString());
+        }
     }
 
     private static void enableBackupMethod(@NotNull AuthenticationProvider provider, Logger logger) {

DriveBackup/src/main/java/ratismal/drivebackup/uploaders/onedrive/OneDriveUploader.java

@@ -60,7 +60,7 @@ public OneDriveUploader(UploadLogger logger) {
         this.logger = logger;
         setAuthProvider(AuthenticationProvider.ONEDRIVE);
         try {
-            refreshToken = Authenticator.getRefreshToken(AuthenticationProvider.ONEDRIVE);
+            refreshToken = Authenticator.getRefreshToken(getAuthProvider());
             retrieveNewAccessToken();
         } catch (Exception e) {
             MessageUtil.sendConsoleException(e);
@@ -76,7 +76,7 @@ public OneDriveUploader(UploadLogger logger) {
      */
     private void retrieveNewAccessToken() throws Exception {
         RequestBody requestBody = new FormBody.Builder()
-            .add("client_id", Obfusticate.decrypt(AuthenticationProvider.ONEDRIVE.getClientId()))
+            .add("client_id", Obfusticate.decrypt(getAuthProvider().getClientId()))
             .add("scope", "offline_access Files.ReadWrite")
             .add("refresh_token", refreshToken)
             .add("grant_type", "refresh_token")
@@ -94,6 +94,7 @@ private void retrieveNewAccessToken() throws Exception {
                 throw new IOException(String.format("%s : %s", error, description));
             }
             accessToken = parsedResponse.getString("access_token");
+            refreshToken = parsedResponse.getString("refresh_token");
         }
     }
 
@@ -129,31 +130,40 @@ public void test(File testFile) {
     @Override
     public void uploadFile(File file, String location) {
         try {
+            retrieveNewAccessToken();
             String destinationRoot = normalizePath(ConfigParser.getConfig().backupStorage.remoteDirectory);
             String destinationPath = concatPath(destinationRoot, normalizePath(location));
             FQID destinationId = createPath(destinationPath);
             String uploadURL = createUploadSession(file.getName(), destinationId);
             try (RandomAccessFile raf = new RandomAccessFile(file, "r")) {
                 uploadToSession(uploadURL, raf);
-                try {
-                    pruneBackups(destinationId);
-                } catch (Exception e) {
-                    logger.log(intl("backup-method-prune-failed"));
-                    throw e;
-                }
             }
-        } catch (Exception exception) {
+            try {
+                pruneBackups(destinationId);
+            } catch (Exception e) {
+                logger.log(intl("backup-method-prune-failed"));
+                throw e;
+            }
+        }
+        catch (Exception exception) {
             NetUtil.catchException(exception, "graph.microsoft.com", logger);
             MessageUtil.sendConsoleException(exception);
             setErrorOccurred(true);
+            if (exception instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
         }
     }
 
     /**
     * Closes any remaining connections retrieveNewAccessToken
     */
     public void close() {
-        // nothing needs to be done
+        try {
+            Authenticator.saveRefreshToken(getAuthProvider(), refreshToken);
+        } catch (Exception e) {
+            MessageUtil.sendConsoleException(e);
+        }
     }
 
     /**