Skip to content

Commit a88405f

Browse files
author
Gavin Roberts
committed
Address issue #2
* Around mid-October, Atlassian moved the `/rest/obm/1.0` API endpoint to a new location and changed the authentication method to officially remove support for the old cookie-based approach. The backup service has been updated to provide basic auth header and the `appsettings.json` file now contains the correct paths for the export API endpoints needed for triggering and downloading the backup remotely.
1 parent 5440046 commit a88405f

File tree

6 files changed

+144
-25
lines changed

6 files changed

+144
-25
lines changed

‎.vscode/launch.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/AtlassianCloudBackupsTool/bin/Debug/netcoreapp2.0/AtlassianCloudBackupsTool.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}/AtlassianCloudBackupsTool",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach",
24+
"processId": "${command:pickProcess}"
25+
}
26+
]
27+
}

‎.vscode/tasks.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/AtlassianCloudBackupsTool/AtlassianCloudBackupsTool.csproj",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/AtlassianCloudBackupsTool/AtlassianCloudBackupsTool.csproj",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"${workspaceFolder}/AtlassianCloudBackupsTool/AtlassianCloudBackupsTool.csproj",
36+
"/property:GenerateFullPaths=true",
37+
"/consoleloggerparameters:NoSummary"
38+
],
39+
"problemMatcher": "$msCompile"
40+
}
41+
]
42+
}

‎AtlassianCloudBackupsLibrary/BackupAtlassianServiceV2.cs

+2-21
Original file line numberDiff line numberDiff line change
@@ -165,27 +165,8 @@ public async Task<IBackupJob> Execute(bool runCleanUpOnly = false)
165165
Client.DefaultRequestHeaders.Accept.Clear();
166166
Client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
167167

168-
Logger.Current.Log(_logLabel, "Attempting to log in to Atlassian...");
169-
// Get auth token from the cloud instance
170-
var content =
171-
new StringContent(
172-
"{" + string.Format(" \"username\" : \"{0}\", \"password\" : \"{1}\" ", UserName,
173-
Password) + "}", Encoding.UTF8, "application/json");
174-
175-
var response = await Client.PostAsync(_service.AuthUrl, content);
176-
177-
if (response.IsSuccessStatusCode)
178-
{
179-
Logger.Current.Log(_logLabel,
180-
string.Format("Successfully logged in to the {0} account as {1}.", Account, UserName));
181-
}
182-
else
183-
{
184-
Logger.Current.Log(_logLabel, "Failed to authenticate to Atlassian cloud servers!");
185-
Logger.Current.Log(_logLabel,
186-
string.Format("Aborting backup job for {0}!", GetServiceToBeBackedUpLabel()));
187-
return this;
188-
}
168+
var basicHeaderValue = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{UserName}:{Password}"));
169+
Client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", basicHeaderValue);
189170

190171
Logger.Current.Log(_logLabel, "Triggering backup...");
191172
// Trigger backup

‎AtlassianCloudBackupsTool/.vscode/launch.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceFolder}/bin/Debug/netcoreapp2.0/AtlassianCloudBackupsTool.dll",
14+
"args": [],
15+
"cwd": "${workspaceFolder}",
16+
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
17+
"console": "internalConsole",
18+
"stopAtEntry": false
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach",
24+
"processId": "${command:pickProcess}"
25+
}
26+
]
27+
}

‎AtlassianCloudBackupsTool/.vscode/tasks.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/AtlassianCloudBackupsTool.csproj",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/AtlassianCloudBackupsTool.csproj",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"${workspaceFolder}/AtlassianCloudBackupsTool.csproj",
36+
"/property:GenerateFullPaths=true",
37+
"/consoleloggerparameters:NoSummary"
38+
],
39+
"problemMatcher": "$msCompile"
40+
}
41+
]
42+
}

‎AtlassianCloudBackupsTool/appsettings.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"password": "xxxxxxxxxxxxxx",
55
"jiraBackupConfig": {
66
"authUrl": "rest/auth/1/session",
7-
"backupProgressUrl": "rest/obm/1.0/getprogress",
8-
"backupTriggerUrl": "rest/obm/1.0/runbackup",
7+
"backupProgressUrl": "rest/backup/1/export/getProgress",
8+
"backupTriggerUrl": "rest/backup/1/export/runbackup",
99
"baseUrl": "https://{0}.atlassian.net/",
1010
"destination": "/backup-location/jira",
1111
"downloadUrlBase": "",
@@ -15,8 +15,8 @@
1515
},
1616
"confluenceBackupConfig": {
1717
"authUrl": "rest/auth/1/session",
18-
"backupProgressUrl": "wiki/rest/obm/1.0/getprogress",
19-
"backupTriggerUrl": "wiki/rest/obm/1.0/runbackup",
18+
"backupProgressUrl": "wiki/rest/backup/1/export/getProgress",
19+
"backupTriggerUrl": "wiki/rest/backup/1/export/runbackup",
2020
"baseUrl": "https://{0}.atlassian.net/",
2121
"destination": "/backup-location/confluence",
2222
"downloadUrlBase": "wiki/download/",

0 commit comments

Comments
 (0)