Fix incorrect field ordering on new user insert

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 8596a528c8425b57e2d7780877381082c25ddf9a
diff --git a/src/jetstream/auth_test.go b/src/jetstream/auth_test.go
@@ -64,6 +64,48 @@ func TestLoginToUAA(t *testing.T) {
 	})
 }
 
+func TestLocalLogin(t *testing.T) {
+	t.Parallel()
+
+	Convey("UAA tests", t, func() {
+		req := setupMockReq("POST", "", map[string]string{
+			"username": "localuser",
+			"password": "localuserpass",
+		})
+
+		_, _, ctx, pp, db, mock := setupHTTPTest(req)
+		defer db.Close()
+
+		mockUAA := setupMockServer(t,
+			msRoute("/oauth/token"),
+			msMethod("POST"),
+			msStatus(http.StatusOK),
+			msBody(jsonMust(mockUAAResponse)))
+
+		defer mockUAA.Close()
+		pp.Config.ConsoleConfig = new(interfaces.ConsoleConfig)
+		uaaUrl, _ := url.Parse(mockUAA.URL)
+		pp.Config.ConsoleConfig.UAAEndpoint = uaaUrl
+		pp.Config.ConsoleConfig.SkipSSLValidation = true
+
+		mock.ExpectQuery(selectAnyFromTokens).
+			WillReturnRows(expectNoRows())
+
+		mock.ExpectExec(insertIntoTokens).
+			// WithArgs(mockUserGUID, "uaa", mockTokenRecord.AuthToken, mockTokenRecord.RefreshToken, newExpiry).
+			WillReturnResult(sqlmock.NewResult(1, 1))
+
+		Convey("Should not fail to login", func() {
+			So(pp.loginToUAA(ctx), ShouldBeNil)
+		})
+		//
+		//Convey("Expectations should be met", func() {
+		//	So(mock.ExpectationsWereMet(), ShouldBeNil)
+		//})
+
+	})
+}
+
 func TestLoginToUAAWithBadCreds(t *testing.T) {
 	t.Parallel()
 

diff --git a/src/jetstream/repository/local_users/local_users.go b/src/jetstream/repository/local_users/local_users.go
@@ -1,6 +1,6 @@
 package local_users
 
-// Repository is an application of the repository pattern for storing tokens
+// Repository is an application of the repository pattern for storing local users
 type Repository interface {
 	AddLocalUser(userGUID string, passwordHash []byte, username string, email string, role string) error
 	FindPasswordHash(userGUID string) ([]byte, error)

diff --git a/src/jetstream/repository/local_users/psql_local_users.go b/src/jetstream/repository/local_users/psql_local_users.go
@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/datastore"
 	log "github.com/sirupsen/logrus"
@@ -14,7 +15,7 @@ var findPasswordHash = `SELECT password_hash
 									WHERE user_guid = $1`
 var findUserGUID = `SELECT user_guid FROM local_users WHERE user_name = $1`
 var findUserScope = `SELECT user_scope FROM local_users WHERE user_guid = $1`
-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)`
+var insertLocalUser = `INSERT INTO local_users (user_guid, password_hash, user_name, user_email, user_scope, last_login, last_updated) VALUES ($1, $2, $3, $4, $5, $6)`
 
 var getTableCount = `SELECT count(user_guid) FROM local_users`
 
@@ -133,7 +134,8 @@ func (p *PgsqlLocalUsersRepository) AddLocalUser(userGUID string, passwordHash [
 	}
 
 	// Add the new local user to the DB
-	var lastLogin, lastUpdated string = "", ""
+	var lastLogin, lastUpdated int64 = 0, time.Now().Unix()
+
 	result, err := p.db.Exec(insertLocalUser, userGUID, passwordHash, username, email, scope, lastLogin, lastUpdated)
 	if err != nil {
 		msg := "Unable to INSERT local user: %v"