Adding support for authenticated copresence calls

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
   // These accessors will always return an object (except during shutdown).
   // If the object doesn't exist, they will create one first.
   copresence::CopresenceManager* manager();
   copresence::WhispernetClient* whispernet_client();
 
   // A registry containing the app id's associated with every subscription.
   SubscriptionToAppMap& apps_by_subscription_id() {
     return apps_by_subscription_id_;
   }
 
-  void set_api_key(const std::string& api_key) { api_key_ = api_key; }
+  void set_api_key(const std::string& app_id,
+                   const std::string& api_key);
+  void set_auth_token(const std::string& app_id,
+                      const std::string& token);
 
   // Manager override for testing.
   void set_manager_for_testing(
       scoped_ptr<copresence::CopresenceManager> manager);
 
   // BrowserContextKeyedAPI implementation.
   static BrowserContextKeyedAPIFactory<CopresenceService>* GetFactoryInstance();
 
  private:
   friend class BrowserContextKeyedAPIFactory<CopresenceService>;
 
   // CopresenceDelegate implementation
   virtual void HandleMessages(
       const std::string& app_id,
       const std::string& subscription_id,
       const std::vector<copresence::Message>& message) override;
   virtual net::URLRequestContextGetter* GetRequestContext() const override;
   virtual const std::string GetPlatformVersionString() const override;
-  virtual const std::string GetAPIKey() const override;
+  virtual const std::string GetAPIKey(const std::string& app_id) const override;
+  virtual const std::string GetAuthToken(const std::string& app_id) const
+      override;
   virtual copresence::WhispernetClient* GetWhispernetClient() override;
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() { return "CopresenceService"; }
 
   bool is_shutting_down_;
   std::map<std::string, std::string> apps_by_subscription_id_;
 
   content::BrowserContext* const browser_context_;
-  std::string api_key_;
+  std::map<std::string, std::string> api_keys_by_app_;

[rkc, 2014/10/21 22:48:38]

Instead of three different maps, all indexing by app_id, have one map of app_id
<-> AppCopresenceData (or whatever you want to call it). AppCopresenceData can
contain the API key, auth token and the subscription ID's belonging to an app.

[Charlie, 2014/10/21 23:19:44]

Putting the subscriptions IDs in doesn't actually work, because the index is the
wrong direction. We get messages back from the server tagged with their
subscription IDs. From that, we need to know which app to send each message to.
If we iterate through all the apps, it defeats the purpose of the map.

If you still want the other two maps collapsed, we can do that. But I don't
think it would be a lot cleaner.

+  std::map<std::string, std::string> auth_tokens_by_app_;
 
   scoped_ptr<copresence::CopresenceManager> manager_;
   scoped_ptr<copresence::WhispernetClient> whispernet_client_;
 
   DISALLOW_COPY_AND_ASSIGN(CopresenceService);
 };
 
 template <>
 void BrowserContextKeyedAPIFactory<
     CopresenceService>::DeclareFactoryDependencies();
@@ skipping 12 matching lines @@
 
 class CopresenceSetApiKeyFunction : public ChromeUIThreadExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("copresence.setApiKey", COPRESENCE_SETAPIKEY);
 
  protected:
   virtual ~CopresenceSetApiKeyFunction() {}
   virtual ExtensionFunction::ResponseAction Run() override;
 };
 
+class CopresenceSetAuthTokenFunction : public ChromeUIThreadExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("copresence.setAuthToken",
+                             COPRESENCE_SETAUTHTOKEN);
+
+ protected:
+  virtual ~CopresenceSetAuthTokenFunction() {}
+  virtual ExtensionFunction::ResponseAction Run() override;
+};
+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_COPRESENCE_COPRESENCE_API_H_