From 5c7f9d55d86869f470c7806f63c4a3f01fb574bb Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Mon, 29 Jul 2019 23:56:05 +0000
Subject: [PATCH] Set the user e-mail appropriately
---
api/client.go | 6 ++----
cmd/root.go | 2 +-
user/session.go | 5 +++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/api/client.go b/api/client.go
index 307f6e598..a132470c3 100644
--- a/api/client.go
+++ b/api/client.go
@@ -237,10 +237,6 @@ func (cl *Client) Register(preCan bool, registrationCode, nick, email string) (*
u.Nick = nick
}
- if email != "" {
- u.Email = email
- }
-
nodekeys, successKeys := user.Users.LookupKeys(u.User)
if !successKeys {
@@ -403,6 +399,8 @@ func (cl *Client) Register(preCan bool, registrationCode, nick, email string) (*
user.Users.UpsertUser(u)
}
+ u.Email = email
+
// Create the user session
nus := user.NewSession(cl.storage, u, nk, publicKey, privateKey, cmixGrp, e2eGrp)
diff --git a/cmd/root.go b/cmd/root.go
index 4ef53cb48..001bf648c 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -186,7 +186,7 @@ func sessionInitialization() (*id.User, *api.Client) {
// doesn't support non pre canned users
uid = id.NewUserFromUints(&[4]uint64{0, 0, 0, userId})
// clear userEmail if it was defined, since login was previously done
- userEmail = ""
+ //userEmail = ""
globals.Log.INFO.Printf("Skipped Registration, user: %v", uid)
}
diff --git a/user/session.go b/user/session.go
index 33affb152..43c8144e1 100644
--- a/user/session.go
+++ b/user/session.go
@@ -235,8 +235,9 @@ func (s *SessionObj) GetCurrentUser() (currentUser *User) {
if s.CurrentUser != nil {
// Explicit deep copy
currentUser = &User{
- User: s.CurrentUser.User,
- Nick: s.CurrentUser.Nick,
+ User: s.CurrentUser.User,
+ Nick: s.CurrentUser.Nick,
+ Email: s.CurrentUser.Email,
}
}
return currentUser
--
GitLab