Simplified auth token handling.

Matti Virkkunen
1 parent 78a2ff96
Showing 9 changed files with 8 additions and 37 deletions
httpclient.cpp
httpclient.hpp
linehttptransport.cpp
linehttptransport.hpp
pinverifier.cpp
poller.hpp
purpleline_login.cpp
thriftclient.cpp
thriftclient.hpp
@@ -19,10 +19,6 @@ HTTPClient::~HTTPClient() {
     }
 }
  
-void HTTPClient::set_auth_token(std::string token) {
-    this->auth_token = token;
-}
-
 void HTTPClient::request(std::string url, HTTPClient::CompleteFunc callback) {
     request(url, HTTPFlag::NONE, callback);
 }
@@ -73,7 +69,8 @@ void HTTPClient::execute_next() {
         if (req->flags & HTTPFlag::AUTH) {
             ss
                 << "X-Line-Application: " << LINE_APPLICATION << "\r\n"
-                << "X-Line-Access: " << auth_token << "\r\n";
+                << "X-Line-Access: "
+                    << purple_account_get_string(acct, LINE_ACCOUNT_AUTH_TOKEN, "") << "\r\n";
         }
  
         if (req->content_type.size())
@@ -38,8 +38,6 @@ class HTTPClient {
  
     PurpleAccount *acct;
  
-    std::string auth_token;
-
     std::list<Request *> request_queue;
     int in_flight;
  
@@ -55,8 +53,6 @@ public:
     HTTPClient(PurpleAccount *acct);
     ~HTTPClient();
  
-    void set_auth_token(std::string token);
-
     void request(std::string url, CompleteFunc callback);
     void request(std::string url, HTTPFlag flags, CompleteFunc callback);
     void request(std::string url, HTTPFlag flags,
@@ -21,7 +21,6 @@ LineHttpTransport::LineHttpTransport(
     host(host),
     port(port),
     ls_mode(ls_mode),
-    auth_token(""),
     state(ConnectionState::DISCONNECTED),
     auto_reconnect(false),
     reconnect_timeout_handle(0),
@@ -45,10 +44,6 @@ void LineHttpTransport::set_auto_reconnect(bool auto_reconnect) {
         this->auto_reconnect = auto_reconnect;
 }
  
-void LineHttpTransport::set_auth_token(std::string token) {
-    this->auth_token = token;
-}
-
 int LineHttpTransport::status_code() {
     return status_code_;
 }
@@ -171,7 +166,8 @@ void LineHttpTransport::send_next() {
             << "User-Agent: " LINE_USER_AGENT "\r\n"
             << "X-Line-Application: " LINE_APPLICATION "\r\n";
  
-        if (auth_token != "")
+        const char *auth_token = purple_account_get_string(acct, LINE_ACCOUNT_AUTH_TOKEN, "");
+        if (auth_token)
             data << "X-Line-Access: " << auth_token << "\r\n";
     }
  
@@ -39,7 +39,6 @@ class LineHttpTransport : public apache::thrift::transport::TTransport {
     std::string host;
     uint16_t port;
     bool ls_mode;
-    std::string auth_token;
     std::string x_ls;
  
     ConnectionState state;
@@ -77,7 +76,6 @@ public:
     ~LineHttpTransport();
  
     void set_auto_reconnect(bool auto_reconnect);
-    void set_auth_token(std::string token);
  
     virtual void open();
     virtual void close();
@@ -49,7 +49,8 @@ void PINVerifier::verify(
         WRAPPER(PINVerifier::timeout_cb),
         (gpointer)this);
  
-    http.set_auth_token(verifier);
+    parent.set_auth_token(verifier);
+
     http.request(LINE_VERIFICATION_URL, HTTPFlag::AUTH,
         [this, verifier, success](int status, const guchar *data, gsize len)
     {
@@ -24,7 +24,6 @@ public:
     ~Poller();
  
     void start();
-    void set_auth_token(std::string token) { client->set_auth_token(token); }
     void set_local_rev(int64_t local_rev) { this->local_rev = local_rev; }
  
 private:
@@ -4,15 +4,11 @@ void PurpleLine::login_start() {
     purple_connection_set_state(conn, PURPLE_CONNECTING);
     purple_connection_update_progress(conn, "Logging in", 0, 3);
  
-    std::string auth_token(purple_account_get_string(acct, LINE_ACCOUNT_AUTH_TOKEN, ""));
-
-    if (auth_token.size()) {
+    if (purple_account_get_string(acct, LINE_ACCOUNT_AUTH_TOKEN, NULL)) {
         // There's a stored authentication token, see if it works
  
-        set_auth_token(auth_token);
-
         c_out->send_getLastOpRevision();
-        c_out->send([this, auth_token]() {
+        c_out->send([this]() {
             int64_t local_rev;
  
             try {
@@ -37,8 +33,6 @@ void PurpleLine::login_start() {
  
             poller.set_local_rev(local_rev);
  
-            set_auth_token(auth_token);
-
             // Already got the last op revision, no need to call get_last_op_revision()
  
             get_profile();
@@ -121,11 +115,6 @@ void PurpleLine::set_auth_token(std::string auth_token) {
     c_out->close();
     c_out->set_auto_reconnect(true);
     c_out->set_path(LINE_COMMAND_PATH);
-
-    c_out->set_auth_token(auth_token);
-    poller.set_auth_token(auth_token);
-    os_http.set_auth_token(auth_token);
-    http.set_auth_token(auth_token);
 }
  
 void PurpleLine::get_last_op_revision() {
@@ -23,10 +23,6 @@ void ThriftClient::set_auto_reconnect(bool auto_reconnect) {
     http->set_auto_reconnect(auto_reconnect);
 }
  
-void ThriftClient::set_auth_token(std::string token) {
-    http->set_auth_token(token);
-}
-
 void ThriftClient::send(std::function<void()> callback) {
     http->request("POST", path, "application/x-thrift", callback);
 }
@@ -25,7 +25,6 @@ public:
  
     void set_path(std::string path);
     void set_auto_reconnect(bool auto_reconnect);
-    void set_auth_token(std::string token);
     void send(std::function<void()> callback);
  
     int status_code();