Changes client_token to be client_auth_token.

blimp/client/core/session/assignment_source.cc

 // Copyright 2016 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 "blimp/client/core/session/assignment_source.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "blimp/client/core/blimp_client_switches.h"
-#include "blimp/common/get_client_token.h"
+#include "blimp/common/get_client_auth_token.h"
 #include "blimp/common/protocol_version.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace blimp {
 namespace client {
 
 namespace {
 
 // Assignment request JSON keys.
 const char kProtocolVersionKey[] = "protocol_version";
 
 // Assignment response JSON keys.
-const char kClientTokenKey[] = "clientToken";
+const char kClientAuthTokenKey[] = "clientToken";
 const char kHostKey[] = "host";
 const char kPortKey[] = "port";
 const char kCertificateKey[] = "certificate";
 
 // Possible arguments for the "--engine-transport" command line parameter.
 const char kSSLTransportValue[] = "ssl";
 const char kTCPTransportValue[] = "tcp";
 
 class SimpleURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
@@ skipping 45 matching lines @@
   return port > 0 && port <= 65535;
 }
 
 // Populates an Assignment using command-line parameters, if provided.
 // Returns a null Assignment if no parameters were set.
 // Must be called on a thread suitable for file IO.
 Assignment GetAssignmentFromCommandLine() {
   Assignment assignment;
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  assignment.client_token = GetClientToken(*cmd_line);
-  CHECK(!assignment.client_token.empty()) << "No client token provided.";
+  assignment.client_auth_token = GetClientAuthToken(*cmd_line);
+  CHECK(!assignment.client_auth_token.empty()) << "No client token provided.";

[maniscalco, 2016/08/30 18:05:09]

"No client token provided." -> "No client auth token provided." ?

[CJ, 2016/09/01 23:18:22]

Done.

 
   unsigned port_parsed = 0;
   if (!base::StringToUint(
           cmd_line->GetSwitchValueASCII(switches::kEnginePort),
           &port_parsed) || !IsValidIpPortNumber(port_parsed)) {
     DLOG(FATAL) << "--engine-port must be a value between 1 and 65535.";
     return Assignment();
   }
 
   net::IPAddress ip_address;
@@ skipping 186 matching lines @@
 void AssignmentSource::OnJsonParsed(std::unique_ptr<base::Value> json) {
   const base::DictionaryValue* dict;
   if (!json->GetAsDictionary(&dict)) {
     LOG(WARNING) << "Unable to parse JSON data as a dictionary.";
     base::ResetAndReturn(&callback_)
         .Run(ASSIGNMENT_REQUEST_RESULT_BAD_RESPONSE, Assignment());
     return;
   }
 
   // Validate that all the expected fields are present.
-  std::string client_token;
+  std::string client_auth_token;
   std::string host;
   int port;
   std::string cert_str;
-  if (!(dict->GetString(kClientTokenKey, &client_token) &&
+  if (!(dict->GetString(kClientAuthTokenKey, &client_auth_token) &&
         dict->GetString(kHostKey, &host) && dict->GetInteger(kPortKey, &port) &&
         dict->GetString(kCertificateKey, &cert_str))) {
     LOG(WARNING) << "Not all fields present in assignment JSON data.";
     base::ResetAndReturn(&callback_)
         .Run(ASSIGNMENT_REQUEST_RESULT_BAD_RESPONSE, Assignment());
     return;
   }
 
   net::IPAddress ip_address;
   if (!ip_address.AssignFromIPLiteral(host)) {
@@ skipping 18 matching lines @@
     base::ResetAndReturn(&callback_)
         .Run(ASSIGNMENT_REQUEST_RESULT_INVALID_CERT, Assignment());
     return;
   }
 
   // The assigner assumes SSL-only and all engines it assigns only communicate
   // over SSL.
   Assignment assignment;
   assignment.transport_protocol = Assignment::TransportProtocol::SSL;
   assignment.engine_endpoint = net::IPEndPoint(ip_address, port);
-  assignment.client_token = client_token;
+  assignment.client_auth_token = client_auth_token;
   assignment.cert = std::move(cert_list[0]);
 
   base::ResetAndReturn(&callback_)
       .Run(ASSIGNMENT_REQUEST_RESULT_OK, assignment);
 }
 
 void AssignmentSource::OnJsonParseError(const std::string& error) {
   DLOG(ERROR) << "Error while parsing assigner JSON: " << error;
   base::ResetAndReturn(&callback_)
       .Run(ASSIGNMENT_REQUEST_RESULT_BAD_RESPONSE, Assignment());
 }
 
 }  // namespace client
 }  // namespace blimp