fix(auth): Removed MultiFactoryID public type (#431)

Author: hiranya911

auth/user_mgt.go

@@ -65,21 +65,12 @@ type multiFactorInfoResponse struct {
 	EnrolledAt      string `json:"enrolledAt,omitempty"`
 }
 
-// MultiFactorID represents the type of an enrolled factor, for now only Phone
-// is available.
-type MultiFactorID string
-
-const (
-	// Phone represents an enrolled factor of type Phone / SMS
-	Phone MultiFactorID = "phone"
-)
-
 // MultiFactorInfo describes a user enrolled second phone factor.
 type MultiFactorInfo struct {
 	UID                 string
 	DisplayName         string
 	EnrollmentTimestamp int64
-	FactorID            MultiFactorID
+	FactorID            string
 	PhoneNumber         string
 }
 
@@ -994,11 +985,15 @@ func (r *userQueryResponse) makeExportedUserRecord() (*ExportedUserRecord, error
 			enrollmentTimestamp = t.Unix() * 1000
 		}
 
+		if factor.PhoneInfo == "" {
+			return nil, fmt.Errorf("unsupported multi-factor auth response: %#v", factor)
+		}
+
 		enrolledFactors = append(enrolledFactors, &MultiFactorInfo{
 			UID:                 factor.MFAEnrollmentID,
 			DisplayName:         factor.DisplayName,
 			EnrollmentTimestamp: enrollmentTimestamp,
-			FactorID:            Phone,
+			FactorID:            "phone",
 			PhoneNumber:         factor.PhoneInfo,
 		})
 	}

auth/user_mgt_test.go

@@ -44,8 +44,7 @@ var testUser = &UserRecord{
 		PhotoURL:    "http://www.example.com/testuser/photo.png",
 		ProviderID:  defaultProviderID,
 	},
-	Disabled: false,
-
+	Disabled:      false,
 	EmailVerified: true,
 	ProviderUserInfo: []*UserInfo{
 		{
@@ -71,7 +70,7 @@ var testUser = &UserRecord{
 		EnrolledFactors: []*MultiFactorInfo{
 			{
 				UID:                 "0aaded3f-5e73-461d-aef9-37b48e3769be",
-				FactorID:            Phone,
+				FactorID:            "phone",
 				EnrollmentTimestamp: 1614776780000,
 				PhoneNumber:         "+1234567890",
 				DisplayName:         "My MFA Phone",
@@ -80,7 +79,6 @@ var testUser = &UserRecord{
 	},
 }
 
-var emptyFactors []*MultiFactorInfo
 var testUserWithoutMFA = &UserRecord{
 	UserInfo: &UserInfo{
 		UID:         "testusernomfa",
@@ -90,8 +88,7 @@ var testUserWithoutMFA = &UserRecord{
 		PhotoURL:    "http://www.example.com/testusernomfa/photo.png",
 		ProviderID:  defaultProviderID,
 	},
-	Disabled: false,
-
+	Disabled:      false,
 	EmailVerified: true,
 	ProviderUserInfo: []*UserInfo{
 		{
@@ -113,9 +110,7 @@ var testUserWithoutMFA = &UserRecord{
 	},
 	CustomClaims: map[string]interface{}{"admin": true, "package": "gold"},
 	TenantID:     "testTenant",
-	MultiFactor: &MultiFactorSettings{
-		EnrolledFactors: emptyFactors,
-	},
+	MultiFactor:  &MultiFactorSettings{},
 }
 
 func TestGetUser(t *testing.T) {
@@ -1677,6 +1672,22 @@ func TestMakeExportedUser(t *testing.T) {
 	}
 }
 
+func TestUnsupportedAuthFactor(t *testing.T) {
+	queryResponse := &userQueryResponse{
+		UID: "uid1",
+		MFAInfo: []*multiFactorInfoResponse{
+			{
+				MFAEnrollmentID: "enrollementId",
+			},
+		},
+	}
+
+	exported, err := queryResponse.makeExportedUserRecord()
+	if exported != nil || err == nil {
+		t.Errorf("makeExportedUserRecord() = (%v, %v); want = (nil, error)", exported, err)
+	}
+}
+
 func TestExportedUserRecordShouldClearRedacted(t *testing.T) {
 	queryResponse := &userQueryResponse{
 		UID:          "uid1",