From d5614b905be6d76803330c182930fc6f0f12a7c2 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Fri, 9 Nov 2018 09:44:08 +0100
Subject: Append user to group if user already exists instead of throwing

---
 src/DataView.cpp        | 8 +++++++-
 src/DatabaseStorage.cpp | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/DataView.cpp b/src/DataView.cpp
index a5232f3..f94b2d8 100644
--- a/src/DataView.cpp
+++ b/src/DataView.cpp
@@ -1,5 +1,6 @@
 #include "../include/odhtdb/DataView.hpp"
-#include <cstring>
+#include "../include/odhtdb/bin2hex.hpp"
+#include <string.h>
 
 namespace odhtdb
 {
@@ -12,4 +13,9 @@ namespace odhtdb
     {
         return !operator==(other);
     }
+
+    std::string DataView::toString() const
+    {
+        return bin2hex((const char*)data, size);
+    }
 }
diff --git a/src/DatabaseStorage.cpp b/src/DatabaseStorage.cpp
index 9611993..1d6f201 100644
--- a/src/DatabaseStorage.cpp
+++ b/src/DatabaseStorage.cpp
@@ -704,7 +704,14 @@ namespace odhtdb
         rc = sqlite3_bind_blob(insertUserStmt, 2, userPublicKey.getData(), userPublicKey.getSize(), SQLITE_STATIC);
         bindCheckError(rc);
         
-        sqlite_step_throw_on_failure(sqliteDb, insertUserStmt, "insert data into NodeUser");
+        try
+        {
+            sqlite_step_throw_on_failure(sqliteDb, insertUserStmt, "insert data into NodeUser");
+        }
+        catch(DatabaseStorageAlreadyExists &e)
+        {
+            // User already exists in node, error can be ignored and instead we can continue to add user to group
+        }
         
         addUserToGroup(nodeHash, userPublicKey, groupId);
         
-- 
cgit v1.2.3