From 337361e1c6387479cc30807880bef975a09d788b Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Wed, 8 Apr 2020 17:02:28 +0200
Subject: [PATCH] When creating user (not signup) autoconfirm email

---
 system/rest/user.go       | 4 +++-
 system/service/auth.go    | 2 +-
 tests/system/user_test.go | 8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/system/rest/user.go b/system/rest/user.go
index db79ccae9..ba2ba30c0 100644
--- a/system/rest/user.go
+++ b/system/rest/user.go
@@ -74,7 +74,9 @@ func (ctrl User) Create(ctx context.Context, r *request.UserCreate) (interface{}
 		Handle: r.Handle,
 		Kind:   r.Kind,
 
-		EmailConfirmed: r.HasEmailConfirmed() && r.EmailConfirmed,
+		// consider email confirmed
+		// when creating user like this
+		EmailConfirmed: true,
 	}
 
 	return ctrl.user.With(ctx).Create(user)
diff --git a/system/service/auth.go b/system/service/auth.go
index e0842cafd..c41000405 100644
--- a/system/service/auth.go
+++ b/system/service/auth.go
@@ -709,7 +709,7 @@ func (svc auth) ValidatePasswordResetToken(token string) (user *types.User, err
 	}
 
 	if !user.EmailConfirmed {
-		// Confirm email while reseting password...
+		// Confirm email while resetting password...
 		user.EmailConfirmed = true
 		svc.users.Update(user)
 	}
diff --git a/tests/system/user_test.go b/tests/system/user_test.go
index 4dc499605..155ae0698 100644
--- a/tests/system/user_test.go
+++ b/tests/system/user_test.go
@@ -253,14 +253,20 @@ func TestUserCreate(t *testing.T) {
 	h := newHelper(t)
 	h.allow(types.SystemPermissionResource, "user.create")
 
+	email := h.randEmail()
+
 	h.apiInit().
 		Post("/users/").
-		FormData("email", h.randEmail()).
+		FormData("email", email).
 		Expect(t).
 		Status(http.StatusOK).
 		Assert(helpers.AssertNoErrors).
 		End()
 
+	u, err := h.repoUser().FindByEmail(email)
+	h.a.NoError(err)
+	h.a.NotNil(u)
+	h.a.True(u.EmailConfirmed)
 }
 
 func TestUserUpdateForbidden(t *testing.T) {