Fix broken JIRA backups

* The endpoints for JIRA cloud instance backups have changed
yet again.  The new backup progress URL was identified as part
of the workaround for JRACLOUD-67169.

https://jira.atlassian.com/browse/JRACLOUD-67169?_ga=2.65690921.667524349.1513995124-996925628.1504012227

Author: gsroberts

AtlassianCloudBackupsLibrary/BackupAtlassianServiceV2.cs

@@ -251,50 +251,58 @@ public async Task<IBackupJob> Execute(bool runCleanUpOnly = false)
 
                             if (resultPropExists)
                             {
-                                var resultProp = JObject.Parse(body["result"].ToString());
-
-                                var mediaId = resultProp["mediaFileId"].ToString();
-
-                                var mediaFileName = resultProp["fileName"].ToString();
-
-                                backupFileName = mediaId + "/" + mediaFileName;
                                 backupCreated = true;
-
-                                Logger.Current.Log(_logLabel, "Backup file generation complete.");
+                                
+                                var resultProp = body["result"];
+
+                                if (resultProp != null)
+                                {
+                                    backupFileName = resultProp.ToString();
+
+                                    Logger.Current.Log(_logLabel, "Backup file generation complete.");
+                                }
+                                else
+                                {
+                                    Logger.Current.Log(_logLabel, "[DEBUG] Result node: " + resultProp);
+                                    Logger.Current.Log(_logLabel, "Unable to get backup link from the service.  You must download it manually!");
+                                }
                             }
                         }
 
                         System.Threading.Thread.Sleep(5000);
                     }
 
-                    var backupFileUrl = string.Format(_service.BaseUrl, Account) + _service.DownloadUrlBase +
-                                        backupFileName;
-
-                    Logger.Current.Log(_logLabel,
-                        string.Format("Getting generated backup file from {0}", backupFileUrl));
-                    // Download the backup
-                    using (var fileResponse = await Client.GetAsync(_service.DownloadUrlBase + backupFileName,
-                        HttpCompletionOption.ResponseHeadersRead))
+                    if (!string.IsNullOrEmpty(backupFileName))
                     {
-                        Logger.Current.Log(_logLabel,
-                            string.Format("Downloading {0} bytes of data...",
-                                fileResponse.Content.Headers.ContentLength));
+                        var backupFileUrl = string.Format(_service.BaseUrl, Account) + _service.DownloadUrlBase +
+                                            backupFileName;
 
-                        using (var stream = await fileResponse.Content.ReadAsStreamAsync())
+                        Logger.Current.Log(_logLabel,
+                            string.Format("Getting generated backup file from {0}", backupFileUrl));
+                        // Download the backup
+                        using (var fileResponse = await Client.GetAsync(_service.DownloadUrlBase + backupFileName,
+                            HttpCompletionOption.ResponseHeadersRead))
                         {
-                            using (var outStream =
-                                File.Open(
-                                    Path.Combine(BackupDestination,
-                                        string.Format(FileName, DateTime.Now.ToString("MMddyy"))), FileMode.Create))
+                            Logger.Current.Log(_logLabel,
+                                string.Format("Downloading {0} bytes of data...",
+                                    fileResponse.Content.Headers.ContentLength.ToString()));
+
+                            using (var stream = await fileResponse.Content.ReadAsStreamAsync())
                             {
-                                await stream.CopyToAsync(outStream);
+                                using (var outStream =
+                                    File.Open(
+                                        Path.Combine(BackupDestination,
+                                            string.Format(FileName, DateTime.Now.ToString("MMddyy"))), FileMode.Create))
+                                {
+                                    await stream.CopyToAsync(outStream);
+                                }
                             }
                         }
-
-                        if (File.Exists("backupTaskID"))
-                        {
-                            File.Delete("backupTaskID");
-                        }
+                    }
+                    
+                    if (File.Exists("backupTaskID"))
+                    {
+                        File.Delete("backupTaskID");
                     }
 
                     Logger.Current.Log(_logLabel, "Download complete.");
@@ -329,7 +337,7 @@ private string GetServiceToBeBackedUpLabel()
 
             switch (typeof(T).Name)
             {
-                case "JIRAService":
+                case "JiraService":
                     serviceToBeBackedUp = "JIRA";
                     break;
                 case "ConfluenceService":

AtlassianCloudBackupsLibrary/Helpers/Logger.cs

@@ -35,7 +35,7 @@ public void Init(string logPath, string logFileName)
 
         public void Log(string topic, string entry)
         {
-            var logEntry = string.Format("{0} [{1}] {2}", DateTime.Now, topic, entry);
+            var logEntry = string.Format("{0} [{1}] {2}", DateTime.Now.ToString(), topic, entry);
 
             File.AppendAllLines(Path.Combine(_logLocation, _logFile), new[] { logEntry });
             Console.WriteLine(logEntry);

AtlassianCloudBackupsLibrary/JiraService.cs

@@ -14,7 +14,7 @@ public JiraService()
             BaseUrl = "https://{0}.atlassian.net/";
             AuthUrl = "rest/auth/1/session";
             BackupTriggerUrl = "rest/backup/1/export/runbackup";
-            BackupProgressUrl = "rest/internal/2/task/progress/{0}";
+            BackupProgressUrl = "rest/backup/1/export/getProgress?taskId={0}";
             DownloadUrlBase = "plugins/servlet/export/download/";
             LastTaskIdUrl = "rest/backup/1/export/lastTaskId";
         }