Implements new persona api

Resolves brave/brave-browser#8428
brave · Jul 4, 2020 · e28b725 · e28b725
1 parent 24c107d
commit e28b725
Show file tree

Hide file tree

Showing 47 changed files with 226 additions and 899 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -398,6 +398,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
         { "walletRecoverySuccess",  IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_SUCCESS },           // NOLINT
         { "walletRestored",  IDS_BRAVE_REWARDS_LOCAL_WALLET_RESTORED },
         { "walletRecoveryFail",  IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_FAIL },                 // NOLINT
+        { "walletRecoveryOutdated",  IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_OUTDATED },                 // NOLINT
         { "almostThere",  IDS_BRAVE_REWARDS_LOCAL_ALMOST_THERE },
         { "notQuite",  IDS_BRAVE_REWARDS_LOCAL_NOT_QUITE },
         { "proveHuman",  IDS_BRAVE_REWARDS_LOCAL_PROVE_HUMAN },

diff --git a/components/brave_rewards/browser/rewards_service.cc b/components/brave_rewards/browser/rewards_service.cc
@@ -77,7 +77,6 @@ void RewardsService::RegisterProfilePrefs(PrefRegistrySimple* registry) {
   registry->RegisterDoublePref(prefs::kStateAutoContributeAmount, 0.0);
   registry->RegisterUint64Pref(prefs::kStateNextReconcileStamp, 0ull);
   registry->RegisterUint64Pref(prefs::kStateCreationStamp, 0ull);
-  registry->RegisterStringPref(prefs::kStateAnonymousCardId, "");
   registry->RegisterStringPref(prefs::kStateRecoverySeed, "");
   registry->RegisterStringPref(prefs::kStatePaymentId, "");
   registry->RegisterBooleanPref(prefs::kStateInlineTipRedditEnabled, false);

diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc
@@ -1005,22 +1005,6 @@ void RewardsServiceImpl::OnPublisherStateLoaded(
       data);
 }
 
-void RewardsServiceImpl::LoadNicewareList(
-  ledger::GetNicewareListCallback callback) {
-  if (!Connected()) {
-    return;
-  }
-
-  std::string data = ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
-      IDR_BRAVE_REWARDS_NICEWARE_LIST).as_string();
-
-  if (data.empty()) {
-    BLOG(0, "Failed to read in niceware list");
-  }
-  callback(data.empty() ? ledger::Result::LEDGER_ERROR
-                        : ledger::Result::LEDGER_OK, data);
-}
-
 void RewardsServiceImpl::LoadURL(
     const std::string& url,
     const std::vector<std::string>& headers,

diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h
@@ -345,7 +345,6 @@ class RewardsServiceImpl : public RewardsService,
                       ledger::Result result);
   void OnLedgerStateLoaded(ledger::OnLoadCallback callback,
                               std::pair<std::string, base::Value> data);
-  void LoadNicewareList(ledger::GetNicewareListCallback callback) override;
   void OnPublisherStateLoaded(ledger::OnLoadCallback callback,
                               const std::string& data);
   void OnGetRewardsParameters(

diff --git a/components/brave_rewards/common/pref_names.cc b/components/brave_rewards/common/pref_names.cc
@@ -47,7 +47,6 @@ const char kStateAutoContributeEnabled[] = "brave.rewards.ac.enabled";
 const char kStateAutoContributeAmount[] = "brave.rewards.ac.amount";
 const char kStateNextReconcileStamp[] = "brave.rewards.ac.next_reconcile_stamp";
 const char kStateCreationStamp[] = "brave.rewards.creation_stamp";
-const char kStateAnonymousCardId[] = "brave.rewards.wallet.anonymous_card_id";
 const char kStateRecoverySeed[] = "brave.rewards.wallet.seed";
 const char kStatePaymentId[] = "brave.rewards.wallet.payment_id";
 const char kStateInlineTipRedditEnabled[] = "brave.rewards.inline_tip.reddit";

diff --git a/components/brave_rewards/common/pref_names.h b/components/brave_rewards/common/pref_names.h
@@ -39,7 +39,6 @@ extern const char kStateAutoContributeEnabled[];
 extern const char kStateAutoContributeAmount[];
 extern const char kStateNextReconcileStamp[];
 extern const char kStateCreationStamp[];
-extern const char kStateAnonymousCardId[];
 extern const char kStateRecoverySeed[];
 extern const char kStatePaymentId[];
 extern const char kStateInlineTipRedditEnabled[];

diff --git a/components/brave_rewards/resources/brave_rewards_static_resources.grd b/components/brave_rewards/resources/brave_rewards_static_resources.grd
@@ -15,7 +15,6 @@
       <include name="IDR_BRAVE_REWARDS_IMG_CAPTCHA_BAT" file="page/img/captcha_bat.png" type="BINDATA" />
       <include name="IDR_BRAVE_REWARDS_IMG_WELCOME_BG" file="page/img/welcome_bg.svg" type="BINDATA" />
       <include name="IDR_BRAVE_REWARDS_FAVICON" file="page/img/favicon.ico" type="BINDATA" />
-      <include name="IDR_BRAVE_REWARDS_NICEWARE_LIST" file="../../../vendor/bat-native-ledger/niceware/wordlist" type="BINDATA" />
       <include name="IDR_BRAVE_REWARDS_IMG_TAP" file="page/promos/assets/tap_bg.svg" type="BINDATA" />
 
       <!-- WebUI Brave Rewards Internals resources -->

diff --git a/components/brave_rewards/resources/page/components/pageWallet.tsx b/components/brave_rewards/resources/page/components/pageWallet.tsx
@@ -257,7 +257,7 @@ class PageWallet extends React.Component<Props, State> {
       }
     }
 
-    if (walletRecoverySuccess) {
+    if (walletRecoverySuccess === 0) {
       const batFormatString = onlyAnonWallet ? getLocale('batPoints') : getLocale('bat')
 
       return {
@@ -745,6 +745,20 @@ class PageWallet extends React.Component<Props, State> {
     )
   }
 
+  getBackupErrorMessage = () => {
+    const { ui } = this.props.rewardsData
+    const { walletRecoverySuccess } = ui
+    if (walletRecoverySuccess === 1) {
+      return getLocale('walletRecoveryFail')
+    }
+
+    if (walletRecoverySuccess === 2) {
+      return getLocale('walletRecoveryOutdated')
+    }
+
+    return ''
+  }
+
   render () {
     const {
       recoveryKey,
@@ -754,7 +768,7 @@ class PageWallet extends React.Component<Props, State> {
       pendingContributionTotal
     } = this.props.rewardsData
     const { total } = balance
-    const { walletRecoverySuccess, emptyWallet, modalBackup, onlyAnonWallet } = ui
+    const { emptyWallet, modalBackup, onlyAnonWallet } = ui
 
     const pendingTotal = parseFloat((pendingContributionTotal || 0).toFixed(3))
 
@@ -810,7 +824,7 @@ class PageWallet extends React.Component<Props, State> {
               onSaveFile={this.onModalBackupOnSaveFile}
               onRestore={this.onModalBackupOnRestore}
               onVerify={this.onVerifyClick.bind(this, true)}
-              error={walletRecoverySuccess === false ? getLocale('walletRecoveryFail') : ''}
+              error={this.getBackupErrorMessage()}
             />
             : null
         }

diff --git a/components/brave_rewards/resources/page/reducers/wallet_reducer.ts b/components/brave_rewards/resources/page/reducers/wallet_reducer.ts
@@ -72,7 +72,7 @@ const walletReducer: Reducer<Rewards.State | undefined> = (state: Rewards.State,
 
       if (!key || key.length === 0) {
         let ui = state.ui
-        ui.walletRecoverySuccess = false
+        ui.walletRecoverySuccess = 0
 
         state = {
           ...state,

diff --git a/components/brave_rewards/test/BUILD.gn b/components/brave_rewards/test/BUILD.gn
@@ -37,7 +37,6 @@ source_set("brave_rewards_unit_tests") {
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/report_balance_state_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/unsigned_tx_state_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/legacy/wallet_info_state_unittest.cc",
-      "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/test/niceware_partial_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/database/database_util_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/promotion/promotion_unittest.cc",
       "//brave/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_util_unittest.cc",

diff --git a/components/definitions/rewards.d.ts b/components/definitions/rewards.d.ts
@@ -73,7 +73,7 @@ declare namespace Rewards {
       promosDismissed?: {
         [key: string]: boolean
       }
-      walletRecoverySuccess: boolean | null
+      walletRecoverySuccess: number | null
       walletServerProblem: boolean
       walletCorrupted: boolean
       onBoardingDisplayed?: boolean

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -341,6 +341,7 @@
       <message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_SUCCESS" desc="">{{balance}} {{currency}} was recovered. Your wallet key has been verified and loaded successfully.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RESTORED" desc="">Wallet restored!</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_FAIL" desc="">Please re-enter keys or try different keys.</message>
+      <message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_OUTDATED" desc="">You are using old recovery keys. Please update them. You can find instructions how to do this here.</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_ALMOST_THERE" desc="">Almost there…</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_PROVE_HUMAN" desc="">Prove that you are human!</message>
       <message name="IDS_BRAVE_REWARDS_LOCAL_NOT_QUITE" desc="">Hmmm, not quite...</message>

diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_bridge.cc b/components/services/bat_ledger/bat_ledger_client_mojo_bridge.cc
@@ -176,24 +176,6 @@ void BatLedgerClientMojoBridge::FetchFavIcon(const std::string& url,
       base::BindOnce(&OnFetchFavIcon, std::move(callback)));
 }
 
-void OnLoadNicewareList(
-    const ledger::GetNicewareListCallback& callback,
-    const ledger::Result result,
-    const std::string& data) {
-  callback(result, data);
-}
-
-void BatLedgerClientMojoBridge::LoadNicewareList(
-    ledger::GetNicewareListCallback callback) {
-  if (!Connected()) {
-    callback(ledger::Result::LEDGER_ERROR, "");
-    return;
-  }
-
-  bat_ledger_client_->LoadNicewareList(
-      base::BindOnce(&OnLoadNicewareList, std::move(callback)));
-}
-
 std::string BatLedgerClientMojoBridge::URIEncode(const std::string& value) {
   if (!Connected())
     return "";

diff --git a/components/services/bat_ledger/bat_ledger_client_mojo_bridge.h b/components/services/bat_ledger/bat_ledger_client_mojo_bridge.h
@@ -139,8 +139,6 @@ class BatLedgerClientMojoBridge :
 
   void PendingContributionSaved(const ledger::Result result) override;
 
-  void LoadNicewareList(ledger::GetNicewareListCallback callback) override;
-
   void OnLoadLedgerState(ledger::OnLoadCallback callback,
       const ledger::Result result, const std::string& data);
   void OnLoadPublisherState(ledger::OnLoadCallback callback,

diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.cc
@@ -111,27 +111,6 @@ void LedgerClientMojoBridge::FetchFavIcon(const std::string& url,
       std::bind(LedgerClientMojoBridge::OnFetchFavIcon, holder, _1, _2));
 }
 
-// static
-void LedgerClientMojoBridge::OnLoadNicewareList(
-    CallbackHolder<LoadNicewareListCallback>* holder,
-    const ledger::Result result,
-    const std::string& data) {
-  DCHECK(holder);
-  if (holder->is_valid())
-    std::move(holder->get()).Run(result, data);
-  delete holder;
-}
-
-void LedgerClientMojoBridge::LoadNicewareList(
-    LoadNicewareListCallback callback) {
-  // deleted in OnLoadNicewareList
-  auto* holder = new CallbackHolder<LoadNicewareListCallback>(
-      AsWeakPtr(), std::move(callback));
-  ledger_client_->LoadNicewareList(
-      std::bind(LedgerClientMojoBridge::OnLoadNicewareList,
-        holder, _1, _2));
-}
-
 void LedgerClientMojoBridge::URIEncode(const std::string& value,
     URIEncodeCallback callback) {
   std::move(callback).Run(ledger_client_->URIEncode(value));

diff --git a/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h b/components/services/bat_ledger/public/cpp/ledger_client_mojo_bridge.h
@@ -39,8 +39,6 @@ class LedgerClientMojoBridge :
   void FetchFavIcon(const std::string& url, const std::string& favicon_key,
       FetchFavIconCallback callback) override;
 
-  void LoadNicewareList(LoadNicewareListCallback callback) override;
-
   void SetTimer(uint64_t time_offset, SetTimerCallback callback) override;
   void KillTimer(const uint32_t timer_id) override;
   void OnPanelPublisherInfo(
@@ -196,11 +194,6 @@ class LedgerClientMojoBridge :
       bool success,
       const std::string& favicon_url);
 
-  static void OnLoadNicewareList(
-      CallbackHolder<LoadNicewareListCallback>* holder,
-      const ledger::Result result,
-      const std::string& data);
-
   static void OnLoadURL(
       CallbackHolder<LoadURLCallback>* holder,
       const ledger::UrlResponse& response);

diff --git a/components/services/bat_ledger/public/interfaces/bat_ledger.mojom b/components/services/bat_ledger/public/interfaces/bat_ledger.mojom
@@ -172,8 +172,6 @@ interface BatLedgerClient {
   FetchFavIcon(string url, string favicon_key) => (bool success,
       string favicon_url);
 
-  LoadNicewareList() => (ledger.mojom.Result result, string data);
-
   LoadURL(string url, array<string> headers, string content,
       string content_type, ledger.mojom.UrlMethod method) => (ledger.mojom.UrlResponse response);
 

diff --git a/components/test/brave_rewards/page/reducers/rewards_reducer_test.ts b/components/test/brave_rewards/page/reducers/rewards_reducer_test.ts
@@ -63,11 +63,11 @@ describe('rewards reducer', () => {
       it('import flow - existing state', () => {
         const initState: Rewards.State = { ...defaultState }
         initState.ui.emptyWallet = false
-        initState.ui.walletRecoverySuccess = true
+        initState.ui.walletRecoverySuccess = 1
 
         const expectedState: Rewards.State = { ...defaultState }
         expectedState.ui.emptyWallet = false
-        expectedState.ui.walletRecoverySuccess = true
+        expectedState.ui.walletRecoverySuccess = 1
 
         const assertion = reducers({
           rewardsData: initState

diff --git a/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h b/vendor/bat-native-confirmations/src/bat/confirmations/internal/confirmations_client_mock.h
@@ -41,9 +41,6 @@ class ConfirmationsClientMock : public ConfirmationsClient {
   MOCK_METHOD1(LoadPublisherState, void(
       ledger::OnLoadCallback callback));
 
-  MOCK_METHOD1(LoadNicewareList, void(
-      ledger::GetNicewareListCallback callback));
-
   MOCK_METHOD2(SaveActivityInfo, void(
       ledger::PublisherInfoPtr publisher_info,
       ledger::PublisherInfoCallback callback));

diff --git a/vendor/bat-native-ledger/BUILD.gn b/vendor/bat-native-ledger/BUILD.gn
@@ -365,7 +365,6 @@ source_set("ledger") {
     "//url",
     rebase_path("bat-native-ads", dep_base),
     rebase_path("bat-native-confirmations", dep_base),
-    rebase_path("bat-native-anonize:anonize2", dep_base),
     rebase_path("bip39wally-core-native:bip39wally-core", dep_base),
     rebase_path("bat-native-tweetnacl:tweetnacl", dep_base),
     rebase_path("bat-native-rapidjson", dep_base),

diff --git a/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h b/vendor/bat-native-ledger/include/bat/ledger/ledger_client.h
@@ -22,8 +22,6 @@ using PublisherInfoCallback =
 // TODO(nejczdovc) we should be providing result back as well
 using PublisherInfoListCallback =
     std::function<void(PublisherInfoList)>;
-using GetNicewareListCallback =
-    std::function<void(const Result, const std::string&)>;
 using FetchIconCallback = std::function<void(bool, const std::string&)>;
 using LoadURLCallback = std::function<void(const ledger::UrlResponse&)>;
 using OnLoadCallback = std::function<void(const Result,
@@ -80,8 +78,6 @@ class LEDGER_EXPORT LedgerClient {
 
   virtual void LoadPublisherState(OnLoadCallback callback) = 0;
 
-  virtual void LoadNicewareList(ledger::GetNicewareListCallback callback) = 0;
-
   virtual void OnPanelPublisherInfo(Result result,
                                    ledger::PublisherInfoPtr publisher_info,
                                    uint64_t windowId) = 0;

diff --git a/vendor/bat-native-ledger/niceware/wordlist b/vendor/bat-native-ledger/niceware/wordlist