More consistent style for TokenStore user accessors.

Author: tarickb

src/client.cc

@@ -225,7 +225,7 @@ int Client::InitialStep(sasl_client_params_t *params,
   user_ = auth_name;
   token_ = TokenStore::Create(log_.get(), password);
   if (!token_) return SASL_FAIL;
-  if (token_->HasUser()) user_ = token_->User();
+  if (token_->has_user()) user_ = token_->user();
 
   err = SendToken(to_server, to_server_len);
   if (err != SASL_OK) return err;

src/token_store.cc

@@ -237,7 +237,7 @@ int TokenStore::Write() {
     root["refresh_token"] = refresh_;
     root["access_token"] = access_;
     root["expiry"] = std::to_string(expiry_);
-    if (HasUser()) root["user"] = user_;
+    if (has_user()) root["user"] = user_;
 
     WriteOverride("client_id", override_client_id_, &root);
     WriteOverride("client_secret", override_client_secret_, &root);

src/token_store.h

@@ -33,8 +33,9 @@ class TokenStore {
 
   int GetAccessToken(std::string *token);
   int Refresh();
-  std::string User() const { return user_; }
-  bool HasUser() const { return !user_.empty(); }
+
+  std::string user() const { return user_; }
+  bool has_user() const { return !user_.empty(); }
 
  private:
   TokenStore(Log *log, const std::string &path, bool enable_updates);
@@ -56,8 +57,8 @@ class TokenStore {
 
   std::string access_;
   std::string refresh_;
-  time_t expiry_ = 0;
   std::string user_;
+  time_t expiry_ = 0;
 
   int refresh_attempts_ = 0;
 };