From 5ecdb58e2018143f697c3773b2fbc847a54a1178 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 17 Oct 2014 16:55:50 -0700
Subject: [PATCH] generate a new keypair on every interface launch

---
 interface/src/Application.cpp               | 3 +++
 libraries/networking/src/AccountManager.cpp | 7 -------
 libraries/networking/src/AccountManager.h   | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b85e1e4440..d5d4c361b7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -278,6 +278,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     connect(&accountManager, &AccountManager::authRequired, Menu::getInstance(), &Menu::loginForCurrentDomain);
     connect(&accountManager, &AccountManager::usernameChanged, this, &Application::updateWindowTitle);
+    
+    // once we have a profile in account manager make sure we generate a new keypair
+    connect(&accountManager, &AccountManager::profileChanged, &accountManager, &AccountManager::generateNewKeypair);
 
     // set the account manager's root URL and trigger a login request if we don't have the access token
     accountManager.setAuthURL(DEFAULT_NODE_AUTH_URL);
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 650e0e3321..0c63ecc731 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -146,12 +146,6 @@ void AccountManager::setAuthURL(const QUrl& authURL) {
                     } else {
                         requestProfile();
                     }
-                    
-                    // if we don't have a private key in settings we should generate a new keypair
-                    if (!_accountInfo.hasPrivateKey()) {
-                        qDebug() << "No private key present - generating a new key-pair.";
-                        generateNewKeypair();
-                    }
                 }
             }
         }
@@ -427,7 +421,6 @@ void AccountManager::requestAccessTokenFinished() {
             persistAccountToSettings();
 
             requestProfile();
-            generateNewKeypair();
         }
     } else {
         // TODO: error handling
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index 7b5ea8de8b..53512a8bb3 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -80,6 +80,7 @@ public slots:
     void logout();
     void updateBalance();
     void accountInfoBalanceChanged(qint64 newBalance);
+    void generateNewKeypair();
 signals:
     void authRequired();
     void authEndpointChanged();
@@ -102,8 +103,6 @@ private:
 
     void passSuccessToCallback(QNetworkReply* reply);
     void passErrorToCallback(QNetworkReply* reply);
-    
-    void generateNewKeypair();
 
     Q_INVOKABLE void invokedRequest(const QString& path,
                                     bool requiresAuthentication,