From 10f124a008287b952934f1d5926953b24ee4f82a Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@kendu.si>
Date: Wed, 19 Jun 2019 19:20:03 +0200
Subject: [PATCH] Fix auto-promotion of the first user

---
 system/internal/repository/user.go |  2 +-
 system/internal/service/auth.go    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/system/internal/repository/user.go b/system/internal/repository/user.go
index 35fb0c9df..cd8ba688b 100644
--- a/system/internal/repository/user.go
+++ b/system/internal/repository/user.go
@@ -145,7 +145,7 @@ func (r *user) Find(filter *types.UserFilter) ([]*types.User, error) {
 
 func (r user) Total() (count uint) {
 	query := fmt.Sprintf("SELECT COUNT(*) FROM %s WHERE %s", r.users, sqlUserScope)
-	_ = r.db().Select(&count, query)
+	_ = r.db().Get(&count, query)
 	return
 }
 
diff --git a/system/internal/service/auth.go b/system/internal/service/auth.go
index 0c85d52f7..31eb35e1c 100644
--- a/system/internal/service/auth.go
+++ b/system/internal/service/auth.go
@@ -816,13 +816,13 @@ func (svc auth) createUserToken(user *types.User, kind string) (token string, er
 func (svc auth) autoPromote(u *types.User) (err error) {
 	if svc.users.Total() == 0 && u.ID > 0 {
 		err = svc.roles.MemberAddByID(permissions.AdminRoleID, u.ID)
-	}
 
-	svc.log(
-		zap.String("email", u.Email),
-		zap.Uint64("userID", u.ID),
-		zap.Error(err),
-	).Info("auto-promoted user to administrator role")
+		svc.log(
+			zap.String("email", u.Email),
+			zap.Uint64("userID", u.ID),
+			zap.Error(err),
+		).Info("auto-promoted user to administrator role")
+	}
 
 	return
 }