To configure GCM for all users, run the following command to update the system Git configuration:
-
Uninstall
diff --git a/src/osx/Installer.Mac/scripts/postinstall b/src/osx/Installer.Mac/scripts/postinstall
index cb73b07db..9e4b0bed5 100755
--- a/src/osx/Installer.Mac/scripts/postinstall
+++ b/src/osx/Installer.Mac/scripts/postinstall
@@ -28,10 +28,13 @@ fi
# Create symlink to GCM in /usr/local/bin
mkdir -p /usr/local/bin
-/bin/ln -Fs "$INSTALL_DESTINATION/git-credential-manager-core" /usr/local/bin/git-credential-manager-core
+/bin/ln -Fs "$INSTALL_DESTINATION/git-credential-manager" /usr/local/bin/git-credential-manager
+
+# Create legacy symlink to GCMCore in /usr/local/bin
+/bin/ln -Fs "$INSTALL_DESTINATION/git-credential-manager" /usr/local/bin/git-credential-manager-core
# Configure GCM for the current user (running as the current user to avoid root
# from taking ownership of ~/.gitconfig)
-sudo -u ${USER} "$INSTALL_DESTINATION/git-credential-manager-core" configure
+sudo -u ${USER} "$INSTALL_DESTINATION/git-credential-manager" configure
exit 0
diff --git a/src/osx/Installer.Mac/uninstall.sh b/src/osx/Installer.Mac/uninstall.sh
index f26f2b189..55f6089a9 100755
--- a/src/osx/Installer.Mac/uninstall.sh
+++ b/src/osx/Installer.Mac/uninstall.sh
@@ -1,7 +1,7 @@
#!/bin/bash
THISDIR="$( cd "$(dirname "$0")" ; pwd -P )"
-GCMBIN="$THISDIR/git-credential-manager-core"
+GCMBIN="$THISDIR/git-credential-manager"
# Ensure we're running as root
if [ $(id -u) != "0" ]
@@ -15,14 +15,23 @@ echo "Unconfiguring credential helper..."
sudo -u `/usr/bin/logname` -E "$GCMBIN" unconfigure
# Remove symlink
-if [ -L /usr/local/bin/git-credential-manager-core ]
+if [ -L /usr/local/bin/git-credential-manager ]
then
echo "Deleting symlink..."
- rm /usr/local/bin/git-credential-manager-core
+ rm /usr/local/bin/git-credential-manager
else
echo "No symlink found."
fi
+# Remove legacy symlink
+if [ -L /usr/local/bin/git-credential-manager-core ]
+then
+ echo "Deleting legacy symlink..."
+ rm /usr/local/bin/git-credential-manager-core
+else
+ echo "No legacy symlink found."
+fi
+
# Forget package installation/delete receipt
echo "Removing installation receipt..."
pkgutil --forget com.microsoft.gitcredentialmanager
diff --git a/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj b/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
index 18d7f90d7..4195d936e 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
+++ b/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
@@ -13,7 +13,7 @@
all
-
+
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs
index aace44ad7..e92cb9061 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs
+++ b/src/shared/Atlassian.Bitbucket.Tests/BitbucketAuthenticationTest.cs
@@ -113,7 +113,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
{
var targetUri = new Uri("https://bitbucket.org");
- var helperPath = "/usr/bin/test-helper";
+ var command = "/usr/bin/test-helper";
+ var args = "";
var expectedUserName = "jsquire";
var expectedPassword = "password";
var resultDict = new Dictionary
@@ -128,7 +129,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection
var authMock = new Mock(context) { CallBase = true };
- authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+ authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
.Returns(true);
authMock.Setup(x => x.InvokeHelperAsync(It.IsAny(), It.IsAny(), null, CancellationToken.None))
.ReturnsAsync(resultDict);
@@ -140,7 +141,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
Assert.Equal(result.Credential.Account, expectedUserName);
Assert.Equal(result.Credential.Password, expectedPassword);
- authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+ authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
Times.Once);
}
@@ -149,7 +150,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
{
var targetUri = new Uri("https://bitbucket.org");
- var helperPath = "/usr/bin/test-helper";
+ var command = "/usr/bin/test-helper";
+ var args = "";
var expectedUserName = "jsquire";
var expectedPassword = "password";
var resultDict = new Dictionary
@@ -164,7 +166,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
context.SessionManager.IsDesktopSession = true; // Enable UI helper selection
var authMock = new Mock(context) { CallBase = true };
- authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+ authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
.Returns(true);
authMock.Setup(x => x.InvokeHelperAsync(It.IsAny(), It.IsAny(), null, CancellationToken.None))
.ReturnsAsync(resultDict);
@@ -176,7 +178,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_BasicOnly_User_BBC
Assert.Equal(result.Credential.Account, expectedUserName);
Assert.Equal(result.Credential.Password, expectedPassword);
- authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+ authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
Times.Once);
}
@@ -185,7 +187,8 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
{
var targetUri = new Uri("https://example.com/bitbucket");
- var helperPath = "/usr/bin/test-helper";
+ var command = "/usr/bin/test-helper";
+ var args = "";
var expectedUserName = "jsquire";
var expectedPassword = "password";
var resultDict = new Dictionary
@@ -200,7 +203,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
context.SessionManager.IsDesktopSession = true; // Enable OAuth and UI helper selection
var authMock = new Mock(context) { CallBase = true };
- authMock.Setup(x => x.TryFindHelperExecutablePath(out helperPath))
+ authMock.Setup(x => x.TryFindHelperCommand(out command, out args))
.Returns(true);
authMock.Setup(x => x.InvokeHelperAsync(It.IsAny(), It.IsAny(), null, CancellationToken.None))
.ReturnsAsync(resultDict);
@@ -212,7 +215,7 @@ public async Task BitbucketAuthentication_GetCredentialsAsync_AllModes_NoUser_BB
Assert.Equal(result.Credential.Account, expectedUserName);
Assert.Equal(result.Credential.Password, expectedPassword);
- authMock.Verify(x => x.InvokeHelperAsync(helperPath, expectedArgs, null, CancellationToken.None),
+ authMock.Verify(x => x.InvokeHelperAsync(command, expectedArgs, null, CancellationToken.None),
Times.Once);
}
}
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketHelperTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketHelperTest.cs
new file mode 100644
index 000000000..cad371431
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/BitbucketHelperTest.cs
@@ -0,0 +1,60 @@
+using System;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests
+{
+ public class BitbucketHelperTest
+ {
+ [Theory]
+ [InlineData(null, false)]
+ [InlineData("", false)]
+ [InlineData(" ", false)]
+ [InlineData("bitbucket.org", true)]
+ [InlineData("BITBUCKET.ORG", true)]
+ [InlineData("BiTbUcKeT.OrG", true)]
+ [InlineData("bitbucket.example.com", false)]
+ [InlineData("bitbucket.example.org", false)]
+ [InlineData("bitbucket.org.com", false)]
+ [InlineData("bitbucket.org.org", false)]
+ public void BitbucketHelper_IsBitbucketOrg_StringHost(string str, bool expected)
+ {
+ bool actual = BitbucketHelper.IsBitbucketOrg(str);
+ Assert.Equal(expected, actual);
+ }
+
+ [Theory]
+ [InlineData("http://bitbucket.org", true)]
+ [InlineData("https://bitbucket.org", true)]
+ [InlineData("http://bitbucket.org/path", true)]
+ [InlineData("https://bitbucket.org/path", true)]
+ [InlineData("http://BITBUCKET.ORG", true)]
+ [InlineData("https://BITBUCKET.ORG", true)]
+ [InlineData("http://BITBUCKET.ORG/PATH", true)]
+ [InlineData("https://BITBUCKET.ORG/PATH", true)]
+ [InlineData("http://BiTbUcKeT.OrG", true)]
+ [InlineData("https://BiTbUcKeT.OrG", true)]
+ [InlineData("http://BiTbUcKeT.OrG/pAtH", true)]
+ [InlineData("https://BiTbUcKeT.OrG/pAtH", true)]
+ [InlineData("http://bitbucket.example.com", false)]
+ [InlineData("https://bitbucket.example.com", false)]
+ [InlineData("http://bitbucket.example.com/path", false)]
+ [InlineData("https://bitbucket.example.com/path", false)]
+ [InlineData("http://bitbucket.example.org", false)]
+ [InlineData("https://bitbucket.example.org", false)]
+ [InlineData("http://bitbucket.example.org/path", false)]
+ [InlineData("https://bitbucket.example.org/path", false)]
+ [InlineData("http://bitbucket.org.com", false)]
+ [InlineData("https://bitbucket.org.com", false)]
+ [InlineData("http://bitbucket.org.com/path", false)]
+ [InlineData("https://bitbucket.org.com/path", false)]
+ [InlineData("http://bitbucket.org.org", false)]
+ [InlineData("https://bitbucket.org.org", false)]
+ [InlineData("http://bitbucket.org.org/path", false)]
+ [InlineData("https://bitbucket.org.org/path", false)]
+ public void BitbucketHelper_IsBitbucketOrg_Uri(string str, bool expected)
+ {
+ bool actual = BitbucketHelper.IsBitbucketOrg(new Uri(str));
+ Assert.Equal(expected, actual);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs
index cf8216afc..734ee69b0 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs
+++ b/src/shared/Atlassian.Bitbucket.Tests/BitbucketHostProviderTest.cs
@@ -1,4 +1,6 @@
-using GitCredentialManager;
+using Atlassian.Bitbucket.Cloud;
+using Atlassian.Bitbucket.DataCenter;
+using GitCredentialManager;
using GitCredentialManager.Authentication.OAuth;
using GitCredentialManager.Tests.Objects;
using Moq;
@@ -23,58 +25,6 @@ public class BitbucketHostProviderTest
private Mock bitbucketAuthentication = new Mock(MockBehavior.Strict);
private Mock bitbucketApi = new Mock(MockBehavior.Strict);
- [Theory]
- [InlineData(null, false)]
- [InlineData("", false)]
- [InlineData(" ", false)]
- [InlineData("bitbucket.org", true)]
- [InlineData("BITBUCKET.ORG", true)]
- [InlineData("BiTbUcKeT.OrG", true)]
- [InlineData("bitbucket.example.com", false)]
- [InlineData("bitbucket.example.org", false)]
- [InlineData("bitbucket.org.com", false)]
- [InlineData("bitbucket.org.org", false)]
- public void BitbucketHostProvider_IsBitbucketOrg_StringHost(string str, bool expected)
- {
- bool actual = BitbucketHostProvider.IsBitbucketOrg(str);
- Assert.Equal(expected, actual);
- }
-
- [Theory]
- [InlineData("http://bitbucket.org", true)]
- [InlineData("https://bitbucket.org", true)]
- [InlineData("http://bitbucket.org/path", true)]
- [InlineData("https://bitbucket.org/path", true)]
- [InlineData("http://BITBUCKET.ORG", true)]
- [InlineData("https://BITBUCKET.ORG", true)]
- [InlineData("http://BITBUCKET.ORG/PATH", true)]
- [InlineData("https://BITBUCKET.ORG/PATH", true)]
- [InlineData("http://BiTbUcKeT.OrG", true)]
- [InlineData("https://BiTbUcKeT.OrG", true)]
- [InlineData("http://BiTbUcKeT.OrG/pAtH", true)]
- [InlineData("https://BiTbUcKeT.OrG/pAtH", true)]
- [InlineData("http://bitbucket.example.com", false)]
- [InlineData("https://bitbucket.example.com", false)]
- [InlineData("http://bitbucket.example.com/path", false)]
- [InlineData("https://bitbucket.example.com/path", false)]
- [InlineData("http://bitbucket.example.org", false)]
- [InlineData("https://bitbucket.example.org", false)]
- [InlineData("http://bitbucket.example.org/path", false)]
- [InlineData("https://bitbucket.example.org/path", false)]
- [InlineData("http://bitbucket.org.com", false)]
- [InlineData("https://bitbucket.org.com", false)]
- [InlineData("http://bitbucket.org.com/path", false)]
- [InlineData("https://bitbucket.org.com/path", false)]
- [InlineData("http://bitbucket.org.org", false)]
- [InlineData("https://bitbucket.org.org", false)]
- [InlineData("http://bitbucket.org.org/path", false)]
- [InlineData("https://bitbucket.org.org/path", false)]
- public void BitbucketHostProvider_IsBitbucketOrg_Uri(string str, bool expected)
- {
- bool actual = BitbucketHostProvider.IsBitbucketOrg(new Uri(str));
- Assert.Equal(expected, actual);
- }
-
[Theory]
[InlineData("https", null, false)]
// We report that we support unencrypted HTTP here so that we can fail and
@@ -147,10 +97,15 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_Stored_Basic(
var context = new TestCommandContext();
+ if (DC_SERVER_HOST.Equals(host))
+ {
+ MockDCSSOEnabled();
+ }
MockStoredAccount(context, input, password);
MockRemoteBasicValid(input, password);
+ // HACK rebase MockRemoteBasicAuthAccountIsValidNo2FA(bitbucketApi, input, password, username);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -158,22 +113,20 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_Stored_Basic(
Assert.Equal(password, credential.Password);
// Verify bitbucket.org credentials were validated
- if (BITBUCKET_DOT_ORG_HOST.Equals(host))
- {
VerifyValidateBasicAuthCredentialsRan(input, password);
- }
- else
- {
// Verify DC/Server credentials were not validated
- VerifyValidateBasicAuthCredentialsNeverRan();
- }
// Stored credentials so don't ask for more
VerifyInteractiveAuthNeverRan();
}
+ public Mock GetBitbucketApi()
+ {
+ return bitbucketApi;
+ }
+
[Theory]
- // DC/Server does not currently support OAuth
+ // Cloud
[InlineData("https", BITBUCKET_DOT_ORG_HOST, "jsquire", "password")]
public async Task BitbucketHostProvider_GetCredentialAsync_Valid_Stored_OAuth(
string protocol, string host, string username, string token)
@@ -182,10 +135,14 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_Stored_OAuth(
var context = new TestCommandContext();
+ if (DC_SERVER_HOST.Equals(host))
+ {
+ MockDCSSOEnabled();
+ }
MockStoredAccount(context, input, token);
MockRemoteAccessTokenValid(input, token);
-
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -199,6 +156,12 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_Stored_OAuth(
VerifyInteractiveAuthNeverRan();
}
+ private void MockDCSSOEnabled()
+ {
+ bitbucketApi.Setup(ba => ba.GetAuthenticationMethodsAsync()).Returns(Task.FromResult(new List(){AuthenticationMethod.BasicAuth, AuthenticationMethod.Sso}));
+ bitbucketApi.Setup(ba => ba.IsOAuthInstalledAsync()).Returns(Task.FromResult(true));
+ }
+
[Theory]
// DC
[InlineData("https", DC_SERVER_HOST, "jsquire", "password")]
@@ -214,7 +177,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_New_Basic(
MockPromptBasic(input, password);
MockRemoteBasicValid(input, password);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -238,7 +201,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_Valid_New_OAuth(
MockRemoteOAuthTokenCreate(input, accessToken, refreshToken);
MockRemoteAccessTokenValid(input, accessToken);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -264,9 +227,9 @@ public async Task BitbucketHostProvider_GetCredentialAsync_MissingAT_OAuth_Refre
// AT has does not exist, but RT is still valid
MockStoredRefreshToken(context, input, refreshToken);
MockRemoteAccessTokenValid(input, accessToken);
- MockRemoteRefreshTokenValid(refreshToken, accessToken);
+ MockRemoteRefreshTokenValid(input, refreshToken, accessToken);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -274,7 +237,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_MissingAT_OAuth_Refre
Assert.Equal(accessToken, credential.Password);
VerifyValidateAccessTokenRan(input, accessToken);
- VerifyOAuthRefreshRan(refreshToken);
+ VerifyOAuthRefreshRan(input, refreshToken);
VerifyInteractiveAuthNeverRan();
}
@@ -294,9 +257,9 @@ public async Task BitbucketHostProvider_GetCredentialAsync_ExpiredAT_OAuth_Refre
MockStoredRefreshToken(context, input, refreshToken);
MockRemoteAccessTokenValid(input, accessToken);
- MockRemoteRefreshTokenValid(refreshToken, accessToken);
+ MockRemoteRefreshTokenValid(input, refreshToken, accessToken);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -304,7 +267,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_ExpiredAT_OAuth_Refre
Assert.Equal(accessToken, credential.Password);
VerifyValidateAccessTokenRan(input, accessToken);
- VerifyOAuthRefreshRan(refreshToken);
+ VerifyOAuthRefreshRan(input, refreshToken);
VerifyInteractiveAuthNeverRan();
}
@@ -322,20 +285,19 @@ public async Task BitbucketHostProvider_GetCredentialAsync_PreconfiguredMode_OAu
// We have a stored RT so we can just use that without any prompts
MockStoredRefreshToken(context, input, refreshToken);
MockRemoteAccessTokenValid(input, accessToken);
- MockRemoteRefreshTokenValid(refreshToken, accessToken);
+ MockRemoteRefreshTokenValid(input, refreshToken, accessToken);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
Assert.NotNull(credential);
VerifyInteractiveAuthNeverRan();
- VerifyOAuthRefreshRan(refreshToken);
+ VerifyOAuthRefreshRan(input, refreshToken);
}
[Theory]
- // DC/Server does not currently support OAuth
[InlineData("https", BITBUCKET_DOT_ORG_HOST, "jsquire", MOCK_ACCESS_TOKEN, MOCK_ACCESS_TOKEN_ALT, MOCK_REFRESH_TOKEN)]
public async Task BitbucketHostProvider_GetCredentialAsync_AlwaysRefreshCredentials_OAuth_IsRespected(
string protocol, string host, string username, string storedToken, string newToken, string refreshToken)
@@ -350,9 +312,9 @@ public async Task BitbucketHostProvider_GetCredentialAsync_AlwaysRefreshCredenti
MockStoredAccount(context, input, storedToken);
MockStoredRefreshToken(context, input, refreshToken);
MockRemoteAccessTokenValid(input, newToken);
- MockRemoteRefreshTokenValid(refreshToken, newToken);
+ MockRemoteRefreshTokenValid(input, refreshToken, newToken);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -360,7 +322,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_AlwaysRefreshCredenti
Assert.Equal(newToken, credential.Password);
VerifyInteractiveAuthNeverRan();
- VerifyOAuthRefreshRan(refreshToken);
+ VerifyOAuthRefreshRan(input, refreshToken);
}
[Theory]
@@ -381,7 +343,7 @@ public async Task BitbucketHostProvider_GetCredentialAsync_AlwaysRefreshCredenti
MockStoredAccount(context, input, storedPassword);
MockPromptBasic(input, freshPassword);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
var credential = await provider.GetCredentialAsync(input);
@@ -392,21 +354,21 @@ public async Task BitbucketHostProvider_GetCredentialAsync_AlwaysRefreshCredenti
}
[Theory]
- // DC - supports Basic
- [InlineData("https://example.com", "basic", AuthenticationModes.Basic)]
- [InlineData("https://example.com", "oauth", AuthenticationModes.Basic)]
+ // DC - supports Basic, OAuth
+ [InlineData("https", "example.com", "basic", AuthenticationModes.Basic)]
+ [InlineData("https", "example.com", "oauth", AuthenticationModes.OAuth)]
+ [InlineData("https", "example.com", "NOT-A-REAL-VALUE", DataCenterConstants.ServerAuthenticationModes)]
+ [InlineData("https", "example.com", "none", DataCenterConstants.ServerAuthenticationModes)]
+ [InlineData("https", "example.com", null, DataCenterConstants.ServerAuthenticationModes)]
// Cloud - supports Basic, OAuth
- [InlineData("https://bitbucket.org", "oauth", AuthenticationModes.OAuth)]
- [InlineData("https://bitbucket.org", "basic", AuthenticationModes.Basic)]
- [InlineData("https://bitbucket.org", "NOT-A-REAL-VALUE", BitbucketConstants.DotOrgAuthenticationModes)]
- [InlineData("https://Bitbucket.org", "NOT-A-REAL-VALUE", BitbucketConstants.DotOrgAuthenticationModes)]
- [InlineData("https://bitbucket.org", "none", BitbucketConstants.DotOrgAuthenticationModes)]
- [InlineData("https://Bitbucket.org", "none", BitbucketConstants.DotOrgAuthenticationModes)]
- [InlineData("https://bitbucket.org", null, BitbucketConstants.DotOrgAuthenticationModes)]
- [InlineData("https://Bitbucket.org", null, BitbucketConstants.DotOrgAuthenticationModes)]
- public void BitbucketHostProvider_GetSupportedAuthenticationModes(string uriString, string bitbucketAuthModes, AuthenticationModes expectedModes)
- {
- var targetUri = new Uri(uriString);
+ [InlineData("https", "bitbucket.org", "oauth", AuthenticationModes.OAuth)]
+ [InlineData("https", "bitbucket.org", "basic", AuthenticationModes.Basic)]
+ [InlineData("https", "bitbucket.org", "NOT-A-REAL-VALUE", CloudConstants.DotOrgAuthenticationModes)]
+ [InlineData("https", "bitbucket.org", "none", CloudConstants.DotOrgAuthenticationModes)]
+ [InlineData("https", "bitbucket.org", null, CloudConstants.DotOrgAuthenticationModes)]
+ public async Task BitbucketHostProvider_GetSupportedAuthenticationModes(string protocol, string host, string bitbucketAuthModes, AuthenticationModes expectedModes)
+ {
+ var input = MockInput(protocol, host, null);
var context = new TestCommandContext();
if (bitbucketAuthModes != null)
@@ -414,9 +376,9 @@ public void BitbucketHostProvider_GetSupportedAuthenticationModes(string uriStri
context.Environment.Variables.Add(BitbucketConstants.EnvironmentVariables.AuthenticationModes, bitbucketAuthModes);
}
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
- AuthenticationModes actualModes = provider.GetSupportedAuthenticationModes(targetUri);
+ AuthenticationModes actualModes = await provider.GetSupportedAuthenticationModesAsync(input);
Assert.Equal(expectedModes, actualModes);
}
@@ -429,7 +391,7 @@ public async Task BitbucketHostProvider_StoreCredentialAsync(string protocol, st
var context = new TestCommandContext();
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
Assert.Equal(0, context.CredentialStore.Count);
@@ -448,7 +410,7 @@ public async Task BitbucketHostProvider_EraseCredentialAsync(string protocol, st
MockStoredAccount(context, input, password);
- var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, bitbucketApi.Object);
+ var provider = new BitbucketHostProvider(context, bitbucketAuthentication.Object, MockRestApiRegistry(input, bitbucketApi).Object);
Assert.Equal(1, context.CredentialStore.Count);
@@ -473,10 +435,8 @@ private static InputArguments MockInput(string protocol, string host, string use
private void VerifyOAuthFlowRan(InputArguments input, string token)
{
- var remoteUri = input.GetRemoteUri();
-
// Get new access token and refresh token
- bitbucketAuthentication.Verify(m => m.CreateOAuthCredentialsAsync(remoteUri), Times.Once);
+ bitbucketAuthentication.Verify(m => m.CreateOAuthCredentialsAsync(input), Times.Once);
// Check access token works/resolve username
bitbucketApi.Verify(m => m.GetUserInformationAsync(null, token, true), Times.Once);
@@ -512,15 +472,15 @@ private void VerifyInteractiveAuthNeverRan()
bitbucketAuthentication.Verify(m => m.GetCredentialsAsync(It.IsAny(), It.IsAny(), It.IsAny()), Times.Never);
}
- private void VerifyOAuthRefreshRan(string refreshToken)
+ private void VerifyOAuthRefreshRan(InputArguments input, string refreshToken)
{
// Check refresh was called
- bitbucketAuthentication.Verify(m => m.RefreshOAuthCredentialsAsync(refreshToken), Times.Once);
+ bitbucketAuthentication.Verify(m => m.RefreshOAuthCredentialsAsync(input, refreshToken), Times.Once);
}
- private void MockRemoteRefreshTokenValid(string refreshToken, string accessToken)
+ private void MockRemoteRefreshTokenValid(InputArguments input, string refreshToken, string accessToken)
{
- bitbucketAuthentication.Setup(m => m.RefreshOAuthCredentialsAsync(refreshToken)).ReturnsAsync(new OAuth2TokenResult(accessToken, "access_token"));
+ bitbucketAuthentication.Setup(m => m.RefreshOAuthCredentialsAsync(input, refreshToken)).ReturnsAsync(new OAuth2TokenResult(accessToken, "access_token"));
}
private void MockPromptBasic(InputArguments input, string password)
@@ -539,35 +499,37 @@ private void MockPromptOAuth(InputArguments input)
private void MockRemoteBasicValid(InputArguments input, string password, bool twoFactor = true)
{
- var userInfo = new UserInfo
- {
- UserName = input.UserName,
- IsTwoFactorAuthenticationEnabled = twoFactor
- };
+ var userInfo = new Mock(MockBehavior.Strict);
+ userInfo.Setup(ui => ui.IsTwoFactorAuthenticationEnabled).Returns(twoFactor);
+ userInfo.Setup(ui => ui.UserName).Returns(input.UserName);
// Basic
bitbucketApi.Setup(x => x.GetUserInformationAsync(input.UserName, password, false))
- .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.OK, userInfo));
+ .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.OK, userInfo.Object));
}
private void MockRemoteAccessTokenExpired(InputArguments input, string token)
{
// OAuth
bitbucketApi.Setup(x => x.GetUserInformationAsync(null, token, true))
- .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.Unauthorized));
+ .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.Unauthorized));
}
private void MockRemoteAccessTokenValid(InputArguments input, string token, bool twoFactor = true)
{
- var userInfo = new UserInfo
- {
- UserName = input.UserName,
- IsTwoFactorAuthenticationEnabled = twoFactor
- };
+ var userInfo = new Mock(MockBehavior.Strict);
+ userInfo.Setup(ui => ui.IsTwoFactorAuthenticationEnabled).Returns(twoFactor);
+ userInfo.Setup(ui => ui.UserName).Returns(input.UserName);
// OAuth
bitbucketApi.Setup(x => x.GetUserInformationAsync(null, token, true))
- .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.OK, userInfo));
+ .ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.OK, userInfo.Object));
+ }
+
+ private static void MockRemoteOAuthAccountIsInvalid(Mock bitbucketApi)
+ {
+ // OAuth
+ bitbucketApi.Setup(x => x.GetUserInformationAsync(null, It.IsAny(), true)).ReturnsAsync(new RestApiResult(System.Net.HttpStatusCode.BadRequest));
}
private static void MockStoredAccount(TestCommandContext context, InputArguments input, string password)
@@ -586,8 +548,7 @@ private static void MockStoredRefreshToken(TestCommandContext context, InputArgu
private void MockRemoteOAuthTokenCreate(InputArguments input, string accessToken, string refreshToken)
{
- var remoteUri = input.GetRemoteUri();
- bitbucketAuthentication.Setup(x => x.CreateOAuthCredentialsAsync(remoteUri))
+ bitbucketAuthentication.Setup(x => x.CreateOAuthCredentialsAsync(input))
.ReturnsAsync(new OAuth2TokenResult(accessToken, "access_token") { RefreshToken = refreshToken });
}
@@ -601,6 +562,15 @@ private void VerifyOAuthRefreshTokenStored(TestCommandContext context, InputArgu
Assert.Equal(refreshToken, credential.Password);
}
+ private static Mock> MockRestApiRegistry(InputArguments input, Mock bitbucketApi)
+ {
+ var restApiRegistry = new Mock>(MockBehavior.Strict);
+
+ restApiRegistry.Setup(rar => rar.Get(input)).Returns(bitbucketApi.Object);
+
+ return restApiRegistry;
+ }
+
#endregion
}
}
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiRegistryTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiRegistryTest.cs
new file mode 100644
index 000000000..ee4499dfb
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiRegistryTest.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using GitCredentialManager;
+using Moq;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests
+{
+ public class BitbucketRestApiRegistryTest
+ {
+ private Mock context = new Mock(MockBehavior.Strict);
+ private Mock settings = new Mock(MockBehavior.Strict);
+
+ [Fact]
+ public void BitbucketRestApiRegistry_Get_ReturnsCloudApi_ForBitbucketOrg()
+ {
+ // Given
+ settings.Setup(s => s.RemoteUri).Returns(new System.Uri("https://bitbucket.org"));
+ context.Setup(c => c.Settings).Returns(settings.Object);
+
+ var input = new InputArguments(new Dictionary
+ {
+ ["protocol"] = "https",
+ ["host"] = "bitbucket.org",
+ });
+
+ // When
+ var registry = new BitbucketRestApiRegistry(context.Object);
+ var api = registry.Get(input);
+
+ // Then
+ Assert.NotNull(api);
+ Assert.IsType(api);
+
+ }
+
+ [Fact]
+ public void BitbucketRestApiRegistry_Get_ReturnsDataCenterApi_ForBitbucketDC()
+ {
+ // Given
+ settings.Setup(s => s.RemoteUri).Returns(new System.Uri("https://example.com"));
+ context.Setup(c => c.Settings).Returns(settings.Object);
+
+ var input = new InputArguments(new Dictionary
+ {
+ ["protocol"] = "http",
+ ["host"] = "example.com",
+ });
+
+ // When
+ var registry = new BitbucketRestApiRegistry(context.Object);
+ var api = registry.Get(input);
+
+ // Then
+ Assert.NotNull(api);
+ Assert.IsType(api);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketTokenEndpointResponseJsonTest.cs b/src/shared/Atlassian.Bitbucket.Tests/BitbucketTokenEndpointResponseJsonTest.cs
new file mode 100644
index 000000000..02b7f35ec
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/BitbucketTokenEndpointResponseJsonTest.cs
@@ -0,0 +1,19 @@
+using Newtonsoft.Json;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests
+{
+ public class BitbucketTokenEndpointResponseJsonTest
+ {
+ [Fact]
+ public void BitbucketTokenEndpointResponseJson_Deserialize_Scopes_Not_Scope()
+ {
+ var scopesString = "a,b,c";
+ var json = "{access_token: '', token_type: '', scopes:'" + scopesString + "', scope: 'x,y,z'}";
+
+ var result = JsonConvert.DeserializeObject(json);
+
+ Assert.Equal(scopesString, result.Scope);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketOauth2ClientTest.cs b/src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketOAuth2ClientTest.cs
similarity index 67%
rename from src/shared/Atlassian.Bitbucket.Tests/BitbucketOauth2ClientTest.cs
rename to src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketOAuth2ClientTest.cs
index 699081a94..a1afb8f62 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/BitbucketOauth2ClientTest.cs
+++ b/src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketOAuth2ClientTest.cs
@@ -4,17 +4,19 @@
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
+using Atlassian.Bitbucket.Cloud;
using GitCredentialManager;
using GitCredentialManager.Authentication.OAuth;
using Moq;
using Xunit;
-namespace Atlassian.Bitbucket.Tests
+namespace Atlassian.Bitbucket.Tests.Cloud
{
public class BitbucketOAuth2ClientTest
{
private Mock httpClient = new Mock(MockBehavior.Strict);
private Mock settings = new Mock(MockBehavior.Loose);
+ private Mock trace = new Mock(MockBehavior.Loose);
private Mock browser = new Mock(MockBehavior.Strict);
private Mock codeGenerator = new Mock(MockBehavior.Strict);
private IEnumerable scopes = new List();
@@ -32,13 +34,13 @@ public async Task BitbucketOAuth2Client_GetAuthorizationCodeAsync_ReturnsCode()
Uri finalCallbackUri = MockFinalCallbackUri();
- MockGetAuthenticationCodeAsync(finalCallbackUri, null);
+ Bitbucket.Cloud.BitbucketOAuth2Client client = GetBitbucketOAuth2Client();
- MockCodeGenerator();
+ MockGetAuthenticationCodeAsync(finalCallbackUri, null, client.Scopes);
- BitbucketOAuth2Client client = GetBitbucketOAuth2Client();
+ MockCodeGenerator();
- var result = await client.GetAuthorizationCodeAsync(scopes, browser.Object, ct);
+ var result = await client.GetAuthorizationCodeAsync(browser.Object, ct);
VerifyAuthorizationCodeResult(result);
}
@@ -52,13 +54,13 @@ public async Task BitbucketOAuth2Client_GetAuthorizationCodeAsync_RespectsClient
Uri finalCallbackUri = MockFinalCallbackUri();
- MockGetAuthenticationCodeAsync(finalCallbackUri, clientId);
+ Bitbucket.Cloud.BitbucketOAuth2Client client = GetBitbucketOAuth2Client();
+
+ MockGetAuthenticationCodeAsync(finalCallbackUri, clientId, client.Scopes);
MockCodeGenerator();
- BitbucketOAuth2Client client = GetBitbucketOAuth2Client();
-
- var result = await client.GetAuthorizationCodeAsync(scopes, browser.Object, ct);
+ var result = await client.GetAuthorizationCodeAsync(browser.Object, ct);
VerifyAuthorizationCodeResult(result);
}
@@ -66,22 +68,28 @@ public async Task BitbucketOAuth2Client_GetAuthorizationCodeAsync_RespectsClient
[Fact]
public async Task BitbucketOAuth2Client_GetDeviceCodeAsync()
{
- var client = new BitbucketOAuth2Client(httpClient.Object, settings.Object);
+ var client = new Bitbucket.Cloud.BitbucketOAuth2Client(httpClient.Object, settings.Object, trace.Object);
await Assert.ThrowsAsync(async () => await client.GetDeviceCodeAsync(scopes, ct));
}
- private void VerifyOAuth2TokenResult(OAuth2TokenResult result)
+ [Theory]
+ [InlineData("https", "example.com", "john", "https://example.com/refresh_token")]
+ [InlineData("http", "example.com", "john", "http://example.com/refresh_token")]
+ [InlineData("https", "example.com", "dave", "https://example.com/refresh_token")]
+ [InlineData("https", "example.com/", "john", "https://example.com/refresh_token")]
+ public void BitbucketOAuth2Client_GetRefreshTokenServiceName(string protocol, string host, string username, string expectedResult)
{
- Assert.NotNull(result);
- IEnumerable access_token = null;
- Assert.Equal(access_token, result.AccessToken);
- IEnumerable refresh_token = null;
- Assert.Equal(refresh_token, result.RefreshToken);
- IEnumerable tokenType = null;
- Assert.Equal(tokenType, result.TokenType);
- Assert.Null(result.Scopes);
+ var client = new Bitbucket.Cloud.BitbucketOAuth2Client(httpClient.Object, settings.Object, trace.Object);
+ var input = new InputArguments(new Dictionary
+ {
+ ["protocol"] = protocol,
+ ["host"] = host,
+ ["username"] = username
+ });
+ Assert.Equal(expectedResult, client.GetRefreshTokenServiceName(input));
}
+
private void VerifyAuthorizationCodeResult(OAuth2AuthorizationCodeResult result)
{
Assert.NotNull(result);
@@ -90,9 +98,9 @@ private void VerifyAuthorizationCodeResult(OAuth2AuthorizationCodeResult result)
Assert.Equal(pkceCodeVerifier, result.CodeVerifier);
}
- private BitbucketOAuth2Client GetBitbucketOAuth2Client()
+ private Bitbucket.Cloud.BitbucketOAuth2Client GetBitbucketOAuth2Client()
{
- var client = new BitbucketOAuth2Client(httpClient.Object, settings.Object);
+ var client = new Bitbucket.Cloud.BitbucketOAuth2Client(httpClient.Object, settings.Object, trace.Object);
client.CodeGenerator = codeGenerator.Object;
return client;
}
@@ -104,16 +112,17 @@ private void MockCodeGenerator()
codeGenerator.Setup(c => c.CreatePkceCodeChallenge(OAuth2PkceChallengeMethod.Sha256, pkceCodeVerifier)).Returns(pkceCodeChallenge);
}
- private void MockGetAuthenticationCodeAsync(Uri finalCallbackUri, string overrideClientId)
+ private void MockGetAuthenticationCodeAsync(Uri finalCallbackUri, string overrideClientId, IEnumerable scopes)
{
- var authorizationUri = new UriBuilder(BitbucketConstants.OAuth2AuthorizationEndpoint)
+ var authorizationUri = new UriBuilder(CloudConstants.OAuth2AuthorizationEndpoint)
{
Query = "?response_type=code"
- + "&client_id=" + (overrideClientId ?? BitbucketConstants.OAuth2ClientId)
+ + "&client_id=" + (overrideClientId ?? CloudConstants.OAuth2ClientId)
+ "&state=12345"
+ "&code_challenge_method=" + OAuth2Constants.AuthorizationEndpoint.PkceChallengeMethodS256
+ "&code_challenge=" + WebUtility.UrlEncode(pkceCodeChallenge).ToLower()
+ "&redirect_uri=" + WebUtility.UrlEncode(rootCallbackUri.AbsoluteUri).ToLower()
+ + "&scope=" + WebUtility.UrlEncode(string.Join(" ", scopes)).ToLower()
}.Uri;
browser.Setup(b => b.GetAuthenticationCodeAsync(authorizationUri, rootCallbackUri, ct)).Returns(Task.FromResult(finalCallbackUri));
@@ -133,8 +142,8 @@ private string MockeClientIdOverride(bool set)
private string MockClientIdOverride(bool set, string value)
{
settings.Setup(s => s.TryGetSetting(
- BitbucketConstants.EnvironmentVariables.DevOAuthClientId,
- Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.DevOAuthClientId,
+ CloudConstants.EnvironmentVariables.OAuthClientId,
+ Constants.GitConfiguration.Credential.SectionName, CloudConstants.GitConfiguration.Credential.OAuthClientId,
out value)).Returns(set);
return value;
}
diff --git a/src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiTest.cs b/src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketRestApiTest.cs
similarity index 90%
rename from src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiTest.cs
rename to src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketRestApiTest.cs
index 7ed9192e8..c5a97b4a2 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/BitbucketRestApiTest.cs
+++ b/src/shared/Atlassian.Bitbucket.Tests/Cloud/BitbucketRestApiTest.cs
@@ -2,11 +2,12 @@
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
+using Atlassian.Bitbucket.Cloud;
using GitCredentialManager.Tests;
using GitCredentialManager.Tests.Objects;
using Xunit;
-namespace Atlassian.Bitbucket.Tests
+namespace Atlassian.Bitbucket.Tests.Cloud
{
public class BitbucketRestApiTest
{
@@ -51,9 +52,9 @@ public async Task BitbucketRestApi_GetUserInformationAsync_ReturnsUserInfo_ForSu
Assert.NotNull(result);
Assert.Equal(username, result.Response.UserName);
- Assert.Equal(accountId, result.Response.AccountId);
- Assert.Equal(uuid, result.Response.Uuid);
Assert.Equal(twoFactorAuthenticationEnabled, result.Response.IsTwoFactorAuthenticationEnabled);
+ Assert.Equal(accountId, ((UserInfo)result.Response).AccountId);
+ Assert.Equal(uuid, ((UserInfo)result.Response).Uuid);
httpHandler.AssertRequest(HttpMethod.Get, expectedRequestUri, 1);
}
diff --git a/src/shared/Atlassian.Bitbucket.Tests/Cloud/UserInfoTest.cs b/src/shared/Atlassian.Bitbucket.Tests/Cloud/UserInfoTest.cs
new file mode 100644
index 000000000..784a60594
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/Cloud/UserInfoTest.cs
@@ -0,0 +1,27 @@
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.Cloud;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests.Cloud
+{
+ public class UserInfoTest
+ {
+ [Fact]
+ public void UserInfo_Set()
+ {
+ var uuid = System.Guid.NewGuid();
+ var userInfo = new UserInfo()
+ {
+ AccountId = "abc",
+ IsTwoFactorAuthenticationEnabled = false,
+ UserName = "123",
+ Uuid = uuid
+ };
+
+ Assert.Equal("abc", userInfo.AccountId);
+ Assert.False(userInfo.IsTwoFactorAuthenticationEnabled);
+ Assert.Equal("123", userInfo.UserName);
+ Assert.Equal(uuid, userInfo.Uuid);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketOAuth2ClientTest.cs b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketOAuth2ClientTest.cs
new file mode 100644
index 000000000..97d194764
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketOAuth2ClientTest.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.DataCenter;
+using GitCredentialManager;
+using GitCredentialManager.Authentication.OAuth;
+using Moq;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests.DataCenter
+{
+ public class BitbucketOAuth2ClientTest
+ {
+ private Mock httpClient = new Mock(MockBehavior.Strict);
+ private Mock settings = new Mock(MockBehavior.Loose);
+ private Mock trace = new Mock(MockBehavior.Loose);
+ private Mock browser = new Mock(MockBehavior.Strict);
+ private Mock codeGenerator = new Mock(MockBehavior.Strict);
+ private CancellationToken ct = new CancellationToken();
+ private Uri rootCallbackUri = new Uri("http://localhost:34106/");
+ private string nonce = "12345";
+ private string pkceCodeVerifier = "abcde";
+ private string pkceCodeChallenge = "xyz987";
+ private string authorization_code = "authorization_token";
+
+ [Fact]
+ public async Task BitbucketOAuth2Client_GetAuthorizationCodeAsync_ReturnsCode()
+ {
+ var remoteUrl = MockRemoteUri("http://example.com");
+ var clientId = MockClientIdOverride("dc-client-id");
+ MockClientSecretOverride("dc-client-seccret");
+
+ Uri finalCallbackUri = MockFinalCallbackUri(rootCallbackUri);
+
+ var client = GetBitbucketOAuth2Client();
+
+ MockGetAuthenticationCodeAsync(remoteUrl, rootCallbackUri, finalCallbackUri, clientId, client.Scopes);
+
+ MockCodeGenerator();
+
+ var result = await client.GetAuthorizationCodeAsync(browser.Object, ct);
+
+ VerifyAuthorizationCodeResult(result, rootCallbackUri);
+ }
+
+ [Fact]
+ public async Task BitbucketOAuth2Client_GetAuthorizationCodeAsync_ReturnsCode_WhileRespectingRedirectUriOverride()
+ {
+ var rootCallbackUrl = MockRootCallbackUriOverride("http://localhost:12345/");
+ var remoteUrl = MockRemoteUri("http://example.com");
+ var clientId = MockClientIdOverride("dc-client-id");
+ MockClientSecretOverride("dc-client-seccret");
+
+ Uri finalCallbackUri = MockFinalCallbackUri(new Uri(rootCallbackUrl));
+
+ var client = GetBitbucketOAuth2Client();
+
+ MockGetAuthenticationCodeAsync(remoteUrl, new Uri(rootCallbackUrl), finalCallbackUri, clientId, client.Scopes);
+
+ MockCodeGenerator();
+
+ var result = await client.GetAuthorizationCodeAsync(browser.Object, ct);
+
+ VerifyAuthorizationCodeResult(result, new Uri(rootCallbackUrl));
+ }
+
+ private void VerifyAuthorizationCodeResult(OAuth2AuthorizationCodeResult result, Uri redirectUri)
+ {
+ Assert.NotNull(result);
+ Assert.Equal(authorization_code, result.Code);
+ Assert.Equal(redirectUri, result.RedirectUri);
+ Assert.Equal(pkceCodeVerifier, result.CodeVerifier);
+ }
+
+ private Bitbucket.DataCenter.BitbucketOAuth2Client GetBitbucketOAuth2Client()
+ {
+ var client = new Bitbucket.DataCenter.BitbucketOAuth2Client(httpClient.Object, settings.Object, trace.Object);
+ client.CodeGenerator = codeGenerator.Object;
+ return client;
+ }
+
+ private void MockCodeGenerator()
+ {
+ codeGenerator.Setup(c => c.CreateNonce()).Returns(nonce);
+ codeGenerator.Setup(c => c.CreatePkceCodeVerifier()).Returns(pkceCodeVerifier);
+ codeGenerator.Setup(c => c.CreatePkceCodeChallenge(OAuth2PkceChallengeMethod.Sha256, pkceCodeVerifier)).Returns(pkceCodeChallenge);
+ }
+
+ private void MockGetAuthenticationCodeAsync(string url, Uri redirectUri, Uri finalCallbackUri, string overrideClientId, IEnumerable scopes)
+ {
+ var authorizationUri = new UriBuilder(url + "/rest/oauth2/latest/authorize")
+ {
+ Query = "?response_type=code"
+ + "&client_id=" + (overrideClientId ?? "clientId")
+ + "&state=12345"
+ + "&code_challenge_method=" + OAuth2Constants.AuthorizationEndpoint.PkceChallengeMethodS256
+ + "&code_challenge=" + WebUtility.UrlEncode(pkceCodeChallenge).ToLower()
+ + "&redirect_uri=" + WebUtility.UrlEncode(redirectUri.AbsoluteUri).ToLower()
+ + "&scope=" + WebUtility.UrlEncode(string.Join(" ", scopes)).ToUpper()
+ }.Uri;
+
+ browser.Setup(b => b.GetAuthenticationCodeAsync(authorizationUri, redirectUri, ct)).Returns(Task.FromResult(finalCallbackUri));
+ }
+
+ private Uri MockFinalCallbackUri(Uri redirectUri)
+ {
+ var finalUri = new Uri(rootCallbackUri, "?state=" + nonce + "&code=" + authorization_code);
+ // This is a simplification but consistent
+ browser.Setup(b => b.UpdateRedirectUri(redirectUri)).Returns(redirectUri);
+ return finalUri;
+ }
+
+ private string MockRemoteUri(string value)
+ {
+ settings.Setup(s => s.RemoteUri).Returns(new Uri(value));
+ return value;
+ }
+
+ private string MockClientIdOverride(string value)
+ {
+ settings.Setup(s => s.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthClientId,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthClientId,
+ out value)).Returns(true);
+ return value;
+ }
+
+ private string MockClientSecretOverride(string value)
+ {
+ settings.Setup(s => s.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthClientSecret,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthClientSecret,
+ out value)).Returns(true);
+ return value;
+ }
+
+ private string MockRootCallbackUriOverride(string value)
+ {
+ settings.Setup(s => s.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthRedirectUri,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthRedirectUri,
+ out value)).Returns(true);
+ return value;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketRestApiTest.cs b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketRestApiTest.cs
new file mode 100644
index 000000000..b333804c6
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/BitbucketRestApiTest.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.DataCenter;
+using GitCredentialManager.Tests.Objects;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests.DataCenter
+{
+ public class BitbucketRestApiTest
+ {
+ [Fact]
+ public async Task BitbucketRestApi_GetUserInformationAsync_ReturnsUserInfo_ForSuccessfulRequest_DoesNothing()
+ {
+ var twoFactorAuthenticationEnabled = false;
+
+ var context = new TestCommandContext();
+
+ var expectedRequestUri = new Uri("http://example.com/rest/api/1.0/users");
+ var httpHandler = new TestHttpMessageHandler();
+ var httpResponse = new HttpResponseMessage(HttpStatusCode.OK);
+ httpHandler.Setup(HttpMethod.Get, expectedRequestUri, request =>
+ {
+ return httpResponse;
+ });
+ context.HttpClientFactory.MessageHandler = httpHandler;
+
+ context.Settings.RemoteUri = new Uri("http://example.com");
+
+ var api = new BitbucketRestApi(context);
+ var result = await api.GetUserInformationAsync("never used", "never used", false);
+
+ Assert.NotNull(result);
+ Assert.Equal(DataCenterConstants.OAuthUserName, result.Response.UserName);
+ Assert.Equal(twoFactorAuthenticationEnabled, result.Response.IsTwoFactorAuthenticationEnabled);
+
+ httpHandler.AssertRequest(HttpMethod.Get, expectedRequestUri, 1);
+ }
+
+ [Theory]
+ [InlineData(HttpStatusCode.Unauthorized, true)]
+ [InlineData(HttpStatusCode.NotFound, false)]
+ public async Task BitbucketRestApi_IsOAuthInstalledAsync_ReflectsBitbucketAuthenticationResponse(HttpStatusCode responseCode, bool impliedSupport)
+ {
+ var context = new TestCommandContext();
+ var httpHandler = new TestHttpMessageHandler();
+
+ var expectedRequestUri = new Uri("http://example.com/rest/oauth2/1.0/client");
+
+ var httpResponse = new HttpResponseMessage(responseCode);
+ httpHandler.Setup(HttpMethod.Get, expectedRequestUri, request =>
+ {
+ return httpResponse;
+ });
+
+ context.HttpClientFactory.MessageHandler = httpHandler;
+ context.Settings.RemoteUri = new Uri("http://example.com");
+
+ var api = new BitbucketRestApi(context);
+
+ var isInstalled = await api.IsOAuthInstalledAsync();
+
+ httpHandler.AssertRequest(HttpMethod.Get, expectedRequestUri, 1);
+
+ Assert.Equal(impliedSupport, isInstalled);
+ }
+
+ [Theory]
+ [MemberData(nameof(GetAuthenticationMethodsAsyncData))]
+ public async Task BitbucketRestApi_GetAuthenticationMethodsAsync_ReflectRestApiResponse(string loginOptionResponseJson, List impliedSupportedMethods, List impliedUnsupportedMethods)
+ {
+ var context = new TestCommandContext();
+ var httpHandler = new TestHttpMessageHandler();
+
+ var expectedRequestUri = new Uri("http://example.com/rest/authconfig/1.0/login-options");
+
+ var httpResponse = new HttpResponseMessage(HttpStatusCode.OK)
+ {
+ Content = new StringContent(loginOptionResponseJson)
+ };
+
+ httpHandler.Setup(HttpMethod.Get, expectedRequestUri, request =>
+ {
+ return httpResponse;
+ });
+
+ context.HttpClientFactory.MessageHandler = httpHandler;
+ context.Settings.RemoteUri = new Uri("http://example.com");
+
+ var api = new BitbucketRestApi(context);
+
+ var authMethods = await api.GetAuthenticationMethodsAsync();
+
+ httpHandler.AssertRequest(HttpMethod.Get, expectedRequestUri, 1);
+
+ Assert.NotNull(authMethods);
+ Assert.Equal(authMethods.Count, impliedSupportedMethods.Count);
+ Assert.Contains(authMethods, m => impliedSupportedMethods.Contains(m));
+ Assert.DoesNotContain(authMethods, m => impliedUnsupportedMethods.Contains(m));
+ }
+
+ public static IEnumerable GetAuthenticationMethodsAsyncData =>
+ new List
+ {
+ new object[] { $"{{ \"results\":[ {{ \"type\":\"LOGIN_FORM\"}}]}}",
+ new List{AuthenticationMethod.BasicAuth},
+ new List{AuthenticationMethod.Sso}},
+ new object[] { $"{{ \"results\":[{{\"type\":\"IDP\"}}]}}",
+ new List{AuthenticationMethod.Sso},
+ new List{AuthenticationMethod.BasicAuth}},
+ new object[] { $"{{ \"results\":[{{\"type\":\"IDP\"}}, {{ \"type\":\"LOGIN_FORM\"}}, {{ \"type\":\"UNDEFINED\"}}]}}",
+ new List{AuthenticationMethod.Sso, AuthenticationMethod.BasicAuth},
+ new List()},
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/DataCenter/LoginOptionsTest.cs b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/LoginOptionsTest.cs
new file mode 100644
index 000000000..6bb6efc85
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/LoginOptionsTest.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.DataCenter;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests.DataCenter
+{
+ public class LoginOptionsTest
+ {
+
+ [Fact]
+ public void LoginOptions_Set()
+ {
+ var loginOption = new LoginOption()
+ {
+ Type = "abc",
+ Id = 1
+ };
+
+ var results = new List()
+ {
+ loginOption
+ };
+
+ var loginOptions = new LoginOptions()
+ {
+ Results = results
+ };
+
+ Assert.NotNull(loginOptions.Results);
+ Assert.Contains(loginOption, loginOptions.Results);
+
+ Assert.Equal("abc", loginOptions.Results.First().Type);
+ Assert.Equal(1, loginOptions.Results.First().Id);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/DataCenter/UserInfoTest.cs b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/UserInfoTest.cs
new file mode 100644
index 000000000..4f1709660
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/DataCenter/UserInfoTest.cs
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+using Atlassian.Bitbucket.DataCenter;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests.DataCenter
+{
+ public class UserInfoTest
+ {
+ [Fact]
+ public void UserInfo_Set()
+ {
+ var uuid = System.Guid.NewGuid();
+ var userInfo = new UserInfo()
+ {
+ UserName = "123"
+ };
+
+ Assert.False(userInfo.IsTwoFactorAuthenticationEnabled);
+ Assert.Equal("123", userInfo.UserName);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket.Tests/OAuth2ClientRegistryTest.cs b/src/shared/Atlassian.Bitbucket.Tests/OAuth2ClientRegistryTest.cs
new file mode 100644
index 000000000..c7bc06917
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket.Tests/OAuth2ClientRegistryTest.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using Atlassian.Bitbucket.Cloud;
+using Atlassian.Bitbucket.DataCenter;
+using GitCredentialManager;
+using Moq;
+using Xunit;
+
+namespace Atlassian.Bitbucket.Tests
+{
+ public class OAuth2ClientRegistryTest
+ {
+ private Mock context = new Mock(MockBehavior.Loose);
+ private Mock settings = new Mock(MockBehavior.Strict);
+ private Mock httpClientFactory = new Mock(MockBehavior.Strict);
+ private Mock trace = new Mock(MockBehavior.Strict);
+
+ [Fact]
+ public void BitbucketRestApiRegistry_Get_ReturnsCloudOAuth2Client()
+ {
+ var host = "bitbucket.org";
+
+ // Given
+ settings.Setup(s => s.RemoteUri).Returns(new System.Uri("https://" + host));
+ context.Setup(c => c.Settings).Returns(settings.Object);
+ MockSettingOverride(CloudConstants.EnvironmentVariables.OAuthClientId, CloudConstants.GitConfiguration.Credential.OAuthClientId, "never used", false);
+ MockSettingOverride(CloudConstants.EnvironmentVariables.OAuthClientSecret, CloudConstants.GitConfiguration.Credential.OAuthClientSecret, "never used", false);
+ MockSettingOverride(CloudConstants.EnvironmentVariables.OAuthRedirectUri, CloudConstants.GitConfiguration.Credential.OAuthRedirectUri, "never used", false);
+ MockHttpClientFactory();
+ var input = MockInputArguments(host);
+
+ // When
+ var registry = new OAuth2ClientRegistry(context.Object);
+ var api = registry.Get(input);
+
+ // Then
+ Assert.NotNull(api);
+ Assert.IsType(api);
+
+ }
+
+ [Fact]
+ public void BitbucketRestApiRegistry_Get_ReturnsDataCenterOAuth2Client_ForBitbucketDC()
+ {
+ var host = "example.com";
+
+ // Given
+ settings.Setup(s => s.RemoteUri).Returns(new System.Uri("https://example.com"));
+ context.Setup(c => c.Settings).Returns(settings.Object);
+ MockSettingOverride(DataCenterConstants.EnvironmentVariables.OAuthClientId, DataCenterConstants.GitConfiguration.Credential.OAuthClientId, "", true);
+ MockSettingOverride(DataCenterConstants.EnvironmentVariables.OAuthClientSecret, DataCenterConstants.GitConfiguration.Credential.OAuthClientSecret, "", true); ;
+ MockSettingOverride(DataCenterConstants.EnvironmentVariables.OAuthRedirectUri, DataCenterConstants.GitConfiguration.Credential.OAuthRedirectUri, "never used", false);
+ MockHttpClientFactory();
+ var input = MockInputArguments(host);
+
+ // When
+ var registry = new OAuth2ClientRegistry(context.Object);
+ var api = registry.Get(input);
+
+ // Then
+ Assert.NotNull(api);
+ Assert.IsType(api);
+
+ }
+
+ private static InputArguments MockInputArguments(string host)
+ {
+ return new InputArguments(new Dictionary
+ {
+ ["protocol"] = "https",
+ ["host"] = host,
+ });
+ }
+
+ private void MockHttpClientFactory()
+ {
+ context.Setup(c => c.HttpClientFactory).Returns(httpClientFactory.Object);
+ httpClientFactory.Setup(f => f.CreateClient()).Returns(new HttpClient());
+ }
+
+ private string MockSettingOverride(string envKey, string configKey, string settingValue, bool isOverridden)
+ {
+ settings.Setup(s => s.TryGetSetting(
+ envKey,
+ Constants.GitConfiguration.Credential.SectionName, configKey,
+ out settingValue)).Returns(isOverridden);
+ return settingValue;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/AuthenticationMethod.cs b/src/shared/Atlassian.Bitbucket/AuthenticationMethod.cs
new file mode 100644
index 000000000..9e108c228
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/AuthenticationMethod.cs
@@ -0,0 +1,10 @@
+using System;
+namespace Atlassian.Bitbucket
+{
+ public enum AuthenticationMethod
+ {
+ BasicAuth,
+ Sso
+ }
+}
+
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs b/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs
index 14e7b3fb1..1cacd769e 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketAuthentication.cs
@@ -4,6 +4,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Atlassian.Bitbucket.Cloud;
using GitCredentialManager;
using GitCredentialManager.Authentication;
using GitCredentialManager.Authentication.OAuth;
@@ -23,8 +24,9 @@ public enum AuthenticationModes
public interface IBitbucketAuthentication : IDisposable
{
Task GetCredentialsAsync(Uri targetUri, string userName, AuthenticationModes modes);
- Task CreateOAuthCredentialsAsync(Uri targetUri);
- Task RefreshOAuthCredentialsAsync(string refreshToken);
+ Task CreateOAuthCredentialsAsync(InputArguments input);
+ Task RefreshOAuthCredentialsAsync(InputArguments input, string refreshToken);
+ string GetRefreshTokenServiceName(InputArguments input);
}
public class CredentialsPromptResult
@@ -49,17 +51,20 @@ public class BitbucketAuthentication : AuthenticationBase, IBitbucketAuthenticat
{
public static readonly string[] AuthorityIds =
{
- "bitbucket",
+ BitbucketConstants.Id,
};
- private static readonly string[] Scopes =
- {
- BitbucketConstants.OAuthScopes.RepositoryWrite,
- BitbucketConstants.OAuthScopes.Account,
- };
+ private readonly IRegistry _oauth2ClientRegistry;
public BitbucketAuthentication(ICommandContext context)
- : base(context) { }
+ : this(context, new OAuth2ClientRegistry(context)) { }
+
+ public BitbucketAuthentication(ICommandContext context, IRegistry oauth2ClientRegistry)
+ : base(context)
+ {
+ EnsureArgument.NotNull(oauth2ClientRegistry, nameof(oauth2ClientRegistry));
+ this._oauth2ClientRegistry = oauth2ClientRegistry;
+ }
public async Task GetCredentialsAsync(Uri targetUri, string userName, AuthenticationModes modes)
{
@@ -88,30 +93,31 @@ public async Task GetCredentialsAsync(Uri targetUri, st
// Shell out to the UI helper and show the Bitbucket u/p prompt
if (Context.Settings.IsGuiPromptsEnabled && Context.SessionManager.IsDesktopSession &&
- TryFindHelperExecutablePath(out string helperPath))
+ TryFindHelperCommand(out string helperCommand, out string args))
{
- var cmdArgs = new StringBuilder("prompt");
- if (!BitbucketHostProvider.IsBitbucketOrg(targetUri))
+ var promptArgs = new StringBuilder(args);
+ promptArgs.Append("prompt");
+ if (!BitbucketHelper.IsBitbucketOrg(targetUri))
{
- cmdArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));
+ promptArgs.AppendFormat(" --url {0}", QuoteCmdArg(targetUri.ToString()));
}
if (!string.IsNullOrWhiteSpace(userName))
{
- cmdArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
+ promptArgs.AppendFormat(" --username {0}", QuoteCmdArg(userName));
}
if ((modes & AuthenticationModes.Basic) != 0)
{
- cmdArgs.Append(" --show-basic");
+ promptArgs.Append(" --show-basic");
}
if ((modes & AuthenticationModes.OAuth) != 0)
{
- cmdArgs.Append(" --show-oauth");
+ promptArgs.Append(" --show-oauth");
}
- IDictionary output = await InvokeHelperAsync(helperPath, cmdArgs.ToString());
+ IDictionary output = await InvokeHelperAsync(helperCommand, promptArgs.ToString());
if (output.TryGetValue("mode", out string mode) &&
StringComparer.OrdinalIgnoreCase.Equals(mode, "oauth"))
@@ -189,12 +195,10 @@ public async Task GetCredentialsAsync(Uri targetUri, st
}
}
- public async Task CreateOAuthCredentialsAsync(Uri targetUri)
+ public async Task CreateOAuthCredentialsAsync(InputArguments input)
{
ThrowIfUserInteractionDisabled();
- var oauthClient = new BitbucketOAuth2Client(HttpClient, Context.Settings);
-
var browserOptions = new OAuth2WebBrowserOptions
{
SuccessResponseHtml = BitbucketResources.AuthenticationResponseSuccessHtml,
@@ -202,25 +206,32 @@ public async Task CreateOAuthCredentialsAsync(Uri targetUri)
};
var browser = new OAuth2SystemWebBrowser(Context.Environment, browserOptions);
- var authCodeResult = await oauthClient.GetAuthorizationCodeAsync(Scopes, browser, CancellationToken.None);
+ var oauth2Client = _oauth2ClientRegistry.Get(input);
- return await oauthClient.GetTokenByAuthorizationCodeAsync(authCodeResult, CancellationToken.None);
+ var authCodeResult = await oauth2Client.GetAuthorizationCodeAsync(browser, CancellationToken.None);
+ return await oauth2Client.GetTokenByAuthorizationCodeAsync(authCodeResult, CancellationToken.None);
}
- public async Task RefreshOAuthCredentialsAsync(string refreshToken)
+ public async Task RefreshOAuthCredentialsAsync(InputArguments input, string refreshToken)
{
- var oauthClient = new BitbucketOAuth2Client(HttpClient, Context.Settings);
+ var client = _oauth2ClientRegistry.Get(input);
+ return await client.GetTokenByRefreshTokenAsync(refreshToken, CancellationToken.None);
+ }
- return await oauthClient.GetTokenByRefreshTokenAsync(refreshToken, CancellationToken.None);
+ public string GetRefreshTokenServiceName(InputArguments input)
+ {
+ var client = _oauth2ClientRegistry.Get(input);
+ return client.GetRefreshTokenServiceName(input);
}
- protected internal virtual bool TryFindHelperExecutablePath(out string path)
+ protected internal virtual bool TryFindHelperCommand(out string command, out string args)
{
- return TryFindHelperExecutablePath(
+ return TryFindHelperCommand(
BitbucketConstants.EnvironmentVariables.AuthenticationHelper,
BitbucketConstants.GitConfiguration.Credential.AuthenticationHelper,
BitbucketConstants.DefaultAuthenticationHelper,
- out path);
+ out command,
+ out args);
}
private HttpClient _httpClient;
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketConstants.cs b/src/shared/Atlassian.Bitbucket/BitbucketConstants.cs
index d995fa276..514f05ea4 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketConstants.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketConstants.cs
@@ -4,36 +4,18 @@ namespace Atlassian.Bitbucket
{
public static class BitbucketConstants
{
- public const string BitbucketBaseUrlHost = "bitbucket.org";
- public static readonly Uri BitbucketApiUri = new Uri("https://api.bitbucket.org");
- public const string DefaultAuthenticationHelper = "Atlassian.Bitbucket.UI";
-
- // TODO: use the GCM client ID and secret once we have this approved.
- // Until then continue to use Sourcetree's values like GCM Windows.
- //public const string OAuth2ClientId = "b5AKdPfpgFdEGpKzPE";
- //public const string OAuth2ClientSecret = "7NUP5qUtSR3SxdFK4xAGaU6PMNvNdE59";
- //public static readonly Uri OAuth2RedirectUri = new Uri("http://localhost:46337/");
- public const string OAuth2ClientId = "HJdmKXV87DsmC9zSWB";
- public const string OAuth2ClientSecret = "wwWw47VB9ZHwMsD4Q4rAveHkbxNrMp3n";
- public static readonly Uri OAuth2RedirectUri = new Uri("http://localhost:34106/");
+ public const string Id = "bitbucket";
- public static readonly Uri OAuth2AuthorizationEndpoint = new Uri("https://bitbucket.org/site/oauth2/authorize");
- public static readonly Uri OAuth2TokenEndpoint = new Uri("https://bitbucket.org/site/oauth2/access_token");
+ public const string Name = "Bitbucket";
- public static class OAuthScopes
- {
- public const string RepositoryWrite = "repository:write";
- public const string Account = "account";
- }
+ public const string DefaultAuthenticationHelper = "Atlassian.Bitbucket.UI";
public static class EnvironmentVariables
{
public const string AuthenticationHelper = "GCM_BITBUCKET_HELPER";
- public const string DevOAuthClientId = "GCM_DEV_BITBUCKET_CLIENTID";
- public const string DevOAuthClientSecret = "GCM_DEV_BITBUCKET_CLIENTSECRET";
- public const string DevOAuthRedirectUri = "GCM_DEV_BITBUCKET_REDIRECTURI";
public const string AuthenticationModes = "GCM_BITBUCKET_AUTHMODES";
public const string AlwaysRefreshCredentials = "GCM_BITBUCKET_ALWAYS_REFRESH_CREDENTIALS";
+ public const String ValidateStoredCredentials = "GCM_BITBUCKET_VALIDATE_STORED_CREDENTIALS";
}
public static class GitConfiguration
@@ -41,14 +23,11 @@ public static class GitConfiguration
public static class Credential
{
public const string AuthenticationHelper = "bitbucketHelper";
- public const string DevOAuthClientId = "bitbucketDevClientId";
- public const string DevOAuthClientSecret = "bitbucketDevClientSecret";
- public const string DevOAuthRedirectUri = "bitbucketDevRedirectUri";
public const string AuthenticationModes = "bitbucketAuthModes";
public const string AlwaysRefreshCredentials = "bitbucketAlwaysRefreshCredentials";
+ public const string ValidateStoredCredentials = "bitbucketValidateStoredCredentials";
}
}
-
public static class HelpUrls
{
public const string DataCenterPasswordReset = "/passwordreset";
@@ -58,14 +37,5 @@ public static class HelpUrls
public const string TwoFactor = "https://support.atlassian.com/bitbucket-cloud/docs/enable-two-step-verification/";
}
- ///
- /// Supported authentication modes for Bitbucket.org
- ///
- public const AuthenticationModes DotOrgAuthenticationModes = AuthenticationModes.Basic | AuthenticationModes.OAuth;
-
- ///
- /// Supported authentication modes for Bitbucket Server/DC
- ///
- public const AuthenticationModes ServerAuthenticationModes = AuthenticationModes.Basic;
}
}
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketHelper.cs b/src/shared/Atlassian.Bitbucket/BitbucketHelper.cs
new file mode 100644
index 000000000..3624627f0
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/BitbucketHelper.cs
@@ -0,0 +1,32 @@
+using System;
+using Atlassian.Bitbucket.Cloud;
+using GitCredentialManager;
+
+namespace Atlassian.Bitbucket
+{
+ public static class BitbucketHelper
+ {
+ public static string GetBaseUri(Uri remoteUri)
+ {
+ var pathParts = remoteUri.PathAndQuery.Split('/');
+ var pathPart = remoteUri.PathAndQuery.StartsWith("/") ? pathParts[1] : pathParts[0];
+ var path = !string.IsNullOrWhiteSpace(pathPart) ? "/" + pathPart : null;
+ return $"{remoteUri.Scheme}://{remoteUri.Host}:{remoteUri.Port}{path}";
+ }
+
+ public static bool IsBitbucketOrg(InputArguments input)
+ {
+ return IsBitbucketOrg(input.GetRemoteUri());
+ }
+
+ public static bool IsBitbucketOrg(Uri targetUri)
+ {
+ return IsBitbucketOrg(targetUri.Host);
+ }
+
+ public static bool IsBitbucketOrg(string targetHost)
+ {
+ return StringComparer.OrdinalIgnoreCase.Equals(targetHost, CloudConstants.BitbucketBaseUrlHost);
+ }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs b/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs
index 0db55bd0d..f1950aca1 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketHostProvider.cs
@@ -3,6 +3,7 @@
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
+using Atlassian.Bitbucket.Cloud;
using GitCredentialManager;
using GitCredentialManager.Authentication.OAuth;
@@ -12,27 +13,27 @@ public class BitbucketHostProvider : IHostProvider
{
private readonly ICommandContext _context;
private readonly IBitbucketAuthentication _bitbucketAuth;
- private readonly IBitbucketRestApi _bitbucketApi;
+ private readonly IRegistry _restApiRegistry;
public BitbucketHostProvider(ICommandContext context)
- : this(context, new BitbucketAuthentication(context), new BitbucketRestApi(context)) { }
+ : this(context, new BitbucketAuthentication(context), new BitbucketRestApiRegistry(context)) { }
- public BitbucketHostProvider(ICommandContext context, IBitbucketAuthentication bitbucketAuth, IBitbucketRestApi bitbucketApi)
+ public BitbucketHostProvider(ICommandContext context, IBitbucketAuthentication bitbucketAuth, IRegistry restApiRegistry)
{
EnsureArgument.NotNull(context, nameof(context));
EnsureArgument.NotNull(bitbucketAuth, nameof(bitbucketAuth));
- EnsureArgument.NotNull(bitbucketApi, nameof(bitbucketApi));
+ EnsureArgument.NotNull(restApiRegistry, nameof(restApiRegistry));
_context = context;
_bitbucketAuth = bitbucketAuth;
- _bitbucketApi = bitbucketApi;
+ _restApiRegistry = restApiRegistry;
}
#region IHostProvider
- public string Id => "bitbucket";
+ public string Id => BitbucketConstants.Id;
- public string Name => "Bitbucket";
+ public string Name => BitbucketConstants.Name;
public IEnumerable SupportedAuthorityIds => BitbucketAuthentication.AuthorityIds;
@@ -54,7 +55,7 @@ public bool IsSupported(InputArguments input)
// error message for the user in `GetCredentialAsync`.
return (StringComparer.OrdinalIgnoreCase.Equals(input.Protocol, "http") ||
StringComparer.OrdinalIgnoreCase.Equals(input.Protocol, "https")) &&
- hostName.EndsWith(BitbucketConstants.BitbucketBaseUrlHost, StringComparison.OrdinalIgnoreCase);
+ hostName.EndsWith(CloudConstants.BitbucketBaseUrlHost, StringComparison.OrdinalIgnoreCase);
}
public bool IsSupported(HttpResponseMessage response)
@@ -76,20 +77,18 @@ public async Task GetCredentialAsync(InputArguments input)
{
// We should not allow unencrypted communication and should inform the user
if (StringComparer.OrdinalIgnoreCase.Equals(input.Protocol, "http")
- && input.TryGetHostAndPort(out string host, out _) && IsBitbucketOrg(host))
+ && BitbucketHelper.IsBitbucketOrg(input))
{
throw new Exception("Unencrypted HTTP is not supported for Bitbucket.org. Ensure the repository remote URL is using HTTPS.");
}
- Uri remoteUri = input.GetRemoteUri();
-
- AuthenticationModes authModes = GetSupportedAuthenticationModes(remoteUri);
+ var authModes = await GetSupportedAuthenticationModesAsync(input);
- return await GetStoredCredentials(remoteUri, input.UserName, authModes) ??
- await GetRefreshedCredentials(remoteUri, input.UserName, authModes);
+ return await GetStoredCredentials(input, authModes) ??
+ await GetRefreshedCredentials(input, authModes);
}
- private async Task GetStoredCredentials(Uri remoteUri, string userName, AuthenticationModes authModes)
+ private async Task GetStoredCredentials(InputArguments input, AuthenticationModes authModes)
{
if (_context.Settings.TryGetSetting(BitbucketConstants.EnvironmentVariables.AlwaysRefreshCredentials,
Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.AlwaysRefreshCredentials,
@@ -99,10 +98,11 @@ private async Task GetStoredCredentials(Uri remoteUri, string userN
return null;
}
+ Uri remoteUri = input.GetRemoteUri();
string credentialService = GetServiceName(remoteUri);
_context.Trace.WriteLine($"Look for existing credentials under {credentialService} ...");
- ICredential credentials = _context.CredentialStore.Get(credentialService, userName);
+ ICredential credentials = _context.CredentialStore.Get(credentialService, input.UserName);
if (credentials == null)
{
@@ -113,7 +113,7 @@ private async Task GetStoredCredentials(Uri remoteUri, string userN
_context.Trace.WriteLineSecrets($"Found stored credentials: {credentials.Account}/{{0}}", new object[] { credentials.Password });
// Check credentials are still valid
- if (!await ValidateCredentialsWork(remoteUri, credentials, authModes))
+ if (!await ValidateCredentialsWork(input, credentials, authModes))
{
return null;
}
@@ -121,16 +121,17 @@ private async Task GetStoredCredentials(Uri remoteUri, string userN
return credentials;
}
- private async Task GetRefreshedCredentials(Uri remoteUri, string userName, AuthenticationModes authModes)
+ private async Task GetRefreshedCredentials(InputArguments input, AuthenticationModes authModes)
{
_context.Trace.WriteLine("Refresh credentials...");
// Check for presence of refresh_token entry in credential store
+ Uri remoteUri = input.GetRemoteUri();
var refreshTokenService = GetRefreshTokenServiceName(remoteUri);
_context.Trace.WriteLine("Checking for refresh token...");
ICredential refreshToken = SupportsOAuth(authModes)
- ? _context.CredentialStore.Get(refreshTokenService, userName)
+ ? _context.CredentialStore.Get(refreshTokenService, input.UserName)
: null;
if (refreshToken is null)
@@ -141,7 +142,7 @@ private async Task GetRefreshedCredentials(Uri remoteUri, string us
_context.Trace.WriteLine("Prompt for credentials...");
- var result = await _bitbucketAuth.GetCredentialsAsync(remoteUri, userName, authModes);
+ var result = await _bitbucketAuth.GetCredentialsAsync(remoteUri, input.UserName, authModes);
if (result is null || result.AuthenticationMode == AuthenticationModes.None)
{
_context.Trace.WriteLine("User cancelled credential prompt");
@@ -171,7 +172,7 @@ private async Task GetRefreshedCredentials(Uri remoteUri, string us
try
{
- return await GetOAuthCredentialsViaRefreshFlow(remoteUri, refreshToken);
+ return await GetOAuthCredentialsViaRefreshFlow(input, refreshToken);
}
catch (OAuth2Exception ex)
{
@@ -183,19 +184,21 @@ private async Task GetRefreshedCredentials(Uri remoteUri, string us
}
}
- return await GetOAuthCredentialsViaInteractiveBrowserFlow(remoteUri);
+ return await GetOAuthCredentialsViaInteractiveBrowserFlow(input);
}
- private async Task GetOAuthCredentialsViaRefreshFlow(Uri remoteUri, ICredential refreshToken)
+ private async Task GetOAuthCredentialsViaRefreshFlow(InputArguments input, ICredential refreshToken)
{
+ Uri remoteUri = input.GetRemoteUri();
+
var refreshTokenService = GetRefreshTokenServiceName(remoteUri);
_context.Trace.WriteLine("Refreshing OAuth credentials using refresh token...");
- OAuth2TokenResult refreshResult = await _bitbucketAuth.RefreshOAuthCredentialsAsync(refreshToken.Password);
+ OAuth2TokenResult refreshResult = await _bitbucketAuth.RefreshOAuthCredentialsAsync(input, refreshToken.Password);
// Resolve the username
_context.Trace.WriteLine("Resolving username for refreshed OAuth credential...");
- string refreshUserName = await ResolveOAuthUserNameAsync(refreshResult.AccessToken);
+ string refreshUserName = await ResolveOAuthUserNameAsync(input, refreshResult.AccessToken);
_context.Trace.WriteLine($"Username for refreshed OAuth credential is '{refreshUserName}'");
// Store the refreshed RT
@@ -206,8 +209,10 @@ private async Task GetOAuthCredentialsViaRefreshFlow(Uri remoteUri,
return new GitCredential(refreshUserName, refreshResult.AccessToken);
}
- private async Task GetOAuthCredentialsViaInteractiveBrowserFlow(Uri remoteUri)
+ private async Task GetOAuthCredentialsViaInteractiveBrowserFlow(InputArguments input)
{
+ Uri remoteUri = input.GetRemoteUri();
+
var refreshTokenService = GetRefreshTokenServiceName(remoteUri);
// We failed to use the refresh token either because it didn't exist, or because the refresh token is no
@@ -215,11 +220,11 @@ private async Task GetOAuthCredentialsViaInteractiveBrowserFlow(Uri
// Start OAuth authentication flow
_context.Trace.WriteLine("Starting OAuth authentication flow...");
- OAuth2TokenResult oauthResult = await _bitbucketAuth.CreateOAuthCredentialsAsync(remoteUri);
+ OAuth2TokenResult oauthResult = await _bitbucketAuth.CreateOAuthCredentialsAsync(input);
// Resolve the username
_context.Trace.WriteLine("Resolving username for OAuth credential...");
- string newUserName = await ResolveOAuthUserNameAsync(oauthResult.AccessToken);
+ string newUserName = await ResolveOAuthUserNameAsync(input, oauthResult.AccessToken);
_context.Trace.WriteLine($"Username for OAuth credential is '{newUserName}'");
// Store the new RT
@@ -241,14 +246,8 @@ private static bool SupportsBasicAuth(AuthenticationModes authModes)
return (authModes & AuthenticationModes.Basic) != 0;
}
- public AuthenticationModes GetSupportedAuthenticationModes(Uri targetUri)
+ public async Task GetSupportedAuthenticationModesAsync(InputArguments input)
{
- if (!IsBitbucketOrg(targetUri))
- {
- // Bitbucket Server/DC should use Basic only
- return BitbucketConstants.ServerAuthenticationModes;
- }
-
// Check for an explicit override for supported authentication modes
if (_context.Settings.TryGetSetting(
BitbucketConstants.EnvironmentVariables.AuthenticationModes,
@@ -266,10 +265,47 @@ public AuthenticationModes GetSupportedAuthenticationModes(Uri targetUri)
}
}
- // Bitbucket.org should use Basic, OAuth or manual PAT based authentication only
- _context.Trace.WriteLine($"{targetUri} is bitbucket.org - authentication schemes: '{BitbucketConstants.DotOrgAuthenticationModes}'");
- return BitbucketConstants.DotOrgAuthenticationModes;
+ // It isn't possible to detect what Bitbucket.org is expecting so return the predefined answers.
+ if (BitbucketHelper.IsBitbucketOrg(input))
+ {
+ // Bitbucket should use Basic, OAuth or manual PAT based authentication only
+ _context.Trace.WriteLine($"{input.GetRemoteUri()} is bitbucket.org - authentication schemes: '{CloudConstants.DotOrgAuthenticationModes}'");
+ return CloudConstants.DotOrgAuthenticationModes;
+ }
+
+ // For Bitbucket DC/Server the supported modes can be detected
+ _context.Trace.WriteLine($"{input.GetRemoteUri()} is Bitbucket DC - checking for supported authentication schemes...");
+
+ try
+ {
+ var authenticationMethods = await _restApiRegistry.Get(input).GetAuthenticationMethodsAsync();
+
+ var modes = AuthenticationModes.None;
+
+ if (authenticationMethods.Contains(AuthenticationMethod.BasicAuth))
+ {
+ modes |= AuthenticationModes.Basic;
+ }
+
+ var isOauthInstalled = await _restApiRegistry.Get(input).IsOAuthInstalledAsync();
+ if (isOauthInstalled)
+ {
+ modes |= AuthenticationModes.OAuth;
+ }
+
+ _context.Trace.WriteLine($"Bitbucket DC/Server instance supports authentication schemes: {modes}");
+ return modes;
+ }
+ catch (Exception ex)
+ {
+ _context.Trace.WriteLine($"Failed to query '{input.GetRemoteUri()}' for supported authentication schemes.");
+ _context.Trace.WriteException(ex);
+
+ _context.Terminal.WriteLine($"warning: failed to query '{input.GetRemoteUri()}' for supported authentication schemes.");
+ // Fall-back to offering all modes so the user is never blocked from authenticating by at least one mode
+ return AuthenticationModes.All;
+ }
}
public Task StoreCredentialAsync(InputArguments input)
@@ -312,9 +348,9 @@ public Task EraseCredentialAsync(InputArguments input)
#region Private Methods
- private async Task ResolveOAuthUserNameAsync(string accessToken)
+ private async Task ResolveOAuthUserNameAsync(InputArguments input, string accessToken)
{
- RestApiResult result = await _bitbucketApi.GetUserInformationAsync(null, accessToken, isBearerToken: true);
+ RestApiResult result = await _restApiRegistry.Get(input).GetUserInformationAsync(null, accessToken, isBearerToken: true);
if (result.Succeeded)
{
return result.Response.UserName;
@@ -323,9 +359,9 @@ private async Task ResolveOAuthUserNameAsync(string accessToken)
throw new Exception($"Failed to resolve username. HTTP: {result.StatusCode}");
}
- private async Task ResolveBasicAuthUserNameAsync(string username, string password)
+ private async Task ResolveBasicAuthUserNameAsync(InputArguments input, string username, string password)
{
- RestApiResult result = await _bitbucketApi.GetUserInformationAsync(username, password, isBearerToken: false);
+ RestApiResult result = await _restApiRegistry.Get(input).GetUserInformationAsync(username, password, isBearerToken: false);
if (result.Succeeded)
{
return result.Response.UserName;
@@ -334,8 +370,17 @@ private async Task ResolveBasicAuthUserNameAsync(string username, string
throw new Exception($"Failed to resolve username. HTTP: {result.StatusCode}");
}
- private async Task ValidateCredentialsWork(Uri remoteUri, ICredential credentials, AuthenticationModes authModes)
+ private async Task ValidateCredentialsWork(InputArguments input, ICredential credentials, AuthenticationModes authModes)
{
+ if (_context.Settings.TryGetSetting(
+ BitbucketConstants.EnvironmentVariables.ValidateStoredCredentials,
+ Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.ValidateStoredCredentials,
+ out string validateStoredCredentials) && !validateStoredCredentials.ToBooleanyOrDefault(true))
+ {
+ _context.Trace.WriteLine($"Skipping validation of stored credentials due to {BitbucketConstants.GitConfiguration.Credential.ValidateStoredCredentials} = {validateStoredCredentials}");
+ return true;
+ }
+
if (credentials is null)
{
return false;
@@ -344,31 +389,23 @@ private async Task ValidateCredentialsWork(Uri remoteUri, ICredential cred
// TODO: ideally we'd also check if the credentials have expired based on some local metadata
// (once/if we get such metadata storage), and return false if they have.
// This would be more efficient than having to make REST API calls to check.
-
+ Uri remoteUri = input.GetRemoteUri();
_context.Trace.WriteLineSecrets($"Validate credentials ({credentials.Account}/{{0}}) are fresh for {remoteUri} ...", new object[] { credentials.Password });
- if (!IsBitbucketOrg(remoteUri))
- {
- // TODO: Validate DC/Server credentials before returning them to Git
- // Currently credentials for DC/Server are not checked by GCM.
- // Instead the validation relies on Git to try and fail with the credentials and then request GCM to erase them
- _context.Trace.WriteLine("For DC/Server skip validating existing credentials");
- return await Task.FromResult(true);
- }
-
// Bitbucket supports both OAuth + Basic Auth unless there is explicit GCM configuration.
// The credentials could be for either scheme therefore need to potentially test both possibilities.
if (SupportsOAuth(authModes))
{
try
{
- await ResolveOAuthUserNameAsync(credentials.Password);
+ await ResolveOAuthUserNameAsync(input, credentials.Password);
_context.Trace.WriteLine("Validated existing credentials using OAuth");
return true;
}
- catch (Exception)
+ catch (Exception ex)
{
- _context.Trace.WriteLine("Failed to validate existing credentials using OAuth");
+ _context.Trace.WriteLine($"Failed to validate existing credentials using OAuth");
+ _context.Trace.WriteException(ex);
}
}
@@ -376,13 +413,14 @@ private async Task ValidateCredentialsWork(Uri remoteUri, ICredential cred
{
try
{
- await ResolveBasicAuthUserNameAsync(credentials.Account, credentials.Password);
+ await ResolveBasicAuthUserNameAsync(input, credentials.Account, credentials.Password);
_context.Trace.WriteLine("Validated existing credentials using BasicAuth");
return true;
}
- catch (Exception)
+ catch (Exception ex)
{
- _context.Trace.WriteLine("Failed to validate existing credentials using Basic Auth");
+ _context.Trace.WriteLine($"Failed to validate existing credentials using Basic Auth");
+ _context.Trace.WriteException(ex);
return false;
}
}
@@ -406,21 +444,11 @@ private static string GetServiceName(Uri remoteUri)
return uri.AbsoluteUri.TrimEnd('/');
}
- public static bool IsBitbucketOrg(Uri targetUri)
- {
- return IsBitbucketOrg(targetUri.Host);
- }
-
- public static bool IsBitbucketOrg(string host)
- {
- return StringComparer.OrdinalIgnoreCase.Equals(host, BitbucketConstants.BitbucketBaseUrlHost);
- }
-
#endregion
public void Dispose()
{
- _bitbucketApi.Dispose();
+ _restApiRegistry.Dispose();
_bitbucketAuth.Dispose();
}
}
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs b/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
index cda6ff2f2..9d4f0043e 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
+++ b/src/shared/Atlassian.Bitbucket/BitbucketOAuth2Client.cs
@@ -1,64 +1,35 @@
-using System;
+using System;
+using System.Collections.Generic;
using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
using GitCredentialManager;
using GitCredentialManager.Authentication.OAuth;
-using GitCredentialManager.Authentication.OAuth.Json;
-using Newtonsoft.Json;
namespace Atlassian.Bitbucket
{
- public class BitbucketOAuth2Client : OAuth2Client
+ public abstract class BitbucketOAuth2Client : OAuth2Client
{
- private static readonly OAuth2ServerEndpoints Endpoints = new OAuth2ServerEndpoints(
- BitbucketConstants.OAuth2AuthorizationEndpoint,
- BitbucketConstants.OAuth2TokenEndpoint);
-
- public BitbucketOAuth2Client(HttpClient httpClient, ISettings settings)
- : base(httpClient, Endpoints,
- GetClientId(settings), GetRedirectUri(settings), GetClientSecret(settings))
+ public BitbucketOAuth2Client(HttpClient httpClient, OAuth2ServerEndpoints endpoints, string clientId, Uri redirectUri, string clientSecret, ITrace trace) : base(httpClient, endpoints, clientId, redirectUri, clientSecret, trace, false)
{
}
- private static string GetClientId(ISettings settings)
- {
- // Check for developer override value
- if (settings.TryGetSetting(
- BitbucketConstants.EnvironmentVariables.DevOAuthClientId,
- Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.DevOAuthClientId,
- out string clientId))
- {
- return clientId;
- }
-
- return BitbucketConstants.OAuth2ClientId;
- }
+ public abstract IEnumerable Scopes { get; }
- private static Uri GetRedirectUri(ISettings settings)
+ public string GetRefreshTokenServiceName(InputArguments input)
{
- // Check for developer override value
- if (settings.TryGetSetting(
- BitbucketConstants.EnvironmentVariables.DevOAuthRedirectUri,
- Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.DevOAuthRedirectUri,
- out string redirectUriStr) && Uri.TryCreate(redirectUriStr, UriKind.Absolute, out Uri redirectUri))
- {
- return redirectUri;
- }
+ Uri baseUri = input.GetRemoteUri(includeUser: false);
- return BitbucketConstants.OAuth2RedirectUri;
+ // The refresh token key never includes the path component.
+ // Instead we use the path component to specify this is the "refresh_token".
+ Uri uri = new UriBuilder(baseUri) { Path = "/refresh_token" }.Uri;
+
+ return uri.AbsoluteUri.TrimEnd('/');
}
- private static string GetClientSecret(ISettings settings)
+ public Task GetAuthorizationCodeAsync(IOAuth2WebBrowser browser, CancellationToken ct)
{
- // Check for developer override value
- if (settings.TryGetSetting(
- BitbucketConstants.EnvironmentVariables.DevOAuthClientSecret,
- Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.DevOAuthClientSecret,
- out string clientId))
- {
- return clientId;
- }
-
- return BitbucketConstants.OAuth2ClientSecret;
+ return GetAuthorizationCodeAsync(Scopes, browser, ct);
}
protected override bool TryCreateTokenEndpointResult(string json, out OAuth2TokenResult result)
@@ -75,12 +46,5 @@ protected override bool TryCreateTokenEndpointResult(string json, out OAuth2Toke
result = null;
return false;
}
-
- private class BitbucketTokenEndpointResponseJson : TokenEndpointResponseJson
- {
- // Bitbucket uses "scopes" for the scopes property name rather than the standard "scope" name
- [JsonProperty("scopes")]
- public override string Scope { get; set; }
- }
}
}
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketRestApiRegistry.cs b/src/shared/Atlassian.Bitbucket/BitbucketRestApiRegistry.cs
new file mode 100644
index 000000000..950a46855
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/BitbucketRestApiRegistry.cs
@@ -0,0 +1,37 @@
+using Atlassian.Bitbucket.Cloud;
+using GitCredentialManager;
+
+namespace Atlassian.Bitbucket
+{
+ public class BitbucketRestApiRegistry : IRegistry
+ {
+ private readonly ICommandContext context;
+ private BitbucketRestApi cloudApi;
+ private DataCenter.BitbucketRestApi dataCenterApi;
+
+ public BitbucketRestApiRegistry(ICommandContext context)
+ {
+ this.context = context;
+ }
+
+ public IBitbucketRestApi Get(InputArguments input)
+ {
+ if(!BitbucketHelper.IsBitbucketOrg(input))
+ {
+ return DataCenterApi;
+ }
+
+ return CloudApi;
+ }
+
+ public void Dispose()
+ {
+ context.Dispose();
+ cloudApi?.Dispose();
+ dataCenterApi?.Dispose();
+ }
+
+ private Cloud.BitbucketRestApi CloudApi => cloudApi ??= new Cloud.BitbucketRestApi(context);
+ private DataCenter.BitbucketRestApi DataCenterApi => dataCenterApi ??= new DataCenter.BitbucketRestApi(context);
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs b/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs
new file mode 100644
index 000000000..7468b09c4
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/BitbucketTokenEndpointResponseJson.cs
@@ -0,0 +1,12 @@
+using GitCredentialManager.Authentication.OAuth.Json;
+using Newtonsoft.Json;
+
+namespace Atlassian.Bitbucket
+{
+ public class BitbucketTokenEndpointResponseJson : TokenEndpointResponseJson
+ {
+ // Bitbucket uses "scopes" for the scopes property name rather than the standard "scope" name
+ [JsonProperty("scopes")]
+ public override string Scope { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/Cloud/BitbucketOAuth2Client.cs b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketOAuth2Client.cs
new file mode 100644
index 000000000..9e49c10c6
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketOAuth2Client.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using GitCredentialManager;
+using GitCredentialManager.Authentication.OAuth;
+
+namespace Atlassian.Bitbucket.Cloud
+{
+ public class BitbucketOAuth2Client : Bitbucket.BitbucketOAuth2Client
+ {
+ public BitbucketOAuth2Client(HttpClient httpClient, ISettings settings, ITrace trace)
+ : base(httpClient, GetEndpoints(),
+ GetClientId(settings), GetRedirectUri(settings), GetClientSecret(settings), trace)
+ {
+ }
+
+ public override IEnumerable Scopes => new string[] {
+ CloudConstants.OAuthScopes.RepositoryWrite,
+ CloudConstants.OAuthScopes.Account,
+ };
+
+ private static string GetClientId(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ CloudConstants.EnvironmentVariables.OAuthClientId,
+ Constants.GitConfiguration.Credential.SectionName, CloudConstants.GitConfiguration.Credential.OAuthClientId,
+ out string clientId))
+ {
+ return clientId;
+ }
+
+ return CloudConstants.OAuth2ClientId;
+ }
+
+ private static Uri GetRedirectUri(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ CloudConstants.EnvironmentVariables.OAuthRedirectUri,
+ Constants.GitConfiguration.Credential.SectionName, CloudConstants.GitConfiguration.Credential.OAuthRedirectUri,
+ out string redirectUriStr) && Uri.TryCreate(redirectUriStr, UriKind.Absolute, out Uri redirectUri))
+ {
+ return redirectUri;
+ }
+
+ return CloudConstants.OAuth2RedirectUri;
+ }
+
+ private static string GetClientSecret(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ CloudConstants.EnvironmentVariables.OAuthClientSecret,
+ Constants.GitConfiguration.Credential.SectionName, CloudConstants.GitConfiguration.Credential.OAuthClientSecret,
+ out string clientSecret))
+ {
+ return clientSecret;
+ }
+
+ return CloudConstants.OAuth2ClientSecret;
+ }
+
+ private static OAuth2ServerEndpoints GetEndpoints()
+ {
+ return new OAuth2ServerEndpoints(
+ CloudConstants.OAuth2AuthorizationEndpoint,
+ CloudConstants.OAuth2TokenEndpoint
+ );
+ }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/BitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
similarity index 55%
rename from src/shared/Atlassian.Bitbucket/BitbucketRestApi.cs
rename to src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
index 21b658fb5..ec56436be 100644
--- a/src/shared/Atlassian.Bitbucket/BitbucketRestApi.cs
+++ b/src/shared/Atlassian.Bitbucket/Cloud/BitbucketRestApi.cs
@@ -1,54 +1,16 @@
using System;
-using System.Net;
+using System.Collections.Generic;
using System.Net.Http;
using System.Threading.Tasks;
using GitCredentialManager;
using Newtonsoft.Json;
-namespace Atlassian.Bitbucket
+namespace Atlassian.Bitbucket.Cloud
{
- public interface IBitbucketRestApi : IDisposable
- {
- Task> GetUserInformationAsync(string userName, string password, bool isBearerToken);
- }
-
- public class RestApiResult
- {
- public RestApiResult(HttpStatusCode statusCode)
- : this(statusCode, default(T)) { }
-
- public RestApiResult(HttpStatusCode statusCode, T response)
- {
- StatusCode = statusCode;
- Response = response;
- }
-
- public HttpStatusCode StatusCode { get; }
-
- public T Response { get; }
-
- public bool Succeeded => 199 < (int) StatusCode && (int) StatusCode < 300;
- }
-
- public class UserInfo
- {
- [JsonProperty("has_2fa_enabled")]
- public bool IsTwoFactorAuthenticationEnabled { get; set; }
-
- [JsonProperty("username")]
- public string UserName { get; set; }
-
- [JsonProperty("account_id")]
- public string AccountId { get; set; }
-
- [JsonProperty("uuid")]
- public Guid Uuid { get; set; }
- }
-
public class BitbucketRestApi : IBitbucketRestApi
{
private readonly ICommandContext _context;
- private readonly Uri _apiUri = BitbucketConstants.BitbucketApiUri;
+ private readonly Uri _apiUri = CloudConstants.BitbucketApiUri;
public BitbucketRestApi(ICommandContext context)
{
@@ -57,7 +19,7 @@ public BitbucketRestApi(ICommandContext context)
_context = context;
}
- public async Task> GetUserInformationAsync(string userName, string password, bool isBearerToken)
+ public async Task> GetUserInformationAsync(string userName, string password, bool isBearerToken)
{
var requestUri = new Uri(_apiUri, "2.0/user");
using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri))
@@ -82,14 +44,27 @@ public async Task> GetUserInformationAsync(string userNa
{
var obj = JsonConvert.DeserializeObject(json, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
- return new RestApiResult(response.StatusCode, obj);
+ return new RestApiResult(response.StatusCode, obj);
}
- return new RestApiResult(response.StatusCode);
+ return new RestApiResult(response.StatusCode);
}
}
}
+ public Task IsOAuthInstalledAsync()
+ {
+ return Task.FromResult(true);
+ }
+
+ public Task> GetAuthenticationMethodsAsync()
+ {
+ // For Bitbucket Cloud there is no REST API to determine login methods
+ // instead this is determined later in the process by attempting
+ // authenticated REST API requests and checking the response.
+ return Task.FromResult(new List());
+ }
+
private HttpClient _httpClient;
private HttpClient HttpClient => _httpClient ??= _context.HttpClientFactory.CreateClient();
diff --git a/src/shared/Atlassian.Bitbucket/Cloud/CloudConstants.cs b/src/shared/Atlassian.Bitbucket/Cloud/CloudConstants.cs
new file mode 100644
index 000000000..574435872
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/Cloud/CloudConstants.cs
@@ -0,0 +1,50 @@
+using System;
+
+namespace Atlassian.Bitbucket.Cloud
+{
+ public static class CloudConstants
+ {
+ public const string BitbucketBaseUrlHost = "bitbucket.org";
+ public static readonly Uri BitbucketApiUri = new Uri("https://api.bitbucket.org");
+
+ // TODO: use the GCM client ID and secret once we have this approved.
+ // Until then continue to use Sourcetree's values like GCM Windows.
+ //public const string OAuth2ClientId = "b5AKdPfpgFdEGpKzPE";
+ //public const string OAuth2ClientSecret = "7NUP5qUtSR3SxdFK4xAGaU6PMNvNdE59";
+ //public static readonly Uri OAuth2RedirectUri = new Uri("http://localhost:46337/");
+ public const string OAuth2ClientId = "HJdmKXV87DsmC9zSWB";
+ public const string OAuth2ClientSecret = "wwWw47VB9ZHwMsD4Q4rAveHkbxNrMp3n";
+ public static readonly Uri OAuth2RedirectUri = new Uri("http://localhost:34106/");
+
+ public static readonly Uri OAuth2AuthorizationEndpoint = new Uri("https://bitbucket.org/site/oauth2/authorize");
+ public static readonly Uri OAuth2TokenEndpoint = new Uri("https://bitbucket.org/site/oauth2/access_token");
+
+ public static class OAuthScopes
+ {
+ public const string RepositoryWrite = "repository:write";
+ public const string Account = "account";
+ }
+
+ ///
+ /// Supported authentication modes for Bitbucket.org
+ ///
+ public const AuthenticationModes DotOrgAuthenticationModes = AuthenticationModes.Basic | AuthenticationModes.OAuth;
+
+ public static class EnvironmentVariables
+ {
+ public const string OAuthClientId = "GCM_BITBUCKET_CLOUD_CLIENTID";
+ public const string OAuthClientSecret = "GCM_BITBUCKET_CLOUD_CLIENTSECRET";
+ public const string OAuthRedirectUri = "GCM_BITBUCKET_CLOUD_OAUTH_REDIRECTURI";
+ }
+
+ public static class GitConfiguration
+ {
+ public static class Credential
+ {
+ public const string OAuthClientId = "cloudOAuthClientId";
+ public const string OAuthClientSecret = "cloudOAuthClientSecret";
+ public const string OAuthRedirectUri = "cloudOauthRedirectUri";
+ }
+ }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/Cloud/UserInfo.cs b/src/shared/Atlassian.Bitbucket/Cloud/UserInfo.cs
new file mode 100644
index 000000000..1ecabe6b5
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/Cloud/UserInfo.cs
@@ -0,0 +1,20 @@
+using System;
+using Newtonsoft.Json;
+
+namespace Atlassian.Bitbucket.Cloud
+{
+ public class UserInfo : IUserInfo
+ {
+ [JsonProperty("has_2fa_enabled")]
+ public bool IsTwoFactorAuthenticationEnabled { get; set; }
+
+ [JsonProperty("username")]
+ public string UserName { get; set; }
+
+ [JsonProperty("account_id")]
+ public string AccountId { get; set; }
+
+ [JsonProperty("uuid")]
+ public Guid Uuid { get; set; }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketOAuth2Client.cs b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketOAuth2Client.cs
new file mode 100644
index 000000000..378a30f94
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketOAuth2Client.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using GitCredentialManager;
+using GitCredentialManager.Authentication.OAuth;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public class BitbucketOAuth2Client : Bitbucket.BitbucketOAuth2Client
+ {
+ public BitbucketOAuth2Client(HttpClient httpClient, ISettings settings, ITrace trace)
+ : base(httpClient, GetEndpoints(settings),
+ GetClientId(settings), GetRedirectUri(settings), GetClientSecret(settings), trace)
+ {
+ }
+
+ public override IEnumerable Scopes => new string[] {
+ DataCenterConstants.OAuthScopes.PublicRepos,
+ DataCenterConstants.OAuthScopes.RepoRead,
+ DataCenterConstants.OAuthScopes.RepoWrite
+ };
+
+ private static string GetClientId(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthClientId,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthClientId,
+ out string clientId))
+ {
+ return clientId;
+ }
+
+ throw new ArgumentException("Bitbucket DC OAuth Client ID must be defined");
+ }
+
+ private static Uri GetRedirectUri(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthRedirectUri,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthRedirectUri,
+ out string redirectUriStr) && Uri.TryCreate(redirectUriStr, UriKind.Absolute, out Uri redirectUri))
+ {
+ return redirectUri;
+ }
+
+ return DataCenterConstants.OAuth2RedirectUri;
+ }
+
+ private static string GetClientSecret(ISettings settings)
+ {
+ // Check for developer override value
+ if (settings.TryGetSetting(
+ DataCenterConstants.EnvironmentVariables.OAuthClientSecret,
+ Constants.GitConfiguration.Credential.SectionName, DataCenterConstants.GitConfiguration.Credential.OAuthClientSecret,
+ out string clientSecret))
+ {
+ return clientSecret;
+ }
+
+ throw new ArgumentException("Bitbucket DC OAuth Client Secret must be defined");
+ }
+
+ private static OAuth2ServerEndpoints GetEndpoints(ISettings settings)
+ {
+ var remoteUri = settings.RemoteUri;
+ if (remoteUri == null)
+ {
+ throw new ArgumentException("RemoteUri must be defined to generate Bitbucket DC OAuth2 endpoint Urls");
+ }
+
+ return new OAuth2ServerEndpoints(
+ new Uri(BitbucketHelper.GetBaseUri(remoteUri) + "/rest/oauth2/latest/authorize"),
+ new Uri(BitbucketHelper.GetBaseUri(remoteUri) + "/rest/oauth2/latest/token")
+ );
+ }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs
new file mode 100644
index 000000000..0688e0323
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/BitbucketRestApi.cs
@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using GitCredentialManager;
+using Newtonsoft.Json;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public class BitbucketRestApi : IBitbucketRestApi
+ {
+ private readonly ICommandContext _context;
+
+ private HttpClient _httpClient;
+
+ public BitbucketRestApi(ICommandContext context)
+ {
+ EnsureArgument.NotNull(context, nameof(context));
+
+ _context = context;
+
+ }
+
+ public async Task> GetUserInformationAsync(string userName, string password, bool isBearerToken)
+ {
+ if (_context.Settings.TryGetSetting(
+ BitbucketConstants.EnvironmentVariables.ValidateStoredCredentials,
+ Constants.GitConfiguration.Credential.SectionName, BitbucketConstants.GitConfiguration.Credential.ValidateStoredCredentials,
+ out string validateStoredCredentials) && !validateStoredCredentials.ToBooleanyOrDefault(true))
+ {
+ _context.Trace.WriteLine($"Skipping retreival of user information due to {BitbucketConstants.GitConfiguration.Credential.ValidateStoredCredentials} = {validateStoredCredentials}");
+ return new RestApiResult(HttpStatusCode.OK, new UserInfo() { UserName = DataCenterConstants.OAuthUserName });;
+ }
+
+ // Bitbucket Server/DC doesn't actually provide a REST API we can use to trade an access_token for the owning username,
+ // therefore this is always going to return a placeholder username, however this call does provide a way to validate the
+ // credentials we do have
+ var requestUri = new Uri(ApiUri, "api/1.0/users");
+ using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri))
+ {
+ if (isBearerToken)
+ {
+ request.AddBearerAuthenticationHeader(password);
+ }
+ else
+ {
+ request.AddBasicAuthenticationHeader(userName, password);
+ }
+
+ _context.Trace.WriteLine($"HTTP: GET {requestUri}");
+ using (HttpResponseMessage response = await HttpClient.SendAsync(request))
+ {
+ _context.Trace.WriteLine($"HTTP: Response {(int) response.StatusCode} [{response.StatusCode}]");
+
+ string json = await response.Content.ReadAsStringAsync();
+
+ if (response.IsSuccessStatusCode)
+ {
+ // No REST API in BBS that can be used to return just my user account based on my login AFAIK.
+ // but we can prove the credentials work.
+ return new RestApiResult(HttpStatusCode.OK, new UserInfo() { UserName = DataCenterConstants.OAuthUserName });
+ }
+
+ return new RestApiResult(response.StatusCode);
+ }
+ }
+
+ }
+
+ public async Task IsOAuthInstalledAsync()
+ {
+ var requestUri = new Uri(ApiUri.AbsoluteUri + "oauth2/1.0/client");
+ using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri))
+ {
+ _context.Trace.WriteLine($"HTTP: GET {requestUri}");
+ using (HttpResponseMessage response = await HttpClient.SendAsync(request))
+ {
+ _context.Trace.WriteLine($"HTTP: Response {(int)response.StatusCode} [{response.StatusCode}]");
+
+ if (HttpStatusCode.Unauthorized == response.StatusCode)
+ {
+ // accessed anonymously so no access but it does exist.
+ return true;
+ }
+
+ return false;
+ }
+ }
+ }
+
+ public async Task> GetAuthenticationMethodsAsync()
+ {
+ var authenticationMethods = new List();
+
+ var requestUri = new Uri(ApiUri.AbsoluteUri + "authconfig/1.0/login-options");
+ using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri))
+ {
+ _context.Trace.WriteLine($"HTTP: GET {requestUri}");
+ using (HttpResponseMessage response = await HttpClient.SendAsync(request))
+ {
+ _context.Trace.WriteLine($"HTTP: Response {(int)response.StatusCode} [{response.StatusCode}]");
+
+ string json = await response.Content.ReadAsStringAsync();
+
+ if (response.IsSuccessStatusCode)
+ {
+ var loginOptions = JsonConvert.DeserializeObject(json, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+
+ if (loginOptions.Results.Any(r => "LOGIN_FORM".Equals(r.Type)))
+ {
+ authenticationMethods.Add(AuthenticationMethod.BasicAuth);
+ }
+
+ if (loginOptions.Results.Any(r => "IDP".Equals(r.Type)))
+ {
+ authenticationMethods.Add(AuthenticationMethod.Sso);
+ }
+ }
+ }
+ }
+
+ return authenticationMethods;
+ }
+
+ public void Dispose()
+ {
+ _httpClient?.Dispose();
+ }
+
+ private HttpClient HttpClient => _httpClient ??= _context.HttpClientFactory.CreateClient();
+
+ private Uri ApiUri
+ {
+ get
+ {
+ var remoteUri = _context.Settings?.RemoteUri;
+ if (remoteUri == null)
+ {
+ throw new ArgumentException("RemoteUri must be defined to generate Bitbucket DC OAuth2 endpoint Urls");
+ }
+
+ return new Uri(BitbucketHelper.GetBaseUri(remoteUri) + "/rest/");
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/DataCenterConstants.cs b/src/shared/Atlassian.Bitbucket/DataCenter/DataCenterConstants.cs
new file mode 100644
index 000000000..526db40c0
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/DataCenterConstants.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public static class DataCenterConstants
+ {
+ public static class OAuthScopes
+ {
+ public const string PublicRepos = "PUBLIC_REPOS";
+ public const string RepoWrite = "REPO_WRITE";
+ public const string RepoRead = "REPO_READ";
+ }
+
+ public static readonly Uri OAuth2RedirectUri = new Uri("http://localhost:34106/");
+
+ ///
+ /// Supported authentication modes for Bitbucket Server/DC
+ ///
+ public const AuthenticationModes ServerAuthenticationModes = AuthenticationModes.Basic | AuthenticationModes.OAuth;
+
+ ///
+ /// Bitbucket Server/DC does not have a REST API we can use to trade an OAuth access_token for the owning username.
+ /// However one is needed to construct the Basic Auth request made by Git HTTP requests, therefore use a hardcoded
+ /// placeholder for the username.
+ ///
+ public const string OAuthUserName = "OAUTH_USERNAME";
+
+ public static class EnvironmentVariables
+ {
+ public const string OAuthClientId = "GCM_BITBUCKET_DATACENTER_CLIENTID";
+ public const string OAuthClientSecret = "GCM_BITBUCKET_DATACENTER_CLIENTSECRET";
+ public const string OAuthRedirectUri = "GCM_BITBUCKET_DATACENTER_OAUTH_REDIRECTURI";
+ }
+
+ public static class GitConfiguration
+ {
+ public static class Credential
+ {
+ public const string OAuthClientId = "bitbucketDataCenterOAuthClientId";
+ public const string OAuthClientSecret = "bitbucketDataCenterOAuthClientSecret";
+ public const string OAuthRedirectUri = "bitbucketDataCenterOauthRedirectUri";
+ }
+ }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/LoginOption.cs b/src/shared/Atlassian.Bitbucket/DataCenter/LoginOption.cs
new file mode 100644
index 000000000..73f42a209
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/LoginOption.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public class LoginOption
+ {
+ [JsonProperty("type")]
+ public string Type { get ; set; }
+
+ [JsonProperty("id")]
+ public int Id { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/LoginOptions.cs b/src/shared/Atlassian.Bitbucket/DataCenter/LoginOptions.cs
new file mode 100644
index 000000000..8e631cbf5
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/LoginOptions.cs
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public class LoginOptions
+ {
+ [JsonProperty("results")]
+ public List Results { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/DataCenter/UserInfo.cs b/src/shared/Atlassian.Bitbucket/DataCenter/UserInfo.cs
new file mode 100644
index 000000000..298f86f26
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/DataCenter/UserInfo.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Atlassian.Bitbucket.DataCenter
+{
+ public class UserInfo : IUserInfo
+ {
+ // Bitbucket DC does not support this property per-user
+ public bool IsTwoFactorAuthenticationEnabled { get => false; }
+
+ public string UserName { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/IBitbucketRestApi.cs b/src/shared/Atlassian.Bitbucket/IBitbucketRestApi.cs
new file mode 100644
index 000000000..d89d174b2
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/IBitbucketRestApi.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Atlassian.Bitbucket
+{
+ public interface IBitbucketRestApi : IDisposable
+ {
+ Task> GetUserInformationAsync(string userName, string password, bool isBearerToken);
+ Task IsOAuthInstalledAsync();
+ Task> GetAuthenticationMethodsAsync();
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/IRegistry.cs b/src/shared/Atlassian.Bitbucket/IRegistry.cs
new file mode 100644
index 000000000..5712e3770
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/IRegistry.cs
@@ -0,0 +1,10 @@
+using System;
+using GitCredentialManager;
+
+namespace Atlassian.Bitbucket
+{
+ public interface IRegistry : IDisposable
+ {
+ T Get(InputArguments input);
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/IUserInfo.cs b/src/shared/Atlassian.Bitbucket/IUserInfo.cs
new file mode 100644
index 000000000..a496456bd
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/IUserInfo.cs
@@ -0,0 +1,9 @@
+using System;
+namespace Atlassian.Bitbucket
+{
+ public interface IUserInfo
+ {
+ string UserName{ get; }
+ bool IsTwoFactorAuthenticationEnabled { get; }
+ }
+}
diff --git a/src/shared/Atlassian.Bitbucket/OAuth2ClientRegistry.cs b/src/shared/Atlassian.Bitbucket/OAuth2ClientRegistry.cs
new file mode 100644
index 000000000..573140eb3
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/OAuth2ClientRegistry.cs
@@ -0,0 +1,42 @@
+using System.Net.Http;
+using GitCredentialManager;
+
+namespace Atlassian.Bitbucket
+{
+ public class OAuth2ClientRegistry : IRegistry
+ {
+ private readonly HttpClient http;
+ private ISettings settings;
+ private readonly ITrace trace;
+ private Cloud.BitbucketOAuth2Client cloudClient;
+ private DataCenter.BitbucketOAuth2Client dataCenterClient;
+
+ public OAuth2ClientRegistry(ICommandContext context)
+ {
+ this.http = context.HttpClientFactory.CreateClient();
+ this.settings = context.Settings;
+ this.trace = context.Trace;
+ }
+
+ public BitbucketOAuth2Client Get(InputArguments input)
+ {
+ if (!BitbucketHelper.IsBitbucketOrg(input))
+ {
+ return DataCenterClient;
+ }
+
+ return CloudClient;
+ }
+
+ public void Dispose()
+ {
+ http.Dispose();
+ settings.Dispose();
+ cloudClient = null;
+ dataCenterClient = null;
+ }
+
+ private Cloud.BitbucketOAuth2Client CloudClient => cloudClient ??= new Cloud.BitbucketOAuth2Client(http, settings, trace);
+ private DataCenter.BitbucketOAuth2Client DataCenterClient => dataCenterClient ??= new DataCenter.BitbucketOAuth2Client(http, settings, trace);
+ }
+}
\ No newline at end of file
diff --git a/src/shared/Atlassian.Bitbucket/RestApiResult.cs b/src/shared/Atlassian.Bitbucket/RestApiResult.cs
new file mode 100644
index 000000000..63c50cfdd
--- /dev/null
+++ b/src/shared/Atlassian.Bitbucket/RestApiResult.cs
@@ -0,0 +1,22 @@
+using System.Net;
+
+namespace Atlassian.Bitbucket
+{
+ public class RestApiResult
+ {
+ public RestApiResult(HttpStatusCode statusCode)
+ : this(statusCode, default(T)) { }
+
+ public RestApiResult(HttpStatusCode statusCode, T response)
+ {
+ StatusCode = statusCode;
+ Response = response;
+ }
+
+ public HttpStatusCode StatusCode { get; }
+
+ public T Response { get; }
+
+ public bool Succeeded => 199 < (int)StatusCode && (int)StatusCode < 300;
+ }
+}
diff --git a/src/shared/Core.Tests/ApplicationTests.cs b/src/shared/Core.Tests/ApplicationTests.cs
index e4d0b73cc..d62782f10 100644
--- a/src/shared/Core.Tests/ApplicationTests.cs
+++ b/src/shared/Core.Tests/ApplicationTests.cs
@@ -11,7 +11,7 @@ public class ApplicationTests
public async Task Application_ConfigureAsync_NoHelpers_AddsEmptyAndGcm()
{
const string emptyHelper = "";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -29,7 +29,7 @@ public async Task Application_ConfigureAsync_NoHelpers_AddsEmptyAndGcm()
public async Task Application_ConfigureAsync_Gcm_AddsEmptyBeforeGcm()
{
const string emptyHelper = "";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -50,7 +50,7 @@ public async Task Application_ConfigureAsync_Gcm_AddsEmptyBeforeGcm()
public async Task Application_ConfigureAsync_EmptyAndGcm_DoesNothing()
{
const string emptyHelper = "";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -75,7 +75,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersBefore_DoesNot
{
const string emptyHelper = "";
const string beforeHelper = "foo";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -101,7 +101,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersAfter_DoesNoth
{
const string emptyHelper = "";
const string afterHelper = "foo";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -128,7 +128,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithOthersBeforeAndAfter
const string emptyHelper = "";
const string beforeHelper = "foo";
const string afterHelper = "bar";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -155,7 +155,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithEmptyAfter_RemovesEx
{
const string emptyHelper = "";
const string afterHelper = "foo";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -181,7 +181,7 @@ public async Task Application_ConfigureAsync_EmptyAndGcmWithEmptyAfter_RemovesEx
[Fact]
public async Task Application_UnconfigureAsync_NoHelpers_DoesNothing()
{
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -194,7 +194,7 @@ public async Task Application_UnconfigureAsync_NoHelpers_DoesNothing()
[Fact]
public async Task Application_UnconfigureAsync_Gcm_RemovesGcm()
{
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -211,7 +211,7 @@ public async Task Application_UnconfigureAsync_Gcm_RemovesGcm()
public async Task Application_UnconfigureAsync_EmptyAndGcm_RemovesEmptyAndGcm()
{
const string emptyHelper = "";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -229,7 +229,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersBefore_Remov
{
const string emptyHelper = "";
const string beforeHelper = "foo";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -253,7 +253,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersAfterBefore_
{
const string emptyHelper = "";
const string afterHelper = "bar";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
@@ -279,7 +279,7 @@ public async Task Application_UnconfigureAsync_EmptyAndGcmWithOthersBeforeAndAft
const string emptyHelper = "";
const string beforeHelper = "foo";
const string afterHelper = "bar";
- const string executablePath = "/usr/local/share/gcm-core/git-credential-manager-core";
+ const string executablePath = "/usr/local/share/gcm-core/git-credential-manager";
string key = $"{Constants.GitConfiguration.Credential.SectionName}.{Constants.GitConfiguration.Credential.Helper}";
var context = new TestCommandContext {AppPath = executablePath};
diff --git a/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs b/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
index a991108f4..7539a37c1 100644
--- a/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
+++ b/src/shared/Core.Tests/Authentication/BasicAuthenticationTests.cs
@@ -1,4 +1,6 @@
using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
using GitCredentialManager.Authentication;
using GitCredentialManager.Tests.Objects;
using Moq;
@@ -14,11 +16,11 @@ public void BasicAuthentication_GetCredentials_NullResource_ThrowsException()
var context = new TestCommandContext();
var basicAuth = new BasicAuthentication(context);
- Assert.Throws(() => basicAuth.GetCredentials(null));
+ Assert.ThrowsAsync(() => basicAuth.GetCredentialsAsync(null));
}
[Fact]
- public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials()
+ public async Task BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUserName_PasswordPromptReturnsCredentials()
{
const string testResource = "https://example.com";
const string testUserName = "john.doe";
@@ -29,14 +31,14 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_ResourceAndUser
var basicAuth = new BasicAuthentication(context);
- ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+ ICredential credential = await basicAuth.GetCredentialsAsync(testResource, testUserName);
Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
}
[Fact]
- public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials()
+ public async Task BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPassPromptReturnsCredentials()
{
const string testResource = "https://example.com";
const string testUserName = "john.doe";
@@ -48,7 +50,7 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_Resource_UserPa
var basicAuth = new BasicAuthentication(context);
- ICredential credential = basicAuth.GetCredentials(testResource);
+ ICredential credential = await basicAuth.GetCredentialsAsync(testResource);
Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
@@ -67,11 +69,11 @@ public void BasicAuthentication_GetCredentials_NonDesktopSession_NoTerminalPromp
var basicAuth = new BasicAuthentication(context);
- Assert.Throws(() => basicAuth.GetCredentials(testResource));
+ Assert.ThrowsAsync(() => basicAuth.GetCredentialsAsync(testResource));
}
- [PlatformFact(Platforms.Windows)]
- public void BasicAuthentication_GetCredentials_DesktopSession_Resource_UserPassPromptReturnsCredentials()
+ [Fact]
+ public async Task BasicAuthentication_GetCredentials_DesktopSession_CallsHelper()
{
const string testResource = "https://example.com";
const string testUserName = "john.doe";
@@ -79,88 +81,66 @@ public void BasicAuthentication_GetCredentials_DesktopSession_Resource_UserPassP
var context = new TestCommandContext
{
- SessionManager = {IsDesktopSession = true},
- SystemPrompts =
- {
- CredentialPrompt = (resource, userName) =>
- {
- Assert.Equal(testResource, resource);
- Assert.Null(userName);
-
- return new GitCredential(testUserName, testPassword);
- }
- }
+ SessionManager = {IsDesktopSession = true}
};
- var basicAuth = new BasicAuthentication(context);
-
- ICredential credential = basicAuth.GetCredentials(testResource);
-
- Assert.NotNull(credential);
- Assert.Equal(testUserName, credential.Account);
- Assert.Equal(testPassword, credential.Password);
- }
-
- [PlatformFact(Platforms.Windows)]
- public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptReturnsCredentials()
- {
- const string testResource = "https://example.com";
- const string testUserName = "john.doe";
- const string testPassword = "letmein123"; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
-
- var context = new TestCommandContext
- {
- SessionManager = {IsDesktopSession = true},
- SystemPrompts =
- {
- CredentialPrompt = (resource, userName) =>
+ context.FileSystem.Files["/usr/local/bin/git-credential-manager-ui"] = new byte[0];
+ context.FileSystem.Files[@"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe"] = new byte[0];
+
+ var auth = new Mock(MockBehavior.Strict, context);
+ auth.Setup(x => x.InvokeHelperAsync(
+ It.IsAny(),
+ $"basic --resource {testResource}",
+ It.IsAny>(),
+ It.IsAny()))
+ .ReturnsAsync(
+ new Dictionary
{
- Assert.Equal(testResource, resource);
- Assert.Equal(testUserName, userName);
-
- return new GitCredential(testUserName, testPassword);
+ ["username"] = testUserName,
+ ["password"] = testPassword
}
- }
- };
-
- var basicAuth = new BasicAuthentication(context);
+ );
- ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+ ICredential credential = await auth.Object.GetCredentialsAsync(testResource);
Assert.NotNull(credential);
Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
}
- [PlatformFact(Platforms.Windows)]
- public void BasicAuthentication_GetCredentials_DesktopSession_ResourceAndUser_PassPromptDiffUserReturnsCredentials()
+ [Fact]
+ public async Task BasicAuthentication_GetCredentials_DesktopSession_UserName_CallsHelper()
{
const string testResource = "https://example.com";
const string testUserName = "john.doe";
- const string newUserName = "jane.doe";
const string testPassword = "letmein123"; // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Fake credential")]
var context = new TestCommandContext
{
- SessionManager = {IsDesktopSession = true},
- SystemPrompts =
- {
- CredentialPrompt = (resource, userName) =>
- {
- Assert.Equal(testResource, resource);
- Assert.Equal(testUserName, userName);
-
- return new GitCredential(newUserName, testPassword);
- }
- }
+ SessionManager = {IsDesktopSession = true}
};
- var basicAuth = new BasicAuthentication(context);
+ context.FileSystem.Files["/usr/local/bin/git-credential-manager-ui"] = new byte[0];
+ context.FileSystem.Files[@"C:\Program Files\Git Credential Manager Core\git-credential-manager-ui.exe"] = new byte[0];
+
+ var auth = new Mock(MockBehavior.Strict, context);
+ auth.Setup(x => x.InvokeHelperAsync(
+ It.IsAny(),
+ $"basic --resource {testResource} --username {testUserName}",
+ It.IsAny>(),
+ It.IsAny()))
+ .ReturnsAsync(
+ new Dictionary
+ {
+ ["username"] = testUserName,
+ ["password"] = testPassword
+ }
+ );
- ICredential credential = basicAuth.GetCredentials(testResource, testUserName);
+ ICredential credential = await auth.Object.GetCredentialsAsync(testResource, testUserName);
Assert.NotNull(credential);
- Assert.Equal(newUserName, credential.Account);
+ Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
}
}
diff --git a/src/shared/Core.Tests/Core.Tests.csproj b/src/shared/Core.Tests/Core.Tests.csproj
index 0bc07acd2..da473f014 100644
--- a/src/shared/Core.Tests/Core.Tests.csproj
+++ b/src/shared/Core.Tests/Core.Tests.csproj
@@ -14,7 +14,7 @@
all
-
+
diff --git a/src/shared/Core.Tests/GenericHostProviderTests.cs b/src/shared/Core.Tests/GenericHostProviderTests.cs
index d118ff57e..42dc62177 100644
--- a/src/shared/Core.Tests/GenericHostProviderTests.cs
+++ b/src/shared/Core.Tests/GenericHostProviderTests.cs
@@ -83,8 +83,8 @@ public async Task GenericHostProvider_CreateCredentialAsync_WiaNotAllowed_Return
Settings = {IsWindowsIntegratedAuthenticationEnabled = false}
};
var basicAuthMock = new Mock();
- basicAuthMock.Setup(x => x.GetCredentials(It.IsAny(), It.IsAny()))
- .Returns(basicCredential)
+ basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny(), It.IsAny()))
+ .ReturnsAsync(basicCredential)
.Verifiable();
var wiaAuthMock = new Mock();
@@ -96,7 +96,7 @@ public async Task GenericHostProvider_CreateCredentialAsync_WiaNotAllowed_Return
Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
wiaAuthMock.Verify(x => x.GetIsSupportedAsync(It.IsAny()), Times.Never);
- basicAuthMock.Verify(x => x.GetCredentials(It.IsAny(), It.IsAny()), Times.Once);
+ basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny(), It.IsAny()), Times.Once);
}
[Fact]
@@ -117,8 +117,8 @@ public async Task GenericHostProvider_CreateCredentialAsync_LegacyAuthorityBasic
Settings = {LegacyAuthorityOverride = "basic"}
};
var basicAuthMock = new Mock();
- basicAuthMock.Setup(x => x.GetCredentials(It.IsAny(), It.IsAny()))
- .Returns(basicCredential)
+ basicAuthMock.Setup(x => x.GetCredentialsAsync(It.IsAny(), It.IsAny()))
+ .ReturnsAsync(basicCredential)
.Verifiable();
var wiaAuthMock = new Mock();
@@ -130,7 +130,7 @@ public async Task GenericHostProvider_CreateCredentialAsync_LegacyAuthorityBasic
Assert.Equal(testUserName, credential.Account);
Assert.Equal(testPassword, credential.Password);
wiaAuthMock.Verify(x => x.GetIsSupportedAsync(It.IsAny()), Times.Never);
- basicAuthMock.Verify(x => x.GetCredentials(It.IsAny(), It.IsAny()), Times.Once);
+ basicAuthMock.Verify(x => x.GetCredentialsAsync(It.IsAny