Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use new Uphold sandbox URL #8492

Merged
merged 1 commit into from
Apr 10, 2021
Merged

Use new Uphold sandbox URL #8492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion browser/extensions/api/brave_extensions_api_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bool BraveExtensionsAPIClient::ShouldHideBrowserNetworkRequest(
const WebRequestInfo& request) const {
const url::Origin origin = url::Origin::Create(request.url);
const base::StringPiece path = request.url.path_piece();
if (((origin.DomainIs("sandbox.uphold.com") ||
if (((origin.DomainIs("wallet-sandbox.uphold.com") ||
origin.DomainIs("uphold.com")) &&
base::StartsWith(path, "/authorize/",
base::CompareCase::INSENSITIVE_ASCII)) ||
Expand Down
2 changes: 1 addition & 1 deletion browser/extensions/api/brave_extensions_api_client_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ TEST_F(BraveExtensionsAPIClientTests, IsBraveProtectedUrlUphold) {
WebRequestInfo blocked1(
create_request_params("https://uphold.com/authorize/1234"));
WebRequestInfo blocked2(create_request_params(
"https://sandbox.uphold.com/authorize/1234?state=abcd"));
"https://wallet-sandbox.uphold.com/authorize/1234?state=abcd"));
WebRequestInfo blocked3(
create_request_params("https://api.uphold.com/oauth2/token"));
ASSERT_TRUE(ShouldHideBrowserNetworkRequest(blocked1));
Expand Down
2 changes: 1 addition & 1 deletion vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class LedgerImpl;

namespace uphold {

const char kUrlStaging[] = "https://sandbox.uphold.com";
const char kUrlStaging[] = "https://wallet-sandbox.uphold.com";
const char kUrlProduction[] = "https://uphold.com";
const char kFeeAddressStaging[] = "1b2b466f-5c15-49bf-995e-c91777d3da93";
const char kFeeAddressProduction[] = "b01e8c55-5004-4761-9e4b-01ec13e25c92";
Expand Down
169 changes: 90 additions & 79 deletions vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@ TEST_F(UpholdUtilTest, GetAuthorizeUrl) {
// staging
ledger::_environment = type::Environment::STAGING;
result = uphold::GetAuthorizeUrl("rdfdsfsdfsdf", true);
ASSERT_EQ(result,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=rdfdsfsdfsdf");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=rdfdsfsdfsdf");

// production
ledger::_environment = type::Environment::PRODUCTION;
Expand All @@ -116,13 +117,14 @@ TEST_F(UpholdUtilTest, GetAuthorizeUrl) {
// staging
ledger::_environment = type::Environment::STAGING;
result = uphold::GetAuthorizeUrl("rdfdsfsdfsdf", false);
ASSERT_EQ(result,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=login&state=rdfdsfsdfsdf");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=login&state=rdfdsfsdfsdf");
}

TEST_F(UpholdUtilTest, GetAddUrl) {
Expand All @@ -138,8 +140,9 @@ TEST_F(UpholdUtilTest, GetAddUrl) {
// staging
ledger::_environment = type::Environment::STAGING;
result = uphold::GetAddUrl("9324i5i32459i");
ASSERT_EQ(result,
"https://sandbox.uphold.com/dashboard/cards/9324i5i32459i/add");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/dashboard/cards/9324i5i32459i/add");
}

TEST_F(UpholdUtilTest, GetWithdrawUrl) {
Expand All @@ -155,8 +158,9 @@ TEST_F(UpholdUtilTest, GetWithdrawUrl) {
// staging
ledger::_environment = type::Environment::STAGING;
result = uphold::GetWithdrawUrl("9324i5i32459i");
ASSERT_EQ(result,
"https://sandbox.uphold.com/dashboard/cards/9324i5i32459i/use");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/dashboard/cards/9324i5i32459i/use");
}

TEST_F(UpholdUtilTest, GetSecondStepVerify) {
Expand All @@ -171,7 +175,7 @@ TEST_F(UpholdUtilTest, GetSecondStepVerify) {
ledger::_environment = type::Environment::STAGING;
result = uphold::GetSecondStepVerify();
ASSERT_EQ(result,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
}

Expand All @@ -183,17 +187,18 @@ TEST_F(UpholdUtilTest, GetWallet) {
ASSERT_TRUE(!result);

const std::string wallet = R"({
"account_url":"https://sandbox.uphold.com/dashboard",
"add_url":"https://sandbox.uphold.com/dashboard/cards/asadasdasd/add",
"account_url":"https://wallet-sandbox.uphold.com/dashboard",
"add_url":"https://wallet-sandbox.uphold.com/dashboard/cards/asadasdasd/add",
"address":"2323dff2ba-d0d1-4dfw-8e56-a2605bcaf4af",
"fees":{},
"login_url":"https://sandbox.uphold.com/authorize/4c2b665ca060d",
"login_url":"https://wallet-sandbox.uphold.com/authorize/4c2b665ca060d",
"one_time_string":"1F747AE0A708E47ED7E650BF1856B5A4EF7E36833BDB1158A108F8",
"status":2,
"token":"4c80232r219c30cdf112208890a32c7e00",
"user_name":"test",
"verify_url":"",
"withdraw_url":"https://sandbox.uphold.com/dashboard/cards/asadasdasd/use"
"withdraw_url":
"https://wallet-sandbox.uphold.com/dashboard/cards/asadasdasd/use"
})";

ON_CALL(*mock_ledger_client_, GetEncryptedStringState(state::kWalletUphold))
Expand Down Expand Up @@ -232,39 +237,41 @@ TEST_F(UpholdUtilTest, GenerateLinks) {
auto result = uphold::GenerateLinks(wallet->Clone());
ASSERT_EQ(result->add_url, "");
ASSERT_EQ(result->withdraw_url, "");
ASSERT_EQ(result->verify_url,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(
result->verify_url,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");

// Connected
wallet->status = type::WalletStatus::CONNECTED;
result = uphold::GenerateLinks(wallet->Clone());
ASSERT_EQ(result->add_url,
"https://sandbox.uphold.com/dashboard/cards/123123123124234234234/add");
"https://wallet-sandbox.uphold.com/dashboard/cards/"
"123123123124234234234/add");
ASSERT_EQ(result->withdraw_url,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
ASSERT_EQ(result->verify_url,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");

// Verified
wallet->status = type::WalletStatus::VERIFIED;
result = uphold::GenerateLinks(wallet->Clone());
ASSERT_EQ(
result->add_url,
"https://sandbox.uphold.com/dashboard/cards/123123123124234234234/add");
ASSERT_EQ(
result->withdraw_url,
"https://sandbox.uphold.com/dashboard/cards/123123123124234234234/use");
ASSERT_EQ(result->add_url,
"https://wallet-sandbox.uphold.com/dashboard/cards/"
"123123123124234234234/add");
ASSERT_EQ(result->withdraw_url,
"https://wallet-sandbox.uphold.com/dashboard/cards/"
"123123123124234234234/use");
ASSERT_EQ(result->verify_url, "");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");

// Disconnected Non-Verified
wallet->status = type::WalletStatus::DISCONNECTED_NOT_VERIFIED;
Expand All @@ -273,40 +280,41 @@ TEST_F(UpholdUtilTest, GenerateLinks) {
ASSERT_EQ(result->withdraw_url, "");
ASSERT_EQ(
result->verify_url,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");

// Disconnected Verified
wallet->status = type::WalletStatus::DISCONNECTED_VERIFIED;
result = uphold::GenerateLinks(wallet->Clone());
ASSERT_EQ(result->add_url, "");
ASSERT_EQ(result->withdraw_url, "");
ASSERT_EQ(result->verify_url,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(
result->verify_url,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");

// Pending
wallet->status = type::WalletStatus::PENDING;
result = uphold::GenerateLinks(wallet->Clone());
ASSERT_EQ(result->add_url,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
ASSERT_EQ(result->withdraw_url,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
ASSERT_EQ(result->verify_url,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
ASSERT_EQ(result->account_url, "https://sandbox.uphold.com/dashboard");
ASSERT_EQ(result->account_url, "https://wallet-sandbox.uphold.com/dashboard");
}

TEST_F(UpholdUtilTest, GenerateVerifyLink) {
Expand All @@ -318,19 +326,20 @@ TEST_F(UpholdUtilTest, GenerateVerifyLink) {
// Not connected
wallet->status = type::WalletStatus::NOT_CONNECTED;
auto result = uphold::GenerateVerifyLink(wallet->Clone());
ASSERT_EQ(result,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");

// Connected
wallet->status = type::WalletStatus::CONNECTED;
result = uphold::GenerateVerifyLink(wallet->Clone());
ASSERT_EQ(result,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");

// Verified
Expand All @@ -341,30 +350,32 @@ TEST_F(UpholdUtilTest, GenerateVerifyLink) {
// Disconnected Non-Verified
wallet->status = type::WalletStatus::DISCONNECTED_NOT_VERIFIED;
result = uphold::GenerateVerifyLink(wallet->Clone());
ASSERT_EQ(result,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");

// Disconnected Verified
wallet->status = type::WalletStatus::DISCONNECTED_VERIFIED;
result = uphold::GenerateVerifyLink(wallet->Clone());
ASSERT_EQ(result,
"https://sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");
ASSERT_EQ(
result,
"https://wallet-sandbox.uphold.com/authorize/" UPHOLD_STAGING_CLIENT_ID
"?scope=accounts:read "
"accounts:write cards:read cards:write user:read "
"transactions:deposit transactions:read "
"transactions:transfer:application transactions:transfer:others"
"&intention=kyc&state=123123123124234234234");

// Pending
wallet->status = type::WalletStatus::PENDING;
result = uphold::GenerateVerifyLink(wallet->Clone());
ASSERT_EQ(result,
"https://sandbox.uphold.com/signup/step2"
"https://wallet-sandbox.uphold.com/signup/step2"
"?application_id=" UPHOLD_STAGING_CLIENT_ID "&intention=kyc");
}

Expand Down