From caa8f84b79e3fcfb57e61e511a61b235b8b03b02 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Fri, 1 Jul 2022 14:46:26 -0500
Subject: [PATCH] load/init ee2e for login

---
 xxdk/e2e.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/xxdk/e2e.go b/xxdk/e2e.go
index baf119e25..706e05cdf 100644
--- a/xxdk/e2e.go
+++ b/xxdk/e2e.go
@@ -208,18 +208,11 @@ func login(client *Cmix, callbacks AuthCallbacks,
 		e2eIdentity: identity,
 	}
 
-	client.network.AddIdentity(identity.ID, time.Time{}, true)
-
 	//initialize the e2e storage
 	dhPrivKey, err := identity.GetDHKeyPrivate()
 	if err != nil {
 		return nil, err
 	}
-	err = e2e.Init(kv, identity.ID, dhPrivKey, e2eGrp,
-		rekey.GetDefaultEphemeralParams())
-	if err != nil {
-		return nil, err
-	}
 
 	// load or init the new e2e storage
 	m.e2e, err = e2e.Load(kv,
@@ -227,6 +220,7 @@ func login(client *Cmix, callbacks AuthCallbacks,
 		client.GetEventReporter())
 	if err != nil {
 		//initialize the e2e storage
+		jww.INFO.Printf("Initializing new e2e.Handler...")
 		err = e2e.Init(kv, identity.ID, dhPrivKey, e2eGrp,
 			rekey.GetDefaultParams())
 		if err != nil {
@@ -256,6 +250,7 @@ func login(client *Cmix, callbacks AuthCallbacks,
 		return nil, err
 	}
 
+	client.network.AddIdentity(identity.ID, time.Time{}, true)
 	return m, err
 }
 
-- 
GitLab