Addressing comments

Author: pragatimodi

auth/user_mgt.go

@@ -41,7 +41,7 @@ const (
 	maxDeleteAccountsBatchSize = 1000
 	createUserMethod           = "createUser"
 	updateUserMethod           = "updateUser"
-	phoneMultiFactor           = "phone"
+	phoneMultiFactorID         = "phone"
 )
 
 // 'REDACTED', encoded as a base64 string.
@@ -170,7 +170,7 @@ func convertMultiFactorInfoToServerFormat(mfaInfo MultiFactorInfo) (multiFactorI
 	if mfaInfo.EnrollmentTimestamp != 0 {
 		authFactorInfo.EnrolledAt = time.Unix(mfaInfo.EnrollmentTimestamp, 0).Format("2006-01-02T15:04:05Z07:00Z")
 	}
-	if mfaInfo.FactorID == phoneMultiFactor {
+	if mfaInfo.FactorID == phoneMultiFactorID {
 		authFactorInfo.PhoneInfo = mfaInfo.PhoneNumber
 		authFactorInfo.DisplayName = mfaInfo.DisplayName
 		authFactorInfo.MFAEnrollmentID = mfaInfo.UID
@@ -674,7 +674,7 @@ func validateAndFormatMfaSettings(mfaSettings MultiFactorSettings, methodType st
 		if err := validateDisplayName(multiFactorInfo.DisplayName); err != nil {
 			return nil, fmt.Errorf("the second factor \"displayName\" for \"%s\" must be a valid non-empty string", multiFactorInfo.DisplayName)
 		}
-		if multiFactorInfo.FactorID == phoneMultiFactor {
+		if multiFactorInfo.FactorID == phoneMultiFactorID {
 			if err := validatePhone(multiFactorInfo.PhoneNumber); err != nil {
 				return nil, fmt.Errorf("the second factor \"phoneNumber\" for \"%s\" must be a non-empty E.164 standard compliant identifier string", multiFactorInfo.PhoneNumber)
 			}
@@ -1083,7 +1083,7 @@ func (r *userQueryResponse) makeExportedUserRecord() (*ExportedUserRecord, error
 			UID:                 factor.MFAEnrollmentID,
 			DisplayName:         factor.DisplayName,
 			EnrollmentTimestamp: enrollmentTimestamp,
-			FactorID:            phoneMultiFactor,
+			FactorID:            phoneMultiFactorID,
 			PhoneNumber:         factor.PhoneInfo,
 		})
 	}

auth/user_mgt_test.go

@@ -647,7 +647,7 @@ func TestInvalidCreateUser(t *testing.T) {
 				EnrolledFactors: []*MultiFactorInfo{
 					{
 						UID:         "EnrollmentID",
-						PhoneNumber: "+16505557348",
+						PhoneNumber: "+11234567890",
 						DisplayName: "Spouse's phone number",
 						FactorID:    "phone",
 					},
@@ -669,7 +669,7 @@ func TestInvalidCreateUser(t *testing.T) {
 			(&UserToCreate{}).MFASettings(MultiFactorSettings{
 				EnrolledFactors: []*MultiFactorInfo{
 					{
-						PhoneNumber:         "+16505557348",
+						PhoneNumber:         "+11234567890",
 						DisplayName:         "Spouse's phone number",
 						FactorID:            "phone",
 						EnrollmentTimestamp: time.Now().UTC().Unix(),
@@ -681,7 +681,7 @@ func TestInvalidCreateUser(t *testing.T) {
 			(&UserToCreate{}).MFASettings(MultiFactorSettings{
 				EnrolledFactors: []*MultiFactorInfo{
 					{
-						PhoneNumber: "+16505557348",
+						PhoneNumber: "+11234567890",
 						DisplayName: "Spouse's phone number",
 						FactorID:    "",
 					},
@@ -692,7 +692,7 @@ func TestInvalidCreateUser(t *testing.T) {
 			(&UserToCreate{}).MFASettings(MultiFactorSettings{
 				EnrolledFactors: []*MultiFactorInfo{
 					{
-						PhoneNumber: "+16505557348",
+						PhoneNumber: "+11234567890",
 						FactorID:    "phone",
 					},
 				},
@@ -773,15 +773,15 @@ var createUserCases = []struct {
 		(&UserToCreate{}).MFASettings(MultiFactorSettings{
 			EnrolledFactors: []*MultiFactorInfo{
 				{
-					PhoneNumber: "+16505557348",
+					PhoneNumber: "+11234567890",
 					DisplayName: "Spouse's phone number",
 					FactorID:    "phone",
 				},
 			},
 		}),
 		map[string]interface{}{"mfaInfo": []*multiFactorInfoResponse{
 			{
-				PhoneInfo:   "+16505557348",
+				PhoneInfo:   "+11234567890",
 				DisplayName: "Spouse's phone number",
 			},
 		},
@@ -790,24 +790,24 @@ var createUserCases = []struct {
 		(&UserToCreate{}).MFASettings(MultiFactorSettings{
 			EnrolledFactors: []*MultiFactorInfo{
 				{
-					PhoneNumber: "+16505557348",
+					PhoneNumber: "+11234567890",
 					DisplayName: "number1",
 					FactorID:    "phone",
 				},
 				{
-					PhoneNumber: "+16505557348",
+					PhoneNumber: "+11234567890",
 					DisplayName: "number2",
 					FactorID:    "phone",
 				},
 			},
 		}),
 		map[string]interface{}{"mfaInfo": []*multiFactorInfoResponse{
 			{
-				PhoneInfo:   "+16505557348",
+				PhoneInfo:   "+11234567890",
 				DisplayName: "number1",
 			},
 			{
-				PhoneInfo:   "+16505557348",
+				PhoneInfo:   "+11234567890",
 				DisplayName: "number2",
 			},
 		},
@@ -876,7 +876,7 @@ func TestInvalidUpdateUser(t *testing.T) {
 				EnrolledFactors: []*MultiFactorInfo{
 					{
 						UID:         "enrolledSecondFactor1",
-						PhoneNumber: "+16505557348",
+						PhoneNumber: "+11234567890",
 						FactorID:    "phone",
 					},
 				},
@@ -898,7 +898,7 @@ func TestInvalidUpdateUser(t *testing.T) {
 			(&UserToUpdate{}).MFASettings(MultiFactorSettings{
 				EnrolledFactors: []*MultiFactorInfo{
 					{
-						PhoneNumber: "+16505557348",
+						PhoneNumber: "+11234567890",
 						FactorID:    "phone",
 						DisplayName: "Spouse's phone number",
 					},
@@ -1050,13 +1050,13 @@ var updateUserCases = []struct {
 			EnrolledFactors: []*MultiFactorInfo{
 				{
 					UID:                 "enrolledSecondFactor1",
-					PhoneNumber:         "+16505557348",
+					PhoneNumber:         "+11234567890",
 					DisplayName:         "Spouse's phone number",
 					FactorID:            "phone",
 					EnrollmentTimestamp: time.Now().Unix(),
 				}, {
 					UID:         "enrolledSecondFactor2",
-					PhoneNumber: "+16505557348",
+					PhoneNumber: "+11234567890",
 					DisplayName: "Spouse's phone number",
 					FactorID:    "phone",
 				},
@@ -1065,14 +1065,14 @@ var updateUserCases = []struct {
 		map[string]interface{}{"mfaInfo": []*multiFactorInfoResponse{
 			{
 				MFAEnrollmentID: "enrolledSecondFactor1",
-				PhoneInfo:       "+16505557348",
+				PhoneInfo:       "+11234567890",
 				DisplayName:     "Spouse's phone number",
 				EnrolledAt:      time.Now().Format("2006-01-02T15:04:05Z07:00Z"),
 			},
 			{
 				MFAEnrollmentID: "enrolledSecondFactor2",
 				DisplayName:     "Spouse's phone number",
-				PhoneInfo:       "+16505557348",
+				PhoneInfo:       "+11234567890",
 			},
 		},
 		},

integration/auth/user_mgt_test.go

@@ -434,7 +434,7 @@ func TestCreateUserMFA(t *testing.T) {
 	tc.MFASettings(auth.MultiFactorSettings{
 		EnrolledFactors: []*auth.MultiFactorInfo{
 			{
-				PhoneNumber: "+16505557348",
+				PhoneNumber: "+11234567890",
 				DisplayName: "Spouse's phone number",
 				FactorID:    "phone",
 			},
@@ -451,7 +451,7 @@ func TestCreateUserMFA(t *testing.T) {
 			UID:                 user.MultiFactor.EnrolledFactors[0].UID,
 			DisplayName:         "Spouse's phone number",
 			FactorID:            "phone",
-			PhoneNumber:         "+16505557348",
+			PhoneNumber:         "+11234567890",
 			EnrollmentTimestamp: user.MultiFactor.EnrolledFactors[0].EnrollmentTimestamp,
 		},
 	}