Adding support for authenticated copresence calls

chrome/browser/extensions/api/copresence/copresence_api.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/copresence/copresence_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
 #include "chrome/common/chrome_version_info.h"
@@ skipping 12 matching lines @@
 
 base::LazyInstance<BrowserContextKeyedAPIFactory<CopresenceService>>
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 const char kInvalidOperationsMessage[] =
     "Invalid operation in operations array.";
 const char kShuttingDownMessage[] = "Shutting down.";
 
 }  // namespace
 
-// CopresenceService implementation:
+
+// CopresenceService implementation

[rkc, 2014/10/28 04:12:45]

.

[Charlie, 2014/10/28 22:51:51]

Done.

 
 CopresenceService::CopresenceService(content::BrowserContext* context)
     : is_shutting_down_(false), browser_context_(context) {}
 
 CopresenceService::~CopresenceService() {}
 
+void CopresenceService::Shutdown() {
+  is_shutting_down_ = true;
+  manager_.reset();
+  whispernet_client_.reset();
+}
+
 copresence::CopresenceManager* CopresenceService::manager() {
   if (!manager_ && !is_shutting_down_)
     manager_ = copresence::CopresenceManager::Create(this);
   return manager_.get();
 }
 
 copresence::WhispernetClient* CopresenceService::whispernet_client() {
   if (!whispernet_client_ && !is_shutting_down_)
     whispernet_client_.reset(new ChromeWhispernetClient(browser_context_));
   return whispernet_client_.get();
 }
 
-void CopresenceService::Shutdown() {
-  is_shutting_down_ = true;
-  manager_.reset();
-  whispernet_client_.reset();
+void CopresenceService::set_api_key(const std::string& app_id,
+                                    const std::string& api_key) {
+  DCHECK(!app_id.empty());
+  api_keys_by_app_[app_id] = api_key;
+}
+
+void CopresenceService::set_auth_token(const std::string& token) {
+  auth_token_ = token;
 }
 
 void CopresenceService::set_manager_for_testing(
     scoped_ptr<copresence::CopresenceManager> manager) {
   manager_ = manager.Pass();
 }
 
 // static
 BrowserContextKeyedAPIFactory<CopresenceService>*
 CopresenceService::GetFactoryInstance() {
@@ skipping 39 matching lines @@
 }
 
 net::URLRequestContextGetter* CopresenceService::GetRequestContext() const {
   return browser_context_->GetRequestContext();
 }
 
 const std::string CopresenceService::GetPlatformVersionString() const {
   return chrome::VersionInfo().CreateVersionString();
 }
 
-const std::string CopresenceService::GetAPIKey() const {
-  return api_key_;
+const std::string CopresenceService::GetAPIKey(const std::string& app_id)
+    const {
+  // This won't be const if we use map[]
+  const auto& key = api_keys_by_app_.find(app_id);
+  return key == api_keys_by_app_.end() ? std::string() : key->second;
+}
+
+const std::string CopresenceService::GetAuthToken() const {
+  return auth_token_;
 }
 
 copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {
   return whispernet_client();
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<CopresenceService>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 }
 
-// CopresenceExecuteFunction implementation:
+// CopresenceExecuteFunction implementation
 ExtensionFunction::ResponseAction CopresenceExecuteFunction::Run() {
   scoped_ptr<api::copresence::Execute::Params> params(
       api::copresence::Execute::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   CopresenceService* service =
       CopresenceService::GetFactoryInstance()->Get(browser_context());
 
   // This can only happen if we're shutting down. In all other cases, if we
   // don't have a manager, we'll create one.
@@ skipping 17 matching lines @@
 }
 
 void CopresenceExecuteFunction::SendResult(
     copresence::CopresenceStatus status) {
   api::copresence::ExecuteStatus api_status =
       (status == copresence::SUCCESS) ? api::copresence::EXECUTE_STATUS_SUCCESS
                                       : api::copresence::EXECUTE_STATUS_FAILED;
   Respond(ArgumentList(api::copresence::Execute::Results::Create(api_status)));
 }
 
-// CopresenceSetApiKeyFunction implementation:
+// CopresenceSetApiKeyFunction implementation

[rkc, 2014/10/28 04:12:45]

.

[Charlie, 2014/10/28 22:51:51]

Done.

 ExtensionFunction::ResponseAction CopresenceSetApiKeyFunction::Run() {
   scoped_ptr<api::copresence::SetApiKey::Params> params(
       api::copresence::SetApiKey::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   // The api key may be set to empty, to clear it.
   CopresenceService::GetFactoryInstance()->Get(browser_context())
-      ->set_api_key(params->api_key);
+      ->set_api_key(extension_id(), params->api_key);
   return RespondNow(NoArguments());
 }
 
+// CopresenceSetAuthTokenFunction implementation
+ExtensionFunction::ResponseAction CopresenceSetAuthTokenFunction::Run() {
+  scoped_ptr<api::copresence::SetAuthToken::Params> params(
+      api::copresence::SetAuthToken::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  // The token may be set to empty, to clear it.
+  CopresenceService::GetFactoryInstance()->Get(browser_context())
+      ->set_auth_token(params->token);

[rkc, 2014/10/28 04:12:45]

Add a TODO here with a link to a bug tracking that we should change this to be
handled correctly for multiple apps + unauthenticated.

[Charlie, 2014/10/28 22:51:51]

Done.

+  return RespondNow(NoArguments());
+}
+
 }  // namespace extensions