From 7e84a62bac137ed56792065d9347b45c43be0f10 Mon Sep 17 00:00:00 2001
From: Simon Hong <shong@brave.com>
Date: Thu, 16 Feb 2023 10:10:44 +0900
Subject: [PATCH] Pass "production" as vpn payment env value in prod env

fix https://github.com/brave/brave-browser/issues/28554
---
 components/brave_vpn/common/BUILD.gn              |  1 +
 components/brave_vpn/common/brave_vpn_utils.cc    | 15 ++-------------
 .../brave_vpn/common/brave_vpn_utils_unittest.cc  |  7 +++++++
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/brave_vpn/common/BUILD.gn b/components/brave_vpn/common/BUILD.gn
index 03185002e1e1..4129f789c465 100644
--- a/components/brave_vpn/common/BUILD.gn
+++ b/components/brave_vpn/common/BUILD.gn
@@ -38,6 +38,7 @@ source_set("unit_tests") {
   deps = [
     ":common",
     "//base",
+    "//brave/components/skus/browser",
     "//components/prefs",
     "//components/prefs:test_support",
     "//components/sync_preferences:test_support",
diff --git a/components/brave_vpn/common/brave_vpn_utils.cc b/components/brave_vpn/common/brave_vpn_utils.cc
index 77a56c639d55..619adff40b6f 100644
--- a/components/brave_vpn/common/brave_vpn_utils.cc
+++ b/components/brave_vpn/common/brave_vpn_utils.cc
@@ -124,19 +124,8 @@ std::string GetManageUrl(const std::string& env) {
 // When the vendor receives a credential from us during auth, it also includes
 // the environment. The vendor then can do a lookup using Payment Service.
 std::string GetBraveVPNPaymentsEnv(const std::string& env) {
-  if (env == skus::kEnvProduction)
-    return "";
-  // Use same value.
-  if (env == skus::kEnvStaging || env == skus::kEnvDevelopment)
-    return env;
-
-  NOTREACHED();
-
-#if defined(OFFICIAL_BUILD)
-  return "";
-#else
-  return "development";
-#endif
+  // Use same string as payment env.
+  return env;
 }
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
diff --git a/components/brave_vpn/common/brave_vpn_utils_unittest.cc b/components/brave_vpn/common/brave_vpn_utils_unittest.cc
index c6c26e554455..4d0809c71174 100644
--- a/components/brave_vpn/common/brave_vpn_utils_unittest.cc
+++ b/components/brave_vpn/common/brave_vpn_utils_unittest.cc
@@ -10,6 +10,7 @@
 #include "brave/components/brave_vpn/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/testing_pref_service.h"
+#include "components/skus/browser/skus_utils.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -187,3 +188,9 @@ TEST(BraveVPNUtilsUnitTest, AlreadyMigrated) {
   EXPECT_TRUE(local_state_pref_service.HasPrefPath(
       brave_vpn::prefs::kBraveVPNLocalStateMigrated));
 }
+
+TEST(BraveVPNUtilsUnitTest, VPNPaymentsEnv) {
+  EXPECT_EQ("production", GetBraveVPNPaymentsEnv(skus::kEnvProduction));
+  EXPECT_EQ("staging", GetBraveVPNPaymentsEnv(skus::kEnvStaging));
+  EXPECT_EQ("development", GetBraveVPNPaymentsEnv(skus::kEnvDevelopment));
+}