Add function to add new local user, to local users repository

Signed-off-by: Kate E. Reinecke <50168367+kreinecke@users.noreply.github.com>
cloudfoundry · richard-cox · Jul 16, 2019 · May 27, 2019 · May 27, 2019 · May 31, 2019
commit a70924c42cbf13bb44ec9c243fb062d6c80d6c67
diff --git a/src/jetstream/datastore/20190522121200_LocalUsers.go b/src/jetstream/datastore/20190522121200_LocalUsers.go
@@ -19,7 +19,7 @@ func init() {
 		createLocalUsers += "password_hash " + binaryDataType + "       NOT NULL, "
 		createLocalUsers += "user_name     VARCHAR(36)  NOT NULL, "
 		createLocalUsers += "user_email    VARCHAR(36), "
-		createLocalUsers += "last_login  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP), "
+		createLocalUsers += "last_login  TIMESTAMP DEFAULT CURRENT_TIMESTAMP), "
 		createLocalUsers += "last_updated  TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP)"
 
 		if strings.Contains(conf.Driver.Name, "postgres") {

diff --git a/src/jetstream/repository/local_users/local_users.go b/src/jetstream/repository/local_users/local_users.go
@@ -2,25 +2,14 @@ package local_users
 
 import "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 
-//TODO: Can we use the existing ConnectedUser struct here?
-// Token -
-type Token struct {
-	UserGUID  string
-	TokenType string
-	Record    interfaces.TokenRecord
-}
-
-//TODO: this is currently defined in tokens - do we want to pull this up a level now so it can be referenced for local users as well as token endpoints?
-const SystemSharedUserGuid = "00000000-1111-2222-3333-444444444444" // User ID for the system shared user for endpoints
-
 // Repository is an application of the repository pattern for storing tokens
 type Repository interface {
 
-	SaveUser(userGUID string, username string, email string, role string, passwordHash byte[]) error
+	AddUser(userGUID string, username string, email string, role string, passwordHash byte[]) error
 	FindPasswordHash(userGUID string) (hash []byte, error)
 
 	//TODO what is best pattern here - varargs e.g. just UpdateUser? or function for each update?
-	UpdatePasswordHash(userGUID string, passwordHash byte[]) error
-	UpdateLastLogin(userGUID string, /*TODO: datetime here*/ ) error
+	//UpdatePasswordHash(userGUID string, passwordHash byte[]) error
+	//UpdateLastLogin(userGUID string, /*TODO: datetime here*/ ) error
 
 }
diff --git a/src/jetstream/repository/local_users/psql_local_users.go b/src/jetstream/repository/local_users/psql_local_users.go
@@ -15,8 +15,7 @@ import (
 var findPasswordHash = `SELECT password_hash
 									FROM local_users
 									WHERE user_guid = $1`
-var insertLocalUser = `INSERT INTO local_users (user_guid, user_guid, token_type, auth_token, refresh_token, token_expiry)
-VALUES ($1, $2, $3, $4, $5, $6)`
+var insertLocalUser = `INSERT INTO local_users (user_guid, password_hash, user_name, user_email, last_login, last_updated) VALUES ($1, $2, $3, $4, $5, $6)`
 
 // PgsqlTokenRepository is a PostgreSQL-backed token repository
 type PgsqlLocalUsersRepository struct {
@@ -59,3 +58,53 @@ func (p *PgsqlTokenRepository) FindPasswordHash(userGUID string) (hash []byte, e
 
 	return passwordHash, nil
 }
+
+// AddLocalUser - Add a new local user to the datastore
+func (p *PgsqlTokenRepository) AddLocalUser(userGUID string, passwordHash []byte, string, name string, email string) error {
+
+	log.Debug("AddLocalUser")
+
+	if userGUID == "" {
+		msg := "Unable to add new local user without a valid User GUID."
+		log.Debug(msg)
+		return errors.New(msg)
+	}
+
+	if len(passwordHash) == 0 {
+		msg := "Unable to add new local user without a valid password hash."
+		log.Debug(msg)
+		return errors.New(msg)
+	}
+
+	if name == "" {
+		msg := "Unable to add new local user without a valid User name."
+		log.Debug(msg)
+		return errors.New(msg)
+	}
+
+	// Add the new local user to the DB
+	var lastLogin, lastUpdated = nil
+	result, err := p.db.Exec(insertLocalUser, userGUID, passwordHash, name, email, lastLogin, lastUpdated)
+	if err != nil {
+		msg := "Unable to INSERT local user: %v"
+		log.Debugf(msg, err)
+		return fmt.Errorf(msg, err)
+	}
+
+	rowsUpdates, err := result.RowsAffected()
+	if err != nil {
+		return errors.New("Unable to INSERT local user: could not determine number of rows that were updated")
+	}
+
+	if rowsUpdates < 1 {
+		return errors.New("Unable to INSERT local user: no rows were updated")
+	}
+
+	if rowsUpdates > 1 {
+		log.Warn("INSERT local user: More than 1 row was updated (expected only 1)")
+	}
+
+	log.Debug("Local user INSERT complete")
+
+	return nil
+}