Merge pull request #1400 from Criptext/multiple-accounts

Multiple Accounts

Author: danieltigse

.gitignore

@@ -16,6 +16,7 @@ valgrind-out.txt
 CriptextEncrypt.db-shm
 CriptextEncrypt.db-wal
 recovery.key
+umzug.json
 
 # production
 *_interface/build

db_interface/src/axolotl/Account.cpp

@@ -8,16 +8,19 @@ CriptextDB::Account CriptextDB::getAccount(database db, char *recipientId) {
   string myPrivKey;
   string myPubKey;
   int regId = 0;
-  db << "select privKey, pubKey, registrationId from account where recipientId == ?;"
+  int accountId = 0;
+  db << "select id, privKey, pubKey, registrationId from account where recipientId == ?;"
     << recipientId
-    >> [&] (string privKey, string pubKey, int registrationId) {
+    >> [&] (int id, string privKey, string pubKey, int registrationId) {
+      accountId = id;
       myPrivKey = privKey;
       myPubKey = pubKey;
       regId = registrationId;
   };
 
   connection_type con = db.connection();
   Account account = { 
+    .id = accountId,
     .privKey = myPrivKey, 
     .pubKey = myPubKey, 
     .registrationId = regId,
@@ -37,23 +40,25 @@ int CriptextDB::createAccount(database db, char* recipientId, char* name, int de
         hasRow = true;
     };
     if (hasRow) {
-      db << "update account set name = ?, deviceId = ?, privKey = ?, pubKey = ?, registrationId = ? where recipientId == ?;"
+      db << "update account set name = ?, deviceId = ?, privKey = ?, pubKey = ?, registrationId = ?, isLoggedIn = false, isActive = false where recipientId == ?;"
         << name
         << deviceId
         << privKey
         << pubKey
         << registrationId
         << recipientId;
     } else {
-      db << "insert into account (recipientId, name, deviceId, jwt, refreshToken, privKey, pubKey, registrationId) values (?,?,?,?,?,?,?,?);"
+      db << "insert into account (recipientId, name, deviceId, jwt, refreshToken, privKey, pubKey, registrationId, isLoggedIn, isActive) values (?,?,?,?,?,?,?,?,?,?);"
         << recipientId
         << name
         << deviceId
         << ""
         << ""
         << privKey
         << pubKey
-        << registrationId;
+        << registrationId
+        << false
+        << false;
     }
     db << "commit;";
   } catch (exception& e) {

db_interface/src/axolotl/Account.h

@@ -14,6 +14,7 @@ using namespace std;
 
 namespace CriptextDB {
   struct Account {
+    int id;
     string privKey;
     string pubKey;
     int registrationId;

db_interface/src/axolotl/IdentityKey.cpp

@@ -5,12 +5,13 @@
 using namespace sqlite;
 using namespace std;
 
-CriptextDB::IdentityKey CriptextDB::getIdentityKey(database db, string recipientId, long int deviceId) {
+CriptextDB::IdentityKey CriptextDB::getIdentityKey(database db, int accountId, string recipientId, long int deviceId) {
   IdentityKey identityKey;
-  db << "Select * from identitykeyrecord where recipientId == ? and deviceId == ?;"
+  db << "Select * from identitykeyrecord where recipientId == ? and deviceId == ? and accountId == ?;"
      << recipientId
      << deviceId
-     >> [&] (string recipientId, int deviceId, string identity) {
+     << accountId
+     >> [&] (int id, string recipientId, int deviceId, string identity) {
         identityKey = { 
           .recipientId = recipientId, 
           .deviceId = deviceId, 
@@ -24,26 +25,29 @@ CriptextDB::IdentityKey CriptextDB::getIdentityKey(database db, string recipient
   return identityKey;
 }
 
-bool CriptextDB::createIdentityKey(database db, string recipientId, int deviceId, char *identityKey) {
+bool CriptextDB::createIdentityKey(database db, int accountId, string recipientId, int deviceId, char *identityKey) {
   try {
     bool hasRow = false;
     db << "begin;";
-    db << "Select * from identitykeyrecord where recipientId == ? and deviceId == ?;"
+    db << "Select * from identitykeyrecord where recipientId == ? and deviceId == ? and accountId == ?;"
      << recipientId
      << deviceId
+     << accountId
      >> [&] (string recipientId, int deviceId, string identity) {
         hasRow = true;
     };
     if (hasRow) {
-      db << "update identitykeyrecord set identityKey = ? where recipientId == ? and deviceId == ?;"
+      db << "update identitykeyrecord set identityKey = ? where recipientId == ? and deviceId == ? and accountId == ?;"
         << identityKey
         << recipientId
-        << deviceId;
+        << deviceId
+        << accountId;
     } else {
-      db << "insert into identitykeyrecord (recipientId, deviceId, identityKey) values (?,?,?);"
+      db << "insert into identitykeyrecord (recipientId, deviceId, identityKey, accountId) values (?,?,?,?);"
         << recipientId
         << deviceId
-        << identityKey;
+        << identityKey
+        << accountId;
     }
     db << "commit;";
   } catch (exception& e) {

db_interface/src/axolotl/IdentityKey.h

@@ -16,8 +16,8 @@ namespace CriptextDB {
     string identityKey;
   };
 
-  IdentityKey getIdentityKey(database db, string recipientId, long int deviceId);
-  bool createIdentityKey(database db, string recipientId, int deviceId, char *identityKey);
+  IdentityKey getIdentityKey(database db, int accountId, string recipientId, long int deviceId);
+  bool createIdentityKey(database db, int accountId, string recipientId, int deviceId, char *identityKey);
 } 
 
 #endif

db_interface/src/axolotl/PreKey.cpp

@@ -3,12 +3,13 @@
 using namespace std;
 using namespace sqlite;
 
-CriptextDB::PreKey CriptextDB::getPreKey(database db, short int id) {
+CriptextDB::PreKey CriptextDB::getPreKey(database db, int accountId, short int id) {
   string myPreKey;
   size_t myLen = 0;
-  db << "Select * from prekeyrecord where preKeyId == ?;"
+  db << "Select * from prekeyrecord where preKeyId == ? and accountId == ?;"
      << id
-     >> [&] (int preKeyId, string record, int recordLength) {
+     << accountId
+     >> [&] (int id, int preKeyId, string record, int recordLength) {
         myPreKey = record;
         myLen = (size_t)recordLength;
     };
@@ -24,23 +25,42 @@ CriptextDB::PreKey CriptextDB::getPreKey(database db, short int id) {
   return preKey;
 }
 
-bool CriptextDB::createPreKey(database db, short int id, char *keyRecord, size_t len) {
+bool CriptextDB::createPreKey(database db, int accountId, short int id, char *keyRecord, size_t len) {
   try {
-    db << "insert into prekeyrecord (preKeyId, record, recordLength) values (?,?,?);"
+    bool hasRow = false;
+    db << "begin;";
+    db << "Select preKeyId from prekeyrecord where preKeyId == ? and accountId == ?;"
      << id
-     << keyRecord
-     << static_cast<int>(len);
+     << accountId
+     >> [&] (string preKeyId) {
+        hasRow = true;
+    };
+    if (hasRow) {
+      db << "update prekeyrecord set record = ?, recordLength = ? where preKeyId == ? and accountId == ?;"
+        << keyRecord
+        << static_cast<int>(len)
+        << id
+        << accountId;
+    } else {
+      db << "insert into prekeyrecord (preKeyId, record, recordLength, accountId) values (?,?,?,?);"
+        << id
+        << keyRecord
+        << static_cast<int>(len)
+        << accountId;
+    }
+    db << "commit;";
     return true;
   } catch (exception& e) {
     std::cout << e.what() << std::endl;
     return false;
   }
 }
 
-bool CriptextDB::deletePreKey(database db, short int id) {
+bool CriptextDB::deletePreKey(database db, int accountId, short int id) {
   try {
-    db << "delete from prekeyrecord where preKeyId == ?;"
-     << id;
+    db << "delete from prekeyrecord where preKeyId == ? and accountId == ?;"
+     << id
+     << accountId;
     return true;
   } catch (exception& e) {
     std::cout << e.what() << std::endl;

db_interface/src/axolotl/PreKey.h

@@ -17,9 +17,9 @@ namespace CriptextDB {
     size_t len;
   };
 
-  PreKey getPreKey(database db, short int id);
-  bool createPreKey(database db, short int id, char *keyRecord, size_t len);
-  bool deletePreKey(database db, short int id);
+  PreKey getPreKey(database db, int accountId, short int id);
+  bool createPreKey(database db, int accountId, short int id, char *keyRecord, size_t len);
+  bool deletePreKey(database db, int accountId, short int id);
 
 } 
 

db_interface/src/axolotl/SessionRecord.cpp

@@ -3,13 +3,14 @@
 using namespace sqlite;
 using namespace std;
 
-CriptextDB::SessionRecord CriptextDB::getSessionRecord(database db, string recipientId, long int deviceId) {
+CriptextDB::SessionRecord CriptextDB::getSessionRecord(database db, int accountId, string recipientId, long int deviceId) {
   string myRecord;
   int myLen = 0;
-  db << "Select * from sessionrecord where recipientId == ? and deviceId == ?;"
+  db << "Select * from sessionrecord where recipientId == ? and deviceId == ? and accountId == ?;"
      << recipientId
      << deviceId
-     >> [&] (string recipientId, int deviceId, string record, int recordLength) {
+     << accountId
+     >> [&] (int id, string recipientId, int deviceId, string record, int recordLength) {
         myLen = recordLength;
         myRecord = record;
     };
@@ -26,13 +27,14 @@ CriptextDB::SessionRecord CriptextDB::getSessionRecord(database db, string recip
   return sessionRecord;
 }
 
-vector<CriptextDB::SessionRecord> CriptextDB::getSessionRecords(database db, string recipientId) {
+vector<CriptextDB::SessionRecord> CriptextDB::getSessionRecords(database db, int accountId, string recipientId) {
   vector<CriptextDB::SessionRecord> sessionRecords;
 
   try {
-    db << "Select * from sessionrecord where recipientId == ?;"
+    db << "Select * from sessionrecord where recipientId == ? and accountId == ?;"
      << recipientId
-     >> [&] (string recipientId, int deviceId, string record, int recordLength) {
+     << accountId
+     >> [&] (int id, string recipientId, int deviceId, string record, int recordLength) {
         SessionRecord mySessionRecord = { 
           .recipientId = recipientId, 
           .deviceId = deviceId, 
@@ -49,28 +51,31 @@ vector<CriptextDB::SessionRecord> CriptextDB::getSessionRecords(database db, str
   return sessionRecords;
 }
 
-bool CriptextDB::createSessionRecord(database db, string recipientId, long int deviceId, char* record, size_t len) {
+bool CriptextDB::createSessionRecord(database db, int accountId, string recipientId, long int deviceId, char* record, size_t len) {
   try {
     bool hasRow = false;
     db << "begin;";
-    db << "Select * from sessionrecord where recipientId == ? and deviceId == ?;"
+    db << "Select * from sessionrecord where recipientId == ? and deviceId == ? and accountId == ?;"
      << recipientId
      << deviceId
+     << accountId
      >> [&] (string recipientId, int deviceId, string record, int recordLength) {
         hasRow = true;
     };
     if (hasRow) {
-      db << "update sessionrecord set record = ?, recordLength = ? where recipientId == ? and deviceId == ?;"
+      db << "update sessionrecord set record = ?, recordLength = ? where recipientId == ? and deviceId == ? and accountId == ?;"
         << record
         << static_cast<int>(len)
         << recipientId
-        << deviceId;
+        << deviceId
+        << accountId;
     } else {
-      db << "insert into sessionrecord (recipientId, deviceId, record, recordLength) values (?,?,?,?);"
+      db << "insert into sessionrecord (recipientId, deviceId, record, recordLength, accountId) values (?,?,?,?,?);"
         << recipientId
         << deviceId
         << record
-        << static_cast<int>(len);
+        << static_cast<int>(len)
+        << accountId;
     }
     db << "commit;";
   } catch (exception& e) {
@@ -80,22 +85,24 @@ bool CriptextDB::createSessionRecord(database db, string recipientId, long int d
   return true;
 }
 
-bool CriptextDB::deleteSessionRecord(database db, string recipientId, long int deviceId) {
+bool CriptextDB::deleteSessionRecord(database db, int accountId, string recipientId, long int deviceId) {
   try {
-    db << "delete from sessionrecord where recipientId == ? and deviceId == ?;"
+    db << "delete from sessionrecord where recipientId == ? and deviceId == ? and accountId;"
      << recipientId
-     << deviceId;
+     << deviceId
+     << accountId;
   } catch (exception& e) {
     std::cout << "Error deleting session : " << e.what() << std::endl;
     return false;
   }
   return true;
 }
 
-bool CriptextDB::deleteSessionRecords(database db, string recipientId) {
+bool CriptextDB::deleteSessionRecords(database db, int accountId, string recipientId) {
   try {
-    db << "delete from sessionrecord where recipientId == ?;"
-     << recipientId;
+    db << "delete from sessionrecord where recipientId == ? and accountId == ?;"
+     << recipientId
+     << accountId;
   } catch (exception& e) {
     std::cout << "Error deleting sessions : " << e.what() << std::endl;
     return false;

db_interface/src/axolotl/SessionRecord.h

@@ -20,11 +20,11 @@ namespace CriptextDB {
     size_t len;
   };
 
-  SessionRecord getSessionRecord(database db, string recipientId, long int deviceId);
-  vector<SessionRecord> getSessionRecords(database db, string recipientId);
-  bool createSessionRecord(database db, string recipientId, long int deviceId, char* record, size_t len);
-  bool deleteSessionRecord(database db, string recipientId, long int deviceId);
-  bool deleteSessionRecords(database db, string recipientId);
+  SessionRecord getSessionRecord(database db, int accountId, string recipientId, long int deviceId);
+  vector<SessionRecord> getSessionRecords(database db, int accountId, string recipientId);
+  bool createSessionRecord(database db, int accountId, string recipientId, long int deviceId, char* record, size_t len);
+  bool deleteSessionRecord(database db, int accountId, string recipientId, long int deviceId);
+  bool deleteSessionRecords(database db, int accountId, string recipientId);
 } 
 
 #endif