Skip to content

Commit 433a7b8

Browse files
NejcZdovcNejcZdovc
authored
Merge pull request #6422 from brave/promotion-server
Moves promotions to new endpoint structure
2 parents 21aef35 + 6baff0d commit 433a7b8

File tree

121 files changed

+7418
-1818
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+7418
-1818
lines changed

‎components/brave_rewards/browser/android_util.cc

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,4 @@ ledger::ClientInfoPtr GetAndroidClientInfo() {
1515
return info;
1616
}
1717

18-
std::string ParseClaimPromotionResponse(const std::string& response) {
19-
base::Optional<base::Value> value = base::JSONReader::Read(response);
20-
if (!value || !value->is_dict()) {
21-
return "";
22-
}
23-
24-
base::DictionaryValue* dictionary = nullptr;
25-
if (!value->GetAsDictionary(&dictionary)) {
26-
return "";
27-
}
28-
29-
auto* nonce = dictionary->FindKey("nonce");
30-
if (!nonce || !nonce->is_string()) {
31-
return "";
32-
}
33-
34-
return nonce->GetString();
35-
}
36-
3718
} // namespace android_util

‎components/brave_rewards/browser/android_util.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ namespace android_util {
1414

1515
ledger::ClientInfoPtr GetAndroidClientInfo();
1616

17-
std::string ParseClaimPromotionResponse(const std::string& response);
18-
1917
} // namespace android_util
2018

2119
#endif // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_ANDROID_UTIL_H_

‎components/brave_rewards/browser/rewards_service_impl.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,13 +1257,12 @@ void RewardsServiceImpl::AttestationAndroid(
12571257
const std::string& promotion_id,
12581258
AttestPromotionCallback callback,
12591259
const ledger::Result result,
1260-
const std::string& response) {
1260+
const std::string& nonce) {
12611261
if (result != ledger::Result::LEDGER_OK) {
12621262
std::move(callback).Run(static_cast<int32_t>(result), nullptr);
12631263
return;
12641264
}
12651265

1266-
const std::string nonce = android_util::ParseClaimPromotionResponse(response);
12671266
if (nonce.empty()) {
12681267
std::move(callback).Run(
12691268
static_cast<int32_t>(ledger::Result::LEDGER_ERROR),

‎components/brave_rewards/browser/test/common/rewards_browsertest_response.cc

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,7 @@ void RewardsBrowserTestResponse::Get(
230230
return;
231231
}
232232

233-
if (URLMatches(
234-
url,
235-
"/wallet/uphold",
236-
PREFIX_V3,
237-
ServerTypes::kPromotion)) {
233+
if (url.find("/v3/wallet/uphold") != std::string::npos) {
238234
if (user_funds_balance_) {
239235
*response = user_funds_balance_resp_;
240236
} else {
@@ -248,11 +244,7 @@ void RewardsBrowserTestResponse::Get(
248244
return;
249245
}
250246

251-
if (URLMatches(
252-
url,
253-
"/promotions?",
254-
PREFIX_V1,
255-
ServerTypes::kPromotion)) {
247+
if (url.find("v1/promotions?") != std::string::npos) {
256248
if (empty_promotion_key_) {
257249
*response = promotion_empty_key_;
258250
} else {
@@ -261,11 +253,7 @@ void RewardsBrowserTestResponse::Get(
261253
return;
262254
}
263255

264-
if (URLMatches(
265-
url,
266-
"/promotions/",
267-
PREFIX_V1,
268-
ServerTypes::kPromotion)) {
256+
if (url.find("/v1/promotions") != std::string::npos) {
269257
if (url.find("claims") != std::string::npos) {
270258
*response = creds_tokens_;
271259
} else {
@@ -274,11 +262,7 @@ void RewardsBrowserTestResponse::Get(
274262
return;
275263
}
276264

277-
if (URLMatches(
278-
url,
279-
"/captchas",
280-
PREFIX_V1,
281-
ServerTypes::kPromotion)) {
265+
if (url.find("/v1/captchas") != std::string::npos) {
282266
*response = captcha_;
283267
}
284268

‎components/brave_rewards/test/BUILD.gn

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,25 @@ source_set("brave_rewards_unit_tests") {
4949
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/publisher/publisher_unittest.cc",
5050
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/api/api_util_unittest.cc",
5151
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/api/get_parameters/get_parameters_unittest.cc",
52+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_available/get_available_unittest.cc",
53+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_captcha/get_captcha_unittest.cc",
54+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet_unittest.cc",
55+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_signed_creds/get_signed_creds_unittest.cc",
56+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/get_wallet_balance/get_wallet_balance_unittest.cc",
57+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_bat_loss/post_bat_loss_unittest.cc",
58+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_captcha/post_captcha_unittest.cc",
59+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_claim_uphold/post_claim_uphold_unittest.cc",
60+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_clobbered_claims/post_clobbered_claims_unittest.cc",
61+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_creds/post_creds_unittest.cc",
62+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_devicecheck/post_devicecheck_unittest.cc",
63+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_safetynet/post_safetynet_unittest.cc",
64+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_suggestions/post_suggestions_unittest.cc",
65+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_suggestions_claim/post_suggestions_claim_unittest.cc",
66+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/post_wallet_brave/post_wallet_brave_unittest.cc",
67+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/promotions_util_unittest.cc",
68+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/put_captcha/put_captcha_unittest.cc",
69+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/put_devicecheck/put_devicecheck_unittest.cc",
70+
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/endpoint/promotion/put_safetynet/put_safetynet_unittest.cc",
5271
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_unittest.cc",
5372
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/uphold/uphold_util_unittest.cc",
5473
"//brave/vendor/bat-native-ledger/src/bat/ledger/internal/wallet/wallet_util_unittest.cc",

‎vendor/bat-native-ledger/BUILD.gn

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -300,36 +300,66 @@ source_set("ledger") {
300300
"src/bat/ledger/internal/recovery/recovery_empty_balance.h",
301301
"src/bat/ledger/internal/report/report.cc",
302302
"src/bat/ledger/internal/report/report.h",
303-
"src/bat/ledger/internal/request/request_attestation.cc",
304-
"src/bat/ledger/internal/request/request_attestation.h",
305-
"src/bat/ledger/internal/request/request_promotion.cc",
306-
"src/bat/ledger/internal/request/request_promotion.h",
307303
"src/bat/ledger/internal/request/request_publisher.cc",
308304
"src/bat/ledger/internal/request/request_publisher.h",
309305
"src/bat/ledger/internal/request/request_sku.cc",
310306
"src/bat/ledger/internal/request/request_sku.h",
311307
"src/bat/ledger/internal/request/request_util.cc",
312308
"src/bat/ledger/internal/request/request_util.h",
313-
"src/bat/ledger/internal/response/response_attestation.cc",
314-
"src/bat/ledger/internal/response/response_attestation.h",
315309
"src/bat/ledger/internal/response/response_credentials.cc",
316310
"src/bat/ledger/internal/response/response_credentials.h",
317-
"src/bat/ledger/internal/response/response_promotion.cc",
318-
"src/bat/ledger/internal/response/response_promotion.h",
319311
"src/bat/ledger/internal/response/response_publisher.cc",
320312
"src/bat/ledger/internal/response/response_publisher.h",
321313
"src/bat/ledger/internal/response/response_sku.cc",
322314
"src/bat/ledger/internal/response/response_sku.h",
323315
"src/bat/ledger/internal/response/response_uphold.cc",
324316
"src/bat/ledger/internal/response/response_uphold.h",
325-
"src/bat/ledger/internal/response/response_wallet.cc",
326-
"src/bat/ledger/internal/response/response_wallet.h",
327317
"src/bat/ledger/internal/endpoint/api/api_server.cc",
328318
"src/bat/ledger/internal/endpoint/api/api_server.h",
329319
"src/bat/ledger/internal/endpoint/api/api_util.cc",
330320
"src/bat/ledger/internal/endpoint/api/api_util.h",
331321
"src/bat/ledger/internal/endpoint/api/get_parameters/get_parameters.cc",
332322
"src/bat/ledger/internal/endpoint/api/get_parameters/get_parameters.h",
323+
"src/bat/ledger/internal/endpoint/promotion/get_available/get_available.cc",
324+
"src/bat/ledger/internal/endpoint/promotion/get_available/get_available.h",
325+
"src/bat/ledger/internal/endpoint/promotion/get_captcha/get_captcha.cc",
326+
"src/bat/ledger/internal/endpoint/promotion/get_captcha/get_captcha.h",
327+
"src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet.cc",
328+
"src/bat/ledger/internal/endpoint/promotion/get_recover_wallet/get_recover_wallet.h",
329+
"src/bat/ledger/internal/endpoint/promotion/get_signed_creds/get_signed_creds.cc",
330+
"src/bat/ledger/internal/endpoint/promotion/get_signed_creds/get_signed_creds.h",
331+
"src/bat/ledger/internal/endpoint/promotion/get_wallet_balance/get_wallet_balance.cc",
332+
"src/bat/ledger/internal/endpoint/promotion/get_wallet_balance/get_wallet_balance.h",
333+
"src/bat/ledger/internal/endpoint/promotion/post_bat_loss/post_bat_loss.cc",
334+
"src/bat/ledger/internal/endpoint/promotion/post_bat_loss/post_bat_loss.h",
335+
"src/bat/ledger/internal/endpoint/promotion/post_captcha/post_captcha.cc",
336+
"src/bat/ledger/internal/endpoint/promotion/post_captcha/post_captcha.h",
337+
"src/bat/ledger/internal/endpoint/promotion/post_claim_uphold/post_claim_uphold.cc",
338+
"src/bat/ledger/internal/endpoint/promotion/post_claim_uphold/post_claim_uphold.h",
339+
"src/bat/ledger/internal/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.cc",
340+
"src/bat/ledger/internal/endpoint/promotion/post_clobbered_claims/post_clobbered_claims.h",
341+
"src/bat/ledger/internal/endpoint/promotion/post_creds/post_creds.cc",
342+
"src/bat/ledger/internal/endpoint/promotion/post_creds/post_creds.h",
343+
"src/bat/ledger/internal/endpoint/promotion/post_devicecheck/post_devicecheck.cc",
344+
"src/bat/ledger/internal/endpoint/promotion/post_devicecheck/post_devicecheck.h",
345+
"src/bat/ledger/internal/endpoint/promotion/post_safetynet/post_safetynet.cc",
346+
"src/bat/ledger/internal/endpoint/promotion/post_safetynet/post_safetynet.h",
347+
"src/bat/ledger/internal/endpoint/promotion/post_suggestions/post_suggestions.cc",
348+
"src/bat/ledger/internal/endpoint/promotion/post_suggestions/post_suggestions.h",
349+
"src/bat/ledger/internal/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.cc",
350+
"src/bat/ledger/internal/endpoint/promotion/post_suggestions_claim/post_suggestions_claim.h",
351+
"src/bat/ledger/internal/endpoint/promotion/post_wallet_brave/post_wallet_brave.cc",
352+
"src/bat/ledger/internal/endpoint/promotion/post_wallet_brave/post_wallet_brave.h",
353+
"src/bat/ledger/internal/endpoint/promotion/promotion_server.cc",
354+
"src/bat/ledger/internal/endpoint/promotion/promotion_server.h",
355+
"src/bat/ledger/internal/endpoint/promotion/promotions_util.cc",
356+
"src/bat/ledger/internal/endpoint/promotion/promotions_util.h",
357+
"src/bat/ledger/internal/endpoint/promotion/put_captcha/put_captcha.cc",
358+
"src/bat/ledger/internal/endpoint/promotion/put_captcha/put_captcha.h",
359+
"src/bat/ledger/internal/endpoint/promotion/put_devicecheck/put_devicecheck.cc",
360+
"src/bat/ledger/internal/endpoint/promotion/put_devicecheck/put_devicecheck.h",
361+
"src/bat/ledger/internal/endpoint/promotion/put_safetynet/put_safetynet.cc",
362+
"src/bat/ledger/internal/endpoint/promotion/put_safetynet/put_safetynet.h",
333363
"src/bat/ledger/internal/sku/sku.h",
334364
"src/bat/ledger/internal/sku/sku_brave.cc",
335365
"src/bat/ledger/internal/sku/sku_brave.h",

‎vendor/bat-native-ledger/src/bat/ledger/internal/attestation/attestation.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
#include "bat/ledger/internal/attestation/attestation.h"
77
#include "bat/ledger/internal/ledger_impl.h"
88

9-
namespace braveledger_attestation {
9+
namespace ledger {
10+
namespace attestation {
1011

1112
Attestation::Attestation(bat_ledger::LedgerImpl* ledger) : ledger_(ledger) {
1213
}
1314

1415
Attestation::~Attestation() = default;
1516

16-
} // namespace braveledger_attestation
17+
} // namespace attestation
18+
} // namespace ledger

‎vendor/bat-native-ledger/src/bat/ledger/internal/attestation/attestation.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ namespace bat_ledger {
1515
class LedgerImpl;
1616
}
1717

18-
namespace braveledger_attestation {
18+
namespace ledger {
19+
namespace attestation {
1920

2021
using StartCallback =
2122
std::function<void(const ledger::Result, const std::string&)>;
@@ -38,5 +39,6 @@ class Attestation {
3839
bat_ledger::LedgerImpl* ledger_; // NOT OWNED
3940
};
4041

41-
} // namespace braveledger_attestation
42+
} // namespace attestation
43+
} // namespace ledger
4244
#endif // BRAVELEDGER_ATTESTATION_ATTESTATION_H_

0 commit comments

Comments
 (0)