Merge branch '50-bitbucket-workspace'

christianspecht · May 6, 2020 · 631fbf9 · 631fbf9
2 parents 64d2863 + 6334683
commit 631fbf9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 54 deletions.
diff --git a/src/ScmBackup/Hosters/Bitbucket/BitbucketApi.cs b/src/ScmBackup/Hosters/Bitbucket/BitbucketApi.cs
@@ -30,37 +30,7 @@ public List<HosterRepository> GetRepositoryList(ConfigSource source)
                 request.AddBasicAuthHeader(source.AuthName, source.Password);
             }
 
-            string url = string.Empty;
-            string apiUsername = null;
-
-            // Issue #32: from Apr 29 2019, usernames (not team names) must be replaced by UUIDs
-            if (source.Type.ToLower() == "user")
-            {
-                url = "/2.0/workspaces/" + source.Name;
-
-                var result = request.Execute(url).Result;
-
-                if (result.IsSuccessStatusCode)
-                {
-                    var apiResponse = JsonConvert.DeserializeObject<BitbucketApiUserResponse>(result.Content);
-                    if (apiResponse != null)
-                    {
-                        apiUsername = Uri.EscapeUriString(apiResponse.uuid);
-                    }
-                }
-
-                if (string.IsNullOrWhiteSpace(apiUsername))
-                {
-                    throw new InvalidOperationException(string.Format(Resource.ApiBitbucketCantGetUuid, source.Name));
-                }
-            }
-            else
-            {
-                apiUsername = source.Name;
-            }
-
-
-            url = "/2.0/repositories/" + apiUsername;
+            string url = "/2.0/repositories/" + source.Name;
 
             while (url != null)
             {

diff --git a/src/ScmBackup/Hosters/Bitbucket/BitbucketApiUserResponse.cs b/src/ScmBackup/Hosters/Bitbucket/BitbucketApiUserResponse.cs
diff --git a/src/ScmBackup/Resource.Designer.cs b/src/ScmBackup/Resource.Designer.cs
diff --git a/src/ScmBackup/Resource.resx b/src/ScmBackup/Resource.resx
@@ -120,9 +120,6 @@
   <data name="ApiAuthenticationFailed" xml:space="preserve">
     <value>Authentication failed for {0}</value>
   </data>
-  <data name="ApiBitbucketCantGetUuid" xml:space="preserve">
-    <value>Unable to get the UUID for username {0} from the Bitbucket API</value>
-  </data>
   <data name="ApiGettingRepos" xml:space="preserve">
     <value>Getting repositories for source '{0}' from hoster '{1}'</value>
   </data>