From 540c285adbcc658935b4170f86c8ae5ed5ec9f41 Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Thu, 16 Jul 2020 16:32:29 -0700
Subject: [PATCH] Check reset state in GetNetworkTime callback because reset
 might happen between RequestAccessToken and ResetKeys

---
 components/sync/driver/brave_sync_auth_manager.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/sync/driver/brave_sync_auth_manager.cc b/components/sync/driver/brave_sync_auth_manager.cc
index 93b19cb0dac..6b8927e3fb6 100644
--- a/components/sync/driver/brave_sync_auth_manager.cc
+++ b/components/sync/driver/brave_sync_auth_manager.cc
@@ -59,6 +59,7 @@ void BraveSyncAuthManager::ResetKeys() {
 }
 
 void BraveSyncAuthManager::RequestAccessToken() {
+  VLOG(1) << __func__;
   brave_sync::NetworkTimeHelper::GetInstance()->GetNetworkTime(
       base::BindOnce(&BraveSyncAuthManager::OnNetworkTimeFetched,
                      weak_ptr_factory_.GetWeakPtr()));
@@ -115,6 +116,8 @@ std::string BraveSyncAuthManager::GenerateAccessToken(
 
 void BraveSyncAuthManager::OnNetworkTimeFetched(const base::Time& time) {
   std::string timestamp = std::to_string(int64_t(time.ToJsTime()));
+  if (public_key_.empty() || private_key_.empty())
+    return;
   access_token_ = GenerateAccessToken(timestamp);
   if (registered_for_auth_notifications_)
     credentials_changed_callback_.Run();