diff --git a/migrations/app/schema/20230807185455_alter_users_table.up.sql b/migrations/app/schema/20230807185455_alter_users_table.up.sql index 850abafc18c..9ee81cc34fc 100644 --- a/migrations/app/schema/20230807185455_alter_users_table.up.sql +++ b/migrations/app/schema/20230807185455_alter_users_table.up.sql @@ -1,3 +1,3 @@ alter table users add column okta_email text, -add column okta_uuid UUID; \ No newline at end of file +add column okta_id varchar; \ No newline at end of file diff --git a/pkg/factory/shared_test.go b/pkg/factory/shared_test.go index 873cf7fdf8f..0609e5e4974 100644 --- a/pkg/factory/shared_test.go +++ b/pkg/factory/shared_test.go @@ -94,13 +94,13 @@ func (suite *FactorySuite) TestMergeCustomization() { // Under test: mergeCustomization, which merges traits and customizations // Set up: Create a customization with a user email and a trait with a user email // Expected outcome: Customization should override the trait email - uuidval := uuid.Must(uuid.NewV4()) + uuidvalString := uuid.Must(uuid.NewV4()).String() // RUN FUNCTION UNDER TEST result := mergeCustomization( []Customization{ { Model: models.User{ - OktaUUID: &uuidval, + OktaID: uuidvalString, OktaEmail: "custom@army.mil", }, Type: &User, // ← User customization @@ -187,10 +187,10 @@ func (suite *FactorySuite) TestMergeInterfaces() { OktaEmail: "user1@example.com", Active: true, } - uuidNew := uuid.Must(uuid.NewV4()) + uuidNew := uuid.Must(uuid.NewV4()).String() user2 := models.User{ OktaEmail: "user2@example.com", - OktaUUID: &uuidNew, + OktaID: uuidNew, } result := mergeInterfaces(user2, user1) @@ -199,7 +199,7 @@ func (suite *FactorySuite) TestMergeInterfaces() { suite.Equal(user1.OktaEmail, user.OktaEmail) // All other fields set in interfaces should persist suite.Equal(user1.Active, user.Active) - suite.Equal(user2.OktaUUID, user.OktaUUID) + suite.Equal(user2.OktaID, user.OktaID) }) suite.Run("Check that mergeInterfaces doesn't change input models", func() { @@ -208,7 +208,7 @@ func (suite *FactorySuite) TestMergeInterfaces() { // Expected outcome: Caller models should not be affected user1email := "user1@example.com" user2email := "user2@example.com" - uuidNew := uuid.Must(uuid.NewV4()) + uuidNew := uuid.Must(uuid.NewV4()).String() user1 := models.User{ OktaEmail: user1email, @@ -216,7 +216,7 @@ func (suite *FactorySuite) TestMergeInterfaces() { } user2 := models.User{ OktaEmail: user2email, - OktaUUID: &uuidNew, + OktaID: uuidNew, } mergeInterfaces(user2, user1) @@ -228,7 +228,7 @@ func (suite *FactorySuite) TestMergeInterfaces() { // user2 should be untouched suite.Equal(user2email, user2.OktaEmail) suite.False(user2.Active) - suite.Equal(uuidNew, *user2.OktaUUID) + suite.Equal(uuidNew, user2.OktaID) }) } @@ -455,12 +455,12 @@ func (suite *FactorySuite) TestSetupCustomizations() { // Set up: Create a customization with a user email and a trait with a user email // Expected outcome: Customization should override the trait email // If an object exists and no customization, it should become a customization - uuidval := uuid.Must(uuid.NewV4()) + uuidval := uuid.Must(uuid.NewV4()).String() result := setupCustomizations( []Customization{ { Model: models.User{ - OktaUUID: &uuidval, + OktaID: uuidval, OktaEmail: "custom@army.mil", }, }, diff --git a/pkg/factory/user_factory.go b/pkg/factory/user_factory.go index 0d8c6e7651d..5d703f4c538 100644 --- a/pkg/factory/user_factory.go +++ b/pkg/factory/user_factory.go @@ -30,9 +30,9 @@ func BuildUser(db *pop.Connection, customs []Customization, traits []Trait) mode } // create user - oktaUUID := uuid.Must(uuid.NewV4()) + OktaID := uuid.Must(uuid.NewV4()).String() user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "first.last@login.gov.test", Active: false, } diff --git a/pkg/handlers/authentication/auth.go b/pkg/handlers/authentication/auth.go index eb6cb590cd1..2ffeeee8aff 100644 --- a/pkg/handlers/authentication/auth.go +++ b/pkg/handlers/authentication/auth.go @@ -811,7 +811,7 @@ func authorizeUser(ctx context.Context, appCtx appcontext.AppContext, openIDUser if err == nil { // In this case, we found an existing user associated with the // unique login.gov UUID (aka OID_User, aka openIDUser.UserID, - // aka models.User.okta_uuid) + // aka models.User.okta_id) appCtx.Logger().Info("Known user: found by login.gov OID_User, checking authorization", zap.String("OID_User", openIDUser.UserID), zap.String("OID_Email", openIDUser.Email), zap.String("user.id", userIdentity.ID.String()), zap.String("user.okta_email", userIdentity.Email)) result := AuthorizeKnownUser(ctx, appCtx, userIdentity, sessionManager) appCtx.Logger().Info("Known user authorization", @@ -822,7 +822,7 @@ func authorizeUser(ctx context.Context, appCtx appcontext.AppContext, openIDUser } else if err == models.ErrFetchNotFound { // Never heard of them // so far In this case, we can't find an existing user // associated with the unique login.gov UUID (aka OID_User, - // aka openIDUser.UserID, aka models.User.okta_uuid). + // aka openIDUser.UserID, aka models.User.okta_id). // The authorizeUnknownUser method tries to find a user record // with a matching email address appCtx.Logger().Info("Unknown user: not found by login.gov OID_User, associating email and checking authorization", zap.String("OID_User", openIDUser.UserID), zap.String("OID_Email", openIDUser.Email)) @@ -1054,13 +1054,13 @@ func authorizeUnknownUser(ctx context.Context, appCtx appcontext.AppContext, ope } appCtx.Session().ServiceMemberID = newServiceMember.ID } else { - // If in Office App or Admin App with valid user - update user's OktaUUID + // If in Office App or Admin App with valid user - update user's OktaID appCtx.Logger().Error("Authorization associating login.gov UUID with user", zap.String("OID_User", openIDUser.UserID), zap.String("OID_Email", openIDUser.Email), zap.String("user.id", user.ID.String()), ) - err = models.UpdateUserOktaUUID(appCtx.DB(), user, openIDUser.UserID) + err = models.UpdateUserOktaID(appCtx.DB(), user, openIDUser.UserID) } if err != nil { diff --git a/pkg/handlers/authentication/auth_test.go b/pkg/handlers/authentication/auth_test.go index 8876f3c2026..0c6f7e16035 100644 --- a/pkg/handlers/authentication/auth_test.go +++ b/pkg/handlers/authentication/auth_test.go @@ -114,10 +114,10 @@ func (suite *AuthSuite) TestGenerateNonce() { } func (suite *AuthSuite) TestAuthorizationLogoutHandler() { - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := "2400c3c5-019d-4031-9c27-8a553e022297" user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -183,9 +183,9 @@ func (suite *AuthSuite) TestAuthorizationLogoutHandler() { func (suite *AuthSuite) TestRequireAuthMiddleware() { // Given: a logged in user - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := ("2400c3c5-019d-4031-9c27-8a553e022297") user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -341,7 +341,7 @@ func (suite *AuthSuite) TestRequirePermissionsMiddlewareAuthorized() { // TOO users have the proper permissions for our test - update.shipment tooOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO}) - identity, err := models.FetchUserIdentity(suite.DB(), tooOfficeUser.User.OktaUUID.String()) + identity, err := models.FetchUserIdentity(suite.DB(), tooOfficeUser.User.OktaID) suite.NoError(err) @@ -383,7 +383,7 @@ func (suite *AuthSuite) TestRequirePermissionsMiddlewareUnauthorized() { // QAECSR users will be denied access as they lack the proper permissions for our test - update.shipment qaeCsrOfficeUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeQaeCsr}) - identity, err := models.FetchUserIdentity(suite.DB(), qaeCsrOfficeUser.User.OktaUUID.String()) + identity, err := models.FetchUserIdentity(suite.DB(), qaeCsrOfficeUser.User.OktaID) suite.NoError(err) @@ -437,9 +437,9 @@ func (suite *AuthSuite) TestIsLoggedInWhenNoUserLoggedIn() { } func (suite *AuthSuite) TestIsLoggedInWhenUserLoggedIn() { - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := "2400c3c5-019d-4031-9c27-8a553e022297" user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -487,9 +487,9 @@ func (suite *AuthSuite) TestRequireAuthMiddlewareUnauthorized() { func (suite *AuthSuite) TestRequireAdminAuthMiddleware() { // Given: a logged in user - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := "2400c3c5-019d-4031-9c27-8a553e022297" user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -563,7 +563,7 @@ func (suite *AuthSuite) TestAuthKnownSingleRoleOffice() { officeUser := factory.BuildOfficeUserWithRoles(suite.DB(), factory.GetTraitActiveOfficeUser(), []roles.RoleType{roles.RoleTypeTIO}) - userIdentity, err := models.FetchUserIdentity(suite.DB(), officeUser.User.OktaUUID.String()) + userIdentity, err := models.FetchUserIdentity(suite.DB(), officeUser.User.OktaID) suite.Assert().NoError(err) handlerConfig := suite.HandlerConfig() @@ -623,10 +623,10 @@ func (suite *AuthSuite) TestAuthorizeDeactivateOfficeUser() { func (suite *AuthSuite) TestRedirectoktaErrorMsg() { officeUserID := uuid.Must(uuid.NewV4()) - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := ("2400c3c5-019d-4031-9c27-8a553e022297") user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -786,7 +786,7 @@ func (suite *AuthSuite) TestRedirectFromoktaForValidUser() { StubName: officeProviderName, StubToken: "stubToken", StubUser: goth.User{ - UserID: tioOfficeUser.User.OktaUUID.String(), + UserID: tioOfficeUser.User.OktaID, Email: tioOfficeUser.Email, }, } @@ -846,7 +846,7 @@ func (suite *AuthSuite) TestRedirectFromLoginGovForInvalidUser() { StubName: officeProviderName, StubToken: "stubToken", StubUser: goth.User{ - UserID: tioOfficeUser.User.OktaUUID.String(), + UserID: tioOfficeUser.User.OktaID, Email: tioOfficeUser.Email, }, } @@ -872,10 +872,10 @@ func (suite *AuthSuite) TestAuthKnownSingleRoleAdmin() { adminUserID := uuid.Must(uuid.NewV4()) officeUserID := uuid.Must(uuid.NewV4()) var adminUserRole models.AdminRole = "SYSTEM_ADMIN" - oktaUUID, _ := uuid.FromString("2400c3c5-019d-4031-9c27-8a553e022297") + OktaID := ("2400c3c5-019d-4031-9c27-8a553e022297") user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, } @@ -1017,9 +1017,9 @@ func (suite *AuthSuite) TestAuthUnknownServiceMember() { // Verify session contains UserID that points to the newly-created user suite.Equal(foundUser.ID, session.UserID) - // Verify user's OktaEmail and OktaUUID match the values passed in + // Verify user's OktaEmail and OktaID match the values passed in suite.Equal(user.Email, foundUser.OktaEmail) - suite.Equal(user.UserID, foundUser.OktaUUID.String()) + suite.Equal(user.UserID, foundUser.OktaID) // Verify that the user's CurrentMilSessionID is not empty. The value is // generated randomly, so we can't test for a specific string. Any string @@ -1319,12 +1319,12 @@ func (suite *AuthSuite) TestAuthorizeKnownUserAdminNotFound() { appnames := handlerConfig.AppNames() // user exists in the DB, but not as an admin user fakeToken := "some_token" - oktaUUID := uuid.Must(uuid.NewV4()) + OktaID := "000" userID := uuid.Must(uuid.NewV4()) serviceMemberID := uuid.Must(uuid.NewV4()) user := models.User{ - OktaUUID: &oktaUUID, + OktaID: OktaID, OktaEmail: "email@example.com", Active: true, ID: userID, diff --git a/pkg/handlers/authentication/devlocal.go b/pkg/handlers/authentication/devlocal.go index 7c77a2c9040..971545fc487 100644 --- a/pkg/handlers/authentication/devlocal.go +++ b/pkg/handlers/authentication/devlocal.go @@ -395,7 +395,7 @@ func (h CreateAndLoginUserHandler) ServeHTTP(w http.ResponseWriter, r *http.Requ // createUser creates a user func createUser(h devlocalAuthHandler, w http.ResponseWriter, r *http.Request) (*models.User, string) { appCtx := h.HandlerConfig.AppContextFromRequest(r) - id := uuid.Must(uuid.NewV4()) + id := uuid.Must(uuid.NewV4()).String() // Set up some defaults that we can pass in from a form firstName := r.PostFormValue("firstName") @@ -434,7 +434,7 @@ func createUser(h devlocalAuthHandler, w http.ResponseWriter, r *http.Request) ( // Create the User (which is the basis of all Service Members) user := models.User{ - OktaUUID: &id, + OktaID: id, OktaEmail: email, Active: true, } @@ -928,11 +928,11 @@ func createSession(h devlocalAuthHandler, user *models.User, userType string, _ session = &auth.Session{} } - lgUUID := user.OktaUUID.String() + lgUUID := user.OktaID userIdentity, err := models.FetchUserIdentity(appCtx.DB(), lgUUID) if err != nil { - return nil, errors.Wrapf(err, "Unable to fetch user identity from OktaUUID %s", lgUUID) + return nil, errors.Wrapf(err, "Unable to fetch user identity from OktaID %s", lgUUID) } session.Roles = append(session.Roles, userIdentity.Roles...) diff --git a/pkg/handlers/internalapi/duty_locations_test.go b/pkg/handlers/internalapi/duty_locations_test.go index 6b00c2632ae..2f3922eba7f 100644 --- a/pkg/handlers/internalapi/duty_locations_test.go +++ b/pkg/handlers/internalapi/duty_locations_test.go @@ -16,9 +16,9 @@ func (suite *HandlerSuite) TestSearchDutyLocationHandler() { t := suite.T() // Need a logged in user - lgu := uuid.Must(uuid.NewV4()) + lgu := uuid.Must(uuid.NewV4()).String() user := models.User{ - OktaUUID: &lgu, + OktaID: lgu, OktaEmail: "email@example.com", } suite.MustSave(&user) diff --git a/pkg/handlers/internalapi/signed_certifications_test.go b/pkg/handlers/internalapi/signed_certifications_test.go index d0864656e1d..dcbac598f12 100644 --- a/pkg/handlers/internalapi/signed_certifications_test.go +++ b/pkg/handlers/internalapi/signed_certifications_test.go @@ -14,7 +14,6 @@ import ( "time" "github.com/go-openapi/strfmt" - "github.com/gofrs/uuid" "github.com/transcom/mymove/pkg/factory" certop "github.com/transcom/mymove/pkg/gen/internalapi/internaloperations/certification" @@ -65,9 +64,9 @@ func (suite *HandlerSuite) TestCreateSignedCertificationHandler() { func (suite *HandlerSuite) TestCreateSignedCertificationHandlerMismatchedUser() { t := suite.T() - userUUID2, _ := uuid.FromString("3511d4d6-019d-4031-9c27-8a553e055543") + userUUID2 := "3511d4d6-019d-4031-9c27-8a553e055543" user2 := models.User{ - OktaUUID: &userUUID2, + OktaID: userUUID2, OktaEmail: "email2@example.com", } suite.MustSave(&user2) @@ -194,9 +193,9 @@ func (suite *HandlerSuite) TestIndexSignedCertificationHandlerMismatchedUser() { }, }, }, nil) - userUUID2, _ := uuid.FromString("3511d4d6-019d-4031-9c27-8a553e055543") + userUUID2 := "3511d4d6-019d-4031-9c27-8a553e055543" unauthorizedUser := models.User{ - OktaUUID: &userUUID2, + OktaID: userUUID2, OktaEmail: "email2@example.com", } params := certop.IndexSignedCertificationParams{ diff --git a/pkg/handlers/routing/base_routing_suite.go b/pkg/handlers/routing/base_routing_suite.go index fc865699606..7643b02eb84 100644 --- a/pkg/handlers/routing/base_routing_suite.go +++ b/pkg/handlers/routing/base_routing_suite.go @@ -154,9 +154,9 @@ func (suite *BaseRoutingSuite) setupRequestSession(req *http.Request, user model Hostname: hostname, } - suite.FatalNotNil(user.OktaUUID) - suite.FatalFalse(user.OktaUUID.IsNil()) - userIdentity, err := models.FetchUserIdentity(suite.DB(), user.OktaUUID.String()) + suite.FatalNotNil(user.OktaID) + suite.NotNil(user.OktaID) + userIdentity, err := models.FetchUserIdentity(suite.DB(), user.OktaID) suite.FatalNoError(err) // use AuthorizeKnownUser which also sets up various things in the diff --git a/pkg/migrate/SplitStatements_test.go b/pkg/migrate/SplitStatements_test.go index b33496492a6..0e7a5d6debd 100644 --- a/pkg/migrate/SplitStatements_test.go +++ b/pkg/migrate/SplitStatements_test.go @@ -189,7 +189,7 @@ func (suite *MigrateSuite) TestSplitStatementsCopyFromStdinTrailingEmptyColumns( // We're using a string for this test case instead of a file so the trailing whitespace doesn't accidentally get trimmed off by // an aggressive text editor. originalStatements := []string{ - "COPY public.users (id, okta_uuid, okta_email, created_at, updated_at, active, current_mil_session_id, current_admin_session_id, current_office_session_id) FROM stdin;", + "COPY public.users (id, okta_id, okta_email, created_at, updated_at, active, current_mil_session_id, current_admin_session_id, current_office_session_id) FROM stdin;", "00000000-0000-0000-0000-000000000000\t\\N\texample@example.com\t2021-05-12\t20:09:04.701587\t2021-05-12\t20:09:04.701587\tt\t\t\t", "11111111-1111-1111-1111-111111111111\t\\N\texample@example.com\t2021-05-12\t20:09:04.701587\t2021-05-12\t20:09:04.701587\tt\t\t\t", "\\.", diff --git a/pkg/models/client_cert_test.go b/pkg/models/client_cert_test.go index 8069f5942a3..3667563d65d 100644 --- a/pkg/models/client_cert_test.go +++ b/pkg/models/client_cert_test.go @@ -9,10 +9,10 @@ import ( ) func (suite *ModelSuite) Test_FetchClientCert() { - loginGovUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()).String() userForClientCert := models.User{ ID: uuid.Must(uuid.NewV4()), - OktaUUID: &loginGovUUID, + OktaID: oktaID, OktaEmail: "prime_user_with_client_cert@login.gov.test", Active: true, } diff --git a/pkg/models/office_user_test.go b/pkg/models/office_user_test.go index 7f50ddd4e4c..405064e959a 100644 --- a/pkg/models/office_user_test.go +++ b/pkg/models/office_user_test.go @@ -24,7 +24,7 @@ func (suite *ModelSuite) Test_BasicOfficeUser() { fakeUUID, _ := uuid.FromString("39b28c92-0506-4bef-8b57-e39519f42dc1") userEmail := "sally@government.gov" sally := User{ - OktaUUID: &fakeUUID, + OktaID: fakeUUID.String(), OktaEmail: userEmail, } suite.MustSave(&sally) @@ -75,7 +75,7 @@ func (suite *ModelSuite) TestFetchOfficeUserByEmailCaseSensitivity() { userEmail := "Chris@government.gov" chris := User{ - OktaUUID: &fakeUUID, + OktaID: fakeUUID.String(), OktaEmail: userEmail, } suite.MustSave(&chris) diff --git a/pkg/models/service_member_test.go b/pkg/models/service_member_test.go index e7470325bc1..7a5e9bef6a7 100644 --- a/pkg/models/service_member_test.go +++ b/pkg/models/service_member_test.go @@ -26,7 +26,7 @@ func (suite *ModelSuite) TestIsProfileCompleteWithIncompleteSM() { // Given: a user and a service member lgu := uuid.Must(uuid.NewV4()) user1 := User{ - OktaUUID: &lgu, + OktaID: lgu.String(), OktaEmail: "whoever@example.com", } verrs, err := user1.Validate(nil) diff --git a/pkg/models/user.go b/pkg/models/user.go index ef0e76823c1..67e48326978 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -19,7 +19,7 @@ type User struct { ID uuid.UUID `json:"id" db:"id"` CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` - OktaUUID *uuid.UUID `json:"okta_uuid" db:"okta_uuid"` + OktaID string `json:"okta_id" db:"okta_id"` OktaEmail string `json:"okta_email" db:"okta_email"` Active bool `json:"active" db:"active"` Roles roles.Roles `many_to_many:"users_roles"` @@ -67,13 +67,13 @@ func GetUserFromEmail(db *pop.Connection, email string) (*User, error) { } // CreateUser is called upon successful login.gov verification of a new user -func CreateUser(db *pop.Connection, loginGovID string, email string) (*User, error) { - lgu, err := uuid.FromString(loginGovID) +func CreateUser(db *pop.Connection, oktaID string, email string) (*User, error) { + oID, err := uuid.FromString(oktaID) if err != nil { return nil, err } newUser := User{ - OktaUUID: &lgu, + OktaID: oID.String(), OktaEmail: strings.ToLower(email), Active: true, } @@ -87,14 +87,14 @@ func CreateUser(db *pop.Connection, loginGovID string, email string) (*User, err return &newUser, nil } -// UpdateUserOktaUUID is called upon the first successful login.gov verification of a new user -func UpdateUserOktaUUID(db *pop.Connection, user *User, loginGovID string) error { +// UpdateUserOktaID is called upon the first successful login.gov verification of a new user +func UpdateUserOktaID(db *pop.Connection, user *User, loginGovID string) error { lgu, err := uuid.FromString(loginGovID) if err != nil { return err } - user.OktaUUID = &lgu + user.OktaID = lgu.String() verrs, err := db.ValidateAndUpdate(user) if verrs.HasAny() { @@ -153,7 +153,7 @@ func FetchUserIdentity(db *pop.Connection, loginGovID string) (*UserIdentity, er LEFT OUTER JOIN service_members AS sm on sm.user_id = users.id LEFT OUTER JOIN office_users AS ou on ou.user_id = users.id LEFT OUTER JOIN admin_users AS au on au.user_id = users.id - WHERE users.okta_uuid = $1` + WHERE users.okta_id = $1` err := db.RawQuery(query, loginGovID).All(&identities) if err != nil { return nil, err diff --git a/pkg/models/user_test.go b/pkg/models/user_test.go index ed7ea86b760..661ffb072fa 100644 --- a/pkg/models/user_test.go +++ b/pkg/models/user_test.go @@ -18,7 +18,7 @@ func (suite *ModelSuite) TestUserValidation() { userEmail := "sally@government.gov" newUser := User{ - OktaUUID: &fakeUUID, + OktaID: fakeUUID.String(), OktaEmail: userEmail, } @@ -27,7 +27,7 @@ func (suite *ModelSuite) TestUserValidation() { suite.NoError(err) suite.False(verrs.HasAny(), "Error validating model") suite.Equal(userEmail, newUser.OktaEmail) - suite.Equal(fakeUUID, *newUser.OktaUUID) + suite.Equal(fakeUUID, newUser.OktaID) } func (suite *ModelSuite) TestUserCreationWithoutValues() { @@ -45,12 +45,12 @@ func (suite *ModelSuite) TestUserCreationDuplicateUUID() { userEmail := "sally@government.gov" newUser := User{ - OktaUUID: &fakeUUID, + OktaID: fakeUUID.String(), OktaEmail: userEmail, } sameUser := User{ - OktaUUID: &fakeUUID, + OktaID: fakeUUID.String(), OktaEmail: userEmail, } @@ -93,7 +93,7 @@ func (suite *ModelSuite) TestFetchUserIdentity() { suite.Nil(identity) alice := factory.BuildDefaultUser(suite.DB()) - identity, err = FetchUserIdentity(suite.DB(), alice.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), alice.OktaID) suite.Nil(err, "loading alice's identity") suite.NotNil(identity) suite.Equal(alice.ID, identity.ID) @@ -102,7 +102,7 @@ func (suite *ModelSuite) TestFetchUserIdentity() { suite.Nil(identity.OfficeUserID) bob := factory.BuildServiceMember(suite.DB(), nil, nil) - identity, err = FetchUserIdentity(suite.DB(), bob.User.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), bob.User.OktaID) suite.Nil(err, "loading bob's identity") suite.NotNil(identity) suite.Equal(bob.UserID, identity.ID) @@ -123,7 +123,7 @@ func (suite *ModelSuite) TestFetchUserIdentity() { LinkOnly: true, }, }, nil) - identity, err = FetchUserIdentity(suite.DB(), carol.User.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), carol.User.OktaID) suite.Nil(err, "loading carol's identity") suite.NotNil(identity) suite.Equal(*carol.UserID, identity.ID) @@ -132,7 +132,7 @@ func (suite *ModelSuite) TestFetchUserIdentity() { suite.Equal(carol.ID, *identity.OfficeUserID) systemAdmin := factory.BuildDefaultAdminUser(suite.DB()) - identity, err = FetchUserIdentity(suite.DB(), systemAdmin.User.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), systemAdmin.User.OktaID) suite.Nil(err, "loading systemAdmin's identity") suite.NotNil(identity) suite.Equal(*systemAdmin.UserID, identity.ID) @@ -154,14 +154,14 @@ func (suite *ModelSuite) TestFetchUserIdentity() { pat := factory.BuildUser(suite.DB(), []factory.Customization{ { Model: User{ - OktaUUID: &patUUID, - Active: true, - Roles: []roles.Role{customerRole}, + OktaID: patUUID.String(), + Active: true, + Roles: []roles.Role{customerRole}, }, }, }, nil) - identity, err = FetchUserIdentity(suite.DB(), pat.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), pat.OktaID) suite.Nil(err, "loading pat's identity") suite.NotNil(identity) suite.Equal(len(identity.Roles), 1) @@ -171,15 +171,15 @@ func (suite *ModelSuite) TestFetchUserIdentity() { billy := factory.BuildUser(suite.DB(), []factory.Customization{ { Model: User{ - OktaUUID: &billyUUID, - Active: true, - Roles: []roles.Role{tooRole}, + OktaID: billyUUID.String(), + Active: true, + Roles: []roles.Role{tooRole}, }, }, }, nil) suite.DB().MigrationURL() - identity, err = FetchUserIdentity(suite.DB(), billy.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), billy.OktaID) suite.Nil(err, "loading billy's identity") suite.NotNil(identity) suite.Equal(len(identity.Roles), 1) @@ -220,7 +220,7 @@ func (suite *ModelSuite) TestFetchUserIdentityDeletedRoles() { */ // this creates a user with TOO, TIO, and Services Counselor roles multiRoleUser := factory.BuildOfficeUserWithRoles(suite.DB(), nil, []roles.RoleType{roles.RoleTypeTOO, roles.RoleTypeTIO, roles.RoleTypeServicesCounselor}) - identity, err := FetchUserIdentity(suite.DB(), multiRoleUser.User.OktaUUID.String()) + identity, err := FetchUserIdentity(suite.DB(), multiRoleUser.User.OktaID) suite.Nil(err, "failed to fetch user identity") suite.Equal(*multiRoleUser.UserID, identity.ID) suite.Condition(compareRoleTypeLists(multiRoleUser.User.Roles, identity.Roles)) @@ -239,7 +239,7 @@ func (suite *ModelSuite) TestFetchUserIdentityDeletedRoles() { suite.NoError(err) // re-fetch user identity and check roles - identity, err = FetchUserIdentity(suite.DB(), multiRoleUser.User.OktaUUID.String()) + identity, err = FetchUserIdentity(suite.DB(), multiRoleUser.User.OktaID) suite.Nil(err, "failed to fetch user identity") suite.Equal(*multiRoleUser.UserID, identity.ID) diff --git a/pkg/services/admin_user/admin_user_creator_test.go b/pkg/services/admin_user/admin_user_creator_test.go index 5b2aea8db6b..cf6f29f2a35 100644 --- a/pkg/services/admin_user/admin_user_creator_test.go +++ b/pkg/services/admin_user/admin_user_creator_test.go @@ -35,11 +35,11 @@ func (suite *AdminUserServiceSuite) TestCreateAdminUser() { setupTestData := func() (models.User, models.AdminUser) { - loginGovUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) existingUser := factory.BuildUser(suite.DB(), []factory.Customization{ { Model: models.User{ - OktaUUID: &loginGovUUID, + OktaID: oktaID.String(), OktaEmail: "spaceman+existing@leo.org", Active: true, }, @@ -108,7 +108,7 @@ func (suite *AdminUserServiceSuite) TestCreateAdminUser() { reflect.ValueOf(model).Elem().FieldByName("ID").Set(reflect.ValueOf(userInfo.Organization.ID)) case *models.User: reflect.ValueOf(model).Elem().FieldByName("ID").Set(reflect.ValueOf(existingUser.ID)) - reflect.ValueOf(model).Elem().FieldByName("OktaUUID").Set(reflect.ValueOf(existingUser.OktaUUID)) + reflect.ValueOf(model).Elem().FieldByName("OktaID").Set(reflect.ValueOf(existingUser.OktaID)) reflect.ValueOf(model).Elem().FieldByName("OktaEmail").Set(reflect.ValueOf(existingUserInfo.User.OktaEmail)) } return nil diff --git a/pkg/services/office_user/office_user_creator_test.go b/pkg/services/office_user/office_user_creator_test.go index 24667d4f21e..a7256c53650 100644 --- a/pkg/services/office_user/office_user_creator_test.go +++ b/pkg/services/office_user/office_user_creator_test.go @@ -33,11 +33,11 @@ func setUpMockNotificationSender() notifications.NotificationSender { func (suite *OfficeUserServiceSuite) TestCreateOfficeUser() { setupTestData := func() (models.User, models.OfficeUser) { - loginGovUUID := uuid.Must(uuid.NewV4()) + oID := uuid.Must(uuid.NewV4()) existingUser := factory.BuildUser(suite.DB(), []factory.Customization{ { Model: models.User{ - OktaUUID: &loginGovUUID, + OktaID: oID.String(), OktaEmail: "spaceman+existing@leo.org", Active: true, }, @@ -121,7 +121,7 @@ func (suite *OfficeUserServiceSuite) TestCreateOfficeUser() { reflect.ValueOf(model).Elem().FieldByName("ID").Set(reflect.ValueOf(transportationOffice.ID)) case *models.User: reflect.ValueOf(model).Elem().FieldByName("ID").Set(reflect.ValueOf(existingUser.ID)) - reflect.ValueOf(model).Elem().FieldByName("OktaUUID").Set(reflect.ValueOf(existingUser.OktaUUID)) + reflect.ValueOf(model).Elem().FieldByName("OktaID").Set(reflect.ValueOf(existingUser.OktaID)) reflect.ValueOf(model).Elem().FieldByName("OktaEmail").Set(reflect.ValueOf(existingUserInfo.User.OktaEmail)) } return nil diff --git a/pkg/services/support/move_task_order/move_task_order_creator.go b/pkg/services/support/move_task_order/move_task_order_creator.go index 37ba5b0a288..a28fa480464 100644 --- a/pkg/services/support/move_task_order/move_task_order_creator.go +++ b/pkg/services/support/move_task_order/move_task_order_creator.go @@ -201,7 +201,7 @@ func createUser(appCtx appcontext.AppContext, userEmail *string) (*models.User, } id := uuid.Must(uuid.NewV4()) user := models.User{ - OktaUUID: &id, + OktaID: id.String(), OktaEmail: *userEmail, Active: true, } diff --git a/pkg/testdatagen/make_user.go b/pkg/testdatagen/make_user.go index 779c209c10e..cedbd8a8761 100644 --- a/pkg/testdatagen/make_user.go +++ b/pkg/testdatagen/make_user.go @@ -12,9 +12,9 @@ import ( // It will not replace a true assertion with false. func MakeUser(db *pop.Connection, assertions Assertions) models.User { - loginGovUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := models.User{ - OktaUUID: &loginGovUUID, + OktaID: oktaID.String(), OktaEmail: "first.last@login.gov.test", Active: false, } @@ -29,11 +29,11 @@ func MakeUser(db *pop.Connection, assertions Assertions) models.User { // MakeDefaultUser makes a user with default values func MakeDefaultUser(db *pop.Connection) models.User { - lgu := uuid.Must(uuid.NewV4()) + oID := uuid.Must(uuid.NewV4()) return MakeUser(db, Assertions{ User: models.User{ - OktaUUID: &lgu, - Active: true, + OktaID: oID.String(), + Active: true, }, }) } diff --git a/pkg/testdatagen/scenario/bandwidth.go b/pkg/testdatagen/scenario/bandwidth.go index 5dbcc8edbab..949cfb3d052 100644 --- a/pkg/testdatagen/scenario/bandwidth.go +++ b/pkg/testdatagen/scenario/bandwidth.go @@ -291,12 +291,12 @@ func createOfficeUser(appCtx appcontext.AppContext) { } tooTioUUID := uuid.Must(uuid.FromString("9bda91d2-7a0c-4de1-ae02-b8cf8b4b858b")) - oktaUUID := uuid.Must(uuid.NewV4()) + OktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tooTioUUID, - OktaUUID: &oktaUUID, + OktaID: OktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole, tioRole}, diff --git a/pkg/testdatagen/scenario/e2ebasic.go b/pkg/testdatagen/scenario/e2ebasic.go index 87b129f2718..15259593cb8 100644 --- a/pkg/testdatagen/scenario/e2ebasic.go +++ b/pkg/testdatagen/scenario/e2ebasic.go @@ -52,13 +52,13 @@ func serviceMemberNoUploadedOrders(appCtx appcontext.AppContext) { */ email := "needs@orde.rs" uuidStr := "feac0e92-66ec-4cab-ad29-538129bf918e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -90,7 +90,7 @@ func basicUserWithOfficeAccess(appCtx appcontext.AppContext) { email := "officeuser1@example.com" userID := uuid.Must(uuid.FromString("9bfa91d2-7a0c-4de0-ae02-b8cf8b4b858b")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildOfficeUser(appCtx.DB(), []factory.Customization{ { Model: models.OfficeUser{ @@ -102,7 +102,7 @@ func basicUserWithOfficeAccess(appCtx appcontext.AppContext) { { Model: models.User{ ID: userID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole}, @@ -119,13 +119,13 @@ func userWithRoles(appCtx appcontext.AppContext) { } email := "role_tester@service.mil" uuidStr := "3b9360a3-3304-4c60-90f4-83d687884079" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{smRole}, @@ -143,13 +143,13 @@ func userWithTOORole(appCtx appcontext.AppContext) { email := "too_role@office.mil" tooUUID := uuid.Must(uuid.FromString("dcf86235-53d3-43dd-8ee8-54212ae3078f")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tooUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole}, @@ -183,13 +183,13 @@ func userWithTIORole(appCtx appcontext.AppContext) { email := "tio_role@office.mil" tioUUID := uuid.Must(uuid.FromString("3b2cc1b0-31a2-4d1b-874f-0591f9127374")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tioUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tioRole}, @@ -218,13 +218,13 @@ func userWithServicesCounselorRole(appCtx appcontext.AppContext) { email := "services_counselor_role@office.mil" servicesCounselorUUID := uuid.Must(uuid.FromString("a6c8663f-998f-4626-a978-ad60da2476ec")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: servicesCounselorUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{servicesCounselorRole}, @@ -251,13 +251,13 @@ func userWithQAECSRRole(appCtx appcontext.AppContext, userID uuid.UUID, email st log.Panic(fmt.Errorf("failed to find RoleTypeQAECSR in the DB: %w", err)) } - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: userID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{qaecsrRole}, @@ -296,13 +296,13 @@ func userWithTOOandTIORole(appCtx appcontext.AppContext) { email := "too_tio_role@office.mil" tooTioUUID := uuid.Must(uuid.FromString("9bda91d2-7a0c-4de1-ae02-b8cf8b4b858b")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tooTioUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole, tioRole}, @@ -349,13 +349,13 @@ func userWithTOOandTIOandQAECSRRole(appCtx appcontext.AppContext) { email := "too_tio_qaecsr_role@office.mil" tooTioQaecsrUUID := uuid.Must(uuid.FromString("b264abd6-52fc-4e42-9e0f-173f7d217bc5")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tooTioQaecsrUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole, tioRole, qaecsrRole}, @@ -401,13 +401,13 @@ func userWithTOOandTIOandServicesCounselorRole(appCtx appcontext.AppContext) { email := "too_tio_services_counselor_role@office.mil" ttooTioServicesUUID := uuid.Must(uuid.FromString("8d78c849-0853-4eb8-a7a7-73055db7a6a8")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: ttooTioServicesUUID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole, tioRole, servicesCounselorRole}, @@ -443,13 +443,13 @@ func userWithPrimeSimulatorRole(appCtx appcontext.AppContext) { email := "prime_simulator_role@office.mil" primeSimulatorUserID := uuid.Must(uuid.FromString("cf5609e9-b88f-4a98-9eda-9d028bc4a515")) - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: primeSimulatorUserID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{primeSimulatorRole}, @@ -476,13 +476,13 @@ func userWithPrimeSimulatorRole(appCtx appcontext.AppContext) { func serviceMemberWithUploadedOrdersAndNewPPM(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@incomple.te" uuidStr := "e10d5964-c070-49cb-9bd1-eaf9f7348eb6" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -531,13 +531,13 @@ func serviceMemberWithUploadedOrdersAndNewPPM(appCtx appcontext.AppContext, user func serviceMemberWithUploadedOrdersNewPPMNoAdvance(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@advance.no" uuidStr := "f0ddc118-3f7e-476b-b8be-0f964a5feee2" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -583,13 +583,13 @@ func serviceMemberWithUploadedOrdersNewPPMNoAdvance(appCtx appcontext.AppContext func officeUserFindsMoveCompletesStoragePanel(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "office.user.completes@storage.panel" uuidStr := "ebac4efd-c980-48d6-9cce-99fb34644789" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -650,13 +650,13 @@ func officeUserFindsMoveCompletesStoragePanel(appCtx appcontext.AppContext, user func officeUserFindsMoveCancelsStoragePanel(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "office.user.cancelss@storage.panel" uuidStr := "cbb56f00-97f7-4d20-83cf-25a7b2f150b6" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -717,13 +717,13 @@ func officeUserFindsMoveCancelsStoragePanel(appCtx appcontext.AppContext, userUp func aMoveThatWillBeCancelledByAnE2ETest(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm-to-cancel@example.com" uuidStr := "e10d5964-c070-49cb-9bd1-eaf9f7348eb7" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -769,13 +769,13 @@ func aMoveThatWillBeCancelledByAnE2ETest(appCtx appcontext.AppContext, userUploa func serviceMemberWithPPMInProgress(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm.on@progre.ss" uuidStr := "20199d12-5165-4980-9ca7-19b5dc9f1032" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -826,13 +826,13 @@ func serviceMemberWithPPMInProgress(appCtx appcontext.AppContext, userUploader * func serviceMemberWithPPMMoveWithPaymentRequested01(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@paymentrequest.ed" uuidStr := "1842091b-b9a0-4d4a-ba22-1e2f38f26317" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -904,13 +904,13 @@ func serviceMemberWithPPMMoveWithPaymentRequested01(appCtx appcontext.AppContext func serviceMemberWithPPMMoveWithPaymentRequested02(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppmpayment@request.ed" uuidStr := "beccca28-6e15-40cc-8692-261cae0d4b14" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -985,13 +985,13 @@ func serviceMemberWithPPMMoveWithPaymentRequested02(appCtx appcontext.AppContext func aCanceledPPMMove(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm-canceled@example.com" uuidStr := "20102768-4d45-449c-a585-81bc386204b1" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1045,13 +1045,13 @@ func aCanceledPPMMove(appCtx appcontext.AppContext, userUploader *uploader.UserU func serviceMemberWithOrdersAndAMoveNoMoveType(appCtx appcontext.AppContext) { email := "sm_no_move_type@example.com" uuidStr := "9ceb8321-6a82-4f6d-8bb3-a1d85922a202" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1078,13 +1078,13 @@ func serviceMemberWithOrdersAndAMoveNoMoveType(appCtx appcontext.AppContext) { func serviceMemberWithOrdersAndAMovePPMandHHG(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "combo@ppm.hhg" uuidStr := "6016e423-f8d5-44ca-98a8-af03c8445c94" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1205,13 +1205,13 @@ func serviceMemberWithOrdersAndAMovePPMandHHG(appCtx appcontext.AppContext, user func serviceMemberWithUnsubmittedHHG(appCtx appcontext.AppContext) { email := "hhg@only.unsubmitted" uuidStr := "f08146cf-4d6b-43d5-9ca5-c8d239d37b3e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1271,13 +1271,13 @@ func serviceMemberWithUnsubmittedHHG(appCtx appcontext.AppContext) { func serviceMemberWithNTSandNTSRandUnsubmittedMove01(appCtx appcontext.AppContext) { email := "nts@ntsr.unsubmitted" uuidStr := "583cfbe1-cb34-4381-9e1f-54f68200da1b" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1374,13 +1374,13 @@ func serviceMemberWithNTSandNTSRandUnsubmittedMove01(appCtx appcontext.AppContex func serviceMemberWithNTSandNTSRandUnsubmittedMove02(appCtx appcontext.AppContext) { email := "nts2@ntsr.unsubmitted" uuidStr := "80da86f3-9dac-4298-8b03-b753b443668e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1478,13 +1478,13 @@ func serviceMemberWithNTSandNTSRandUnsubmittedMove02(appCtx appcontext.AppContex func serviceMemberWithPPMReadyToRequestPayment01(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@requestingpayment.newflow" uuidStr := "745e0eba-4028-4c78-a262-818b00802748" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1551,13 +1551,13 @@ func serviceMemberWithPPMReadyToRequestPayment01(appCtx appcontext.AppContext, u func serviceMemberWithPPMReadyToRequestPayment02(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@continue.requestingpayment" uuidStr := "4ebc03b7-c801-4c0d-806c-a95aed242102" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1624,13 +1624,13 @@ func serviceMemberWithPPMReadyToRequestPayment02(appCtx appcontext.AppContext, u func serviceMemberWithPPMReadyToRequestPayment03(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@requestingpay.ment" uuidStr := "8e0d7e98-134e-4b28-bdd1-7d6b1ff34f9e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -1698,13 +1698,13 @@ func serviceMemberWithPPMReadyToRequestPayment03(appCtx appcontext.AppContext, u func serviceMemberWithPPMApprovedNotInProgress(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveRouter services.MoveRouter) { email := "ppm@approv.ed" uuidStr := "70665111-7bbb-4876-a53d-18bb125c943e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -2070,13 +2070,13 @@ func serviceMemberWithOrdersAndPPMMove08(appCtx appcontext.AppContext, userUploa func createBasicNTSMove(appCtx appcontext.AppContext, userUploader *uploader.UserUploader) { email := "nts.test.user@example.com" uuidStr := "2194daed-3589-408f-b988-e9889c9f120e" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -2115,13 +2115,13 @@ func createBasicNTSMove(appCtx appcontext.AppContext, userUploader *uploader.Use func createBasicMovePPM01(appCtx appcontext.AppContext, userUploader *uploader.UserUploader) { email := "ppm.test.user1@example.com" uuidStr := "4635b5a7-0f57-4557-8ba4-bbbb760c300a" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -2159,13 +2159,13 @@ func createBasicMovePPM01(appCtx appcontext.AppContext, userUploader *uploader.U func createBasicMovePPM02(appCtx appcontext.AppContext, userUploader *uploader.UserUploader) { email := "ppm.test.user2@example.com" uuidStr := "324dec0a-850c-41c8-976b-068e27121b84" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -2204,13 +2204,13 @@ func createBasicMovePPM02(appCtx appcontext.AppContext, userUploader *uploader.U func createBasicMovePPM03(appCtx appcontext.AppContext, userUploader *uploader.UserUploader) { email := "ppm.test.user3@example.com" uuidStr := "f154929c-5f07-41f5-b90c-d90b83d5773d" - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, diff --git a/pkg/testdatagen/scenario/shared.go b/pkg/testdatagen/scenario/shared.go index 615f4bac2f3..89a1b021217 100644 --- a/pkg/testdatagen/scenario/shared.go +++ b/pkg/testdatagen/scenario/shared.go @@ -169,13 +169,13 @@ func createServiceMemberWithOrdersButNoMoveType(appCtx appcontext.AppContext) { */ email := "sm_no_move_type@example.com" uuidStr := "9ceb8321-6a82-4f6d-8bb3-a1d85922a202" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildMove(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, }, }, @@ -204,12 +204,12 @@ func createServiceMemberWithNoUploadedOrders(appCtx appcontext.AppContext) { */ email := "needs@orde.rs" uuidStr := "feac0e92-66ec-4cab-ad29-538129bf918e" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -239,13 +239,13 @@ func createMoveWithPPMAndHHG(appCtx appcontext.AppContext, userUploader *uploade */ email := "combo@ppm.hhg" uuidStr := "6016e423-f8d5-44ca-98a8-af03c8445c94" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -382,7 +382,7 @@ func createGenericPPMRelatedMove(appCtx appcontext.AppContext, moveInfo MoveCrea userModel := models.User{ ID: moveInfo.UserID, - OktaUUID: models.UUIDPointer(uuid.Must(uuid.NewV4())), + OktaID: models.UUIDPointer(uuid.Must(uuid.NewV4())).String(), OktaEmail: moveInfo.Email, Active: true, } @@ -2379,14 +2379,14 @@ func createSubmittedMoveWithPPMShipment(appCtx appcontext.AppContext, userUpload } func CreateMoveWithCloseOut(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, moveInfo MoveCreatorInfo, branch models.ServiceMemberAffiliation) models.Move { - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: moveInfo.UserID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: moveInfo.Email, Active: true, }}, @@ -2523,14 +2523,14 @@ func CreateMoveWithCloseOut(appCtx appcontext.AppContext, userUploader *uploader func createMoveWithCloseOutandNonCloseOut(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, locator string, branch models.ServiceMemberAffiliation) { userID := uuid.Must(uuid.NewV4()) email := "1needscloseout@ppm.closeout" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: userID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -2644,14 +2644,14 @@ func createMoveWithCloseOutandNonCloseOut(appCtx appcontext.AppContext, userUplo func createMoveWith2CloseOuts(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, locator string, branch models.ServiceMemberAffiliation) { userID := uuid.Must(uuid.NewV4()) email := "2needcloseout@ppm.closeout" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: userID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -2767,14 +2767,14 @@ func createMoveWith2CloseOuts(appCtx appcontext.AppContext, userUploader *upload func createMoveWithCloseOutandHHG(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, locator string, branch models.ServiceMemberAffiliation) { userID := uuid.Must(uuid.NewV4()) email := "needscloseout@ppmHHG.closeout" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: userID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -2872,14 +2872,14 @@ func createMoveWithCloseOutandHHG(appCtx appcontext.AppContext, userUploader *up } func CreateMoveWithCloseoutOffice(appCtx appcontext.AppContext, moveInfo MoveCreatorInfo, userUploader *uploader.UserUploader) models.Move { - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Date(2020, time.December, 11, 12, 0, 0, 0, time.UTC) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: moveInfo.UserID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: moveInfo.Email, Active: true, }}, @@ -2992,14 +2992,14 @@ func createMovesForEachBranch(appCtx appcontext.AppContext, userUploader *upload } func CreateSubmittedMoveWithPPMShipmentForSC(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, _ services.MoveRouter, moveInfo MoveCreatorInfo) models.Move { - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: moveInfo.UserID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: moveInfo.Email, Active: true, }}, @@ -3088,7 +3088,7 @@ func CreateSubmittedMoveWithPPMShipmentForSC(appCtx appcontext.AppContext, userU func createSubmittedMoveWithPPMShipmentForSCWithSIT(appCtx appcontext.AppContext, userUploader *uploader.UserUploader, _ services.MoveRouter, locator string) { userID := uuid.Must(uuid.NewV4()) email := "completeWithSIT@ppm.submitted" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) submittedAt := time.Now() sitLocationType := models.SITLocationTypeOrigin @@ -3096,7 +3096,7 @@ func createSubmittedMoveWithPPMShipmentForSCWithSIT(appCtx appcontext.AppContext { Model: models.User{ ID: userID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -3258,13 +3258,13 @@ func createSubmittedMoveWithFullPPMShipmentComplete(appCtx appcontext.AppContext userID := uuid.Must(uuid.FromString("04f2a1c6-eb40-463d-8544-1909141fdedf")) email := "complete@ppm.submitted" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: userID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -3432,13 +3432,13 @@ func createUnsubmittedHHGMove(appCtx appcontext.AppContext) { */ email := "hhg@only.unsubmitted" uuidStr := "f08146cf-4d6b-43d5-9ca5-c8d239d37b3e" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -3501,13 +3501,13 @@ func createUnsubmittedHHGMoveMultipleDestinations(appCtx appcontext.AppContext) */ email := "multple-destinations@unsubmitted.hhg" userID := "81fe79a1-faaa-4735-8426-fd159e641002" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(userID)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -3597,13 +3597,13 @@ func createUnsubmittedHHGMoveMultiplePickup(appCtx appcontext.AppContext) { */ email := "hhg@multiple.pickup" uuidStr := "47fb0e80-6675-4ceb-b4eb-4f8e164c0f6e" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -3702,7 +3702,7 @@ func createSubmittedHHGMoveMultiplePickupAmendedOrders(appCtx appcontext.AppCont */ email := "hhg@multiple.pickup.amendedOrders.submitted" uuidStr := "c5f202b3-90d3-46aa-8e3b-83e937fcca99" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) smWithHHGID := "cfb9024b-39f3-47ca-b14b-a4e78a41e9db" @@ -3710,7 +3710,7 @@ func createSubmittedHHGMoveMultiplePickupAmendedOrders(appCtx appcontext.AppCont { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -8266,12 +8266,12 @@ func createTOO(appCtx appcontext.AppContext) { } tooUUID := uuid.Must(uuid.FromString("dcf86235-53d3-43dd-8ee8-54212ae3078f")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: tooUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole}, @@ -8310,12 +8310,12 @@ func createTIO(appCtx appcontext.AppContext) { } tioUUID := uuid.Must(uuid.FromString("3b2cc1b0-31a2-4d1b-874f-0591f9127374")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: tioUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tioRole}, @@ -8354,12 +8354,12 @@ func createServicesCounselor(appCtx appcontext.AppContext) { } servicesCounselorUUID := uuid.Must(uuid.FromString("a6c8663f-998f-4626-a978-ad60da2476ec")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: servicesCounselorUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{servicesCounselorRole}, @@ -8398,12 +8398,12 @@ func createQaeCsr(appCtx appcontext.AppContext) { } qaeCsrUUID := uuid.Must(uuid.FromString("8dbf1648-7527-4a92-b4eb-524edb703982")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: qaeCsrUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{qaeCsrRole}, @@ -8448,12 +8448,12 @@ func createTXO(appCtx appcontext.AppContext) { } tooTioUUID := uuid.Must(uuid.FromString("9bda91d2-7a0c-4de1-ae02-b8cf8b4b858b")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: tooTioUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: []roles.Role{tooRole, tioRole}, @@ -8512,12 +8512,12 @@ func createTXOUSMC(appCtx appcontext.AppContext) { // Makes user with both too and tio role with USMC gbloc tooTioWithUsmcUUID := uuid.Must(uuid.FromString("9bda91d2-7a0c-4de1-ae02-bbbbbbbbbbbb")) - loginGovWithUsmcUUID := uuid.Must(uuid.NewV4()) + oktaWithUsmcID := uuid.Must(uuid.NewV4()) factory.BuildUser(appCtx.DB(), []factory.Customization{ { Model: models.User{ ID: tooTioWithUsmcUUID, - OktaUUID: &loginGovWithUsmcUUID, + OktaID: oktaWithUsmcID.String(), OktaEmail: emailUSMC, Active: true, Roles: []roles.Role{tooRole, tioRole}, @@ -8561,14 +8561,14 @@ func createTXOServicesCounselor(appCtx appcontext.AppContext) { } tooTioServicesUUID := uuid.Must(uuid.FromString("8d78c849-0853-4eb8-a7a7-73055db7a6a8")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) // Make a user factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: tooTioServicesUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, Roles: userRoles, @@ -8616,14 +8616,14 @@ func createTXOServicesUSMCCounselor(appCtx appcontext.AppContext) { log.Panic(fmt.Errorf("Failed to find transportation office USMC in the DB: %w", err)) } tooTioServicesWithUsmcUUID := uuid.Must(uuid.FromString("9aae1a83-6515-4c1d-84e8-f7b53dc3d5fc")) - loginGovWithUsmcUUID := uuid.Must(uuid.NewV4()) + oktaWithUsmcID := uuid.Must(uuid.NewV4()) // Makes a user with all office roles that is associated with USMC factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: tooTioServicesWithUsmcUUID, - OktaUUID: &loginGovWithUsmcUUID, + OktaID: oktaWithUsmcID.String(), OktaEmail: emailUSMC, Active: true, Roles: userRoles, @@ -8665,7 +8665,7 @@ func createServicesCounselorForCloseoutWithGbloc(appCtx appcontext.AppContext, u log.Panic(fmt.Errorf("failed to find RoleTypeServicesCounselor in the DB: %w", err)) } - loginGovID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) factory.BuildOfficeUserWithRoles(appCtx.DB(), []factory.Customization{ { @@ -8677,7 +8677,7 @@ func createServicesCounselorForCloseoutWithGbloc(appCtx appcontext.AppContext, u { Model: models.User{ ID: userID, - OktaUUID: &loginGovID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }, @@ -8701,7 +8701,7 @@ func createPrimeUser(appCtx appcontext.AppContext) models.User { } userUUID := uuid.Must(uuid.FromString("3ce06fa9-590a-48e5-9e30-6ad1e82b528c")) - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) email := "prime_role@office.mil" // Make a user @@ -8709,7 +8709,7 @@ func createPrimeUser(appCtx appcontext.AppContext) models.User { { Model: models.User{ ID: userUUID, - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, }, }, @@ -9195,12 +9195,12 @@ func createReweighWithShipmentDeprecatedPaymentRequest(appCtx appcontext.AppCont db := appCtx.DB() email := "deprecatedPaymentRequest@hhg.hhg" uuidStr := "6995a480-2e90-4d9b-90df-0f9b42277653" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }}, @@ -9293,12 +9293,12 @@ func createReweighWithShipmentEDIErrorPaymentRequest(appCtx appcontext.AppContex db := appCtx.DB() email := "errrorPaymentRequest@hhg.hhg" uuidStr := "91252539-e8d0-4b9c-9722-d57c3b30bfb9" - oktaUUID := uuid.Must(uuid.NewV4()) + oktaID := uuid.Must(uuid.NewV4()) user := factory.BuildUser(db, []factory.Customization{ { Model: models.User{ ID: uuid.Must(uuid.FromString(uuidStr)), - OktaUUID: &oktaUUID, + OktaID: oktaID.String(), OktaEmail: email, Active: true, }},