Merge pull request #7453 from /issues/13213

GetState should call ads-serve endpoint

Author: tmancey

components/brave_ads/test/BUILD.gn

@@ -80,6 +80,7 @@ source_set("brave_ads_unit_tests") {
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/privacy/unblinded_tokens/unblinded_tokens_unittest_util.h",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/rpill/rpill_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/security/security_util_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/server/ads_serve_server_util_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/server/ads_server_util_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/server/confirmations_server_util_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/server/rewards_server_util_unittest.cc",

vendor/bat-native-ads/BUILD.gn

@@ -439,6 +439,8 @@ source_set("ads") {
     "src/bat/ads/internal/search_engine/search_providers.h",
     "src/bat/ads/internal/security/security_util.cc",
     "src/bat/ads/internal/security/security_util.h",
+    "src/bat/ads/internal/server/ads_serve_server_util.cc",
+    "src/bat/ads/internal/server/ads_serve_server_util.h",
     "src/bat/ads/internal/server/ads_server_util.cc",
     "src/bat/ads/internal/server/ads_server_util.h",
     "src/bat/ads/internal/server/confirmations_server_util.cc",

vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.cc

@@ -6,7 +6,7 @@
 #include "bat/ads/internal/ad_targeting/geographic/subdivision/get_subdivision_url_request_builder.h"
 
 #include "base/strings/stringprintf.h"
-#include "bat/ads/internal/server/ads_server_util.h"
+#include "bat/ads/internal/server/ads_serve_server_util.h"
 
 namespace ads {
 namespace ad_targeting {
@@ -16,7 +16,7 @@ GetSubdivisionUrlRequestBuilder::GetSubdivisionUrlRequestBuilder() = default;
 
 GetSubdivisionUrlRequestBuilder::~GetSubdivisionUrlRequestBuilder() = default;
 
-// GET /v5/getstate
+// GET /v1/getstate
 
 UrlRequestPtr GetSubdivisionUrlRequestBuilder::Build() {
   UrlRequestPtr url_request = UrlRequest::New();
@@ -29,7 +29,7 @@ UrlRequestPtr GetSubdivisionUrlRequestBuilder::Build() {
 ///////////////////////////////////////////////////////////////////////////////
 
 std::string GetSubdivisionUrlRequestBuilder::BuildUrl() const {
-  return base::StringPrintf("%s/v5/getstate", server::GetHost().c_str());
+  return base::StringPrintf("%s/v1/getstate", serve::server::GetHost().c_str());
 }
 
 }  // namespace geographic

vendor/bat-native-ads/src/bat/ads/internal/ad_targeting/geographic/subdivision/subdivision_targeting.cc

@@ -166,7 +166,7 @@ bool SubdivisionTargeting::ShouldAutoDetect() const {
 
 void SubdivisionTargeting::Fetch() {
   BLOG(1, "Fetch subdivision target");
-  BLOG(2, "GET /v5/getstate");
+  BLOG(2, "GET /v1/getstate");
 
   GetSubdivisionUrlRequestBuilder url_request_builder;
   UrlRequestPtr url_request = url_request_builder.Build();

vendor/bat-native-ads/src/bat/ads/internal/server/ads_serve_server_util.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/server/ads_serve_server_util.h"
+
+#include "bat/ads/ads.h"
+
+namespace ads {
+namespace serve {
+namespace server {
+
+namespace {
+
+const char kProductionHost[] = "https://ads-serve.brave.com";
+const char kStagingHost[] = "https://ads-serve.bravesoftware.com";
+const char kDevelopmentHost[] = "https://ads-serve.brave.software";
+
+}  // namespace
+
+std::string GetHost() {
+  switch (g_environment) {
+    case Environment::PRODUCTION: {
+      return kProductionHost;
+    }
+
+    case Environment::STAGING: {
+      return kStagingHost;
+    }
+
+    case Environment::DEVELOPMENT: {
+      return kDevelopmentHost;
+    }
+  }
+}
+
+}  // namespace server
+}  // namespace serve
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/server/ads_serve_server_util.h

@@ -0,0 +1,21 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BAT_ADS_INTERNAL_SERVER_ADS_SERVE_SERVER_UTIL_H_
+#define BAT_ADS_INTERNAL_SERVER_ADS_SERVE_SERVER_UTIL_H_
+
+#include <string>
+
+namespace ads {
+namespace serve {
+namespace server {
+
+std::string GetHost();
+
+}  // namespace server
+}  // namespace serve
+}  // namespace ads
+
+#endif  // BAT_ADS_INTERNAL_SERVER_ADS_SERVE_SERVER_UTIL_H_

vendor/bat-native-ads/src/bat/ads/internal/server/ads_serve_server_util_unittest.cc

@@ -0,0 +1,54 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/server/ads_serve_server_util.h"
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+TEST(BatAdsServeServerUtilTest,
+    Production) {
+  // Arrange
+  SetEnvironment(Environment::PRODUCTION);
+
+  // Act
+  const std::string host = serve::server::GetHost();
+
+  // Assert
+  const std::string expected_host = "https://ads-serve.brave.com";
+  EXPECT_EQ(expected_host, host);
+}
+
+TEST(BatAdsServeServerUtilTest,
+    Staging) {
+  // Arrange
+  SetEnvironment(Environment::STAGING);
+
+  // Act
+  const std::string host = serve::server::GetHost();
+
+  // Assert
+  const std::string expected_host = "https://ads-serve.bravesoftware.com";
+  EXPECT_EQ(expected_host, host);
+}
+
+TEST(BatAdsServeServerUtilTest,
+    Development) {
+  // Arrange
+  SetEnvironment(Environment::DEVELOPMENT);
+
+  // Act
+  const std::string host = serve::server::GetHost();
+
+  // Assert
+  const std::string expected_host = "https://ads-serve.brave.software";
+  EXPECT_EQ(expected_host, host);
+}
+
+}  // namespace ads