set returnUserInfo to true when undefined

Author: lahirumaramba

auth/tenant_mgt_test.go

@@ -103,8 +103,9 @@ func TestTenantQueryUsers(t *testing.T) {
 		t.Fatalf("Failed to create tenant client: %v", err)
 	}
 
+	returnUserInfo := true
 	query := &QueryUsersRequest{
-		ReturnUserInfo: true,
+		ReturnUserInfo: &returnUserInfo,
 	}
 
 	_, err = tenantClient.QueryUsers(context.Background(), query)

auth/user_mgt.go

@@ -1068,7 +1068,7 @@ type Expression struct {
 
 // QueryUsersRequest is the request structure for the accounts:query endpoint.
 type QueryUsersRequest struct {
-	ReturnUserInfo bool          `json:"returnUserInfo"`
+	ReturnUserInfo *bool         `json:"returnUserInfo,omitempty"`
 	Limit          int64         `json:"limit,string,omitempty"`
 	Offset         int64         `json:"offset,string,omitempty"`
 	SortBy         SortBy        `json:"-"`
@@ -1101,14 +1101,20 @@ func (q *QueryUsersRequest) build() interface{} {
 	}
 
 	type queryUsersRequestInternal QueryUsersRequest
+	internal := (*queryUsersRequestInternal)(q)
+	if internal.ReturnUserInfo == nil {
+		t := true
+		internal.ReturnUserInfo = &t
+	}
+
 	return &struct {
 		SortBy string `json:"sortBy,omitempty"`
 		Order  string `json:"order,omitempty"`
 		*queryUsersRequestInternal
 	}{
 		SortBy:                    sortBy,
 		Order:                     order,
-		queryUsersRequestInternal: (*queryUsersRequestInternal)(q),
+		queryUsersRequestInternal: internal,
 	}
 }
 

auth/user_mgt_test.go

@@ -1942,8 +1942,9 @@ func TestQueryUsers(t *testing.T) {
 	s := echoServer([]byte(resp), t)
 	defer s.Close()
 
-	query := &QueryUsersRequest{
-		ReturnUserInfo: true,
+	returnUserInfo := true
+	query := &QueryUsersRequest {
+		ReturnUserInfo: &returnUserInfo,
 		Limit:          1,
 		SortBy:         UserEmail,
 		Order:          Asc,
@@ -1987,8 +1988,9 @@ func TestQueryUsersError(t *testing.T) {
 	defer s.Close()
 	s.Status = http.StatusBadRequest
 
+	returnUserInfo := true
 	query := &QueryUsersRequest{
-		ReturnUserInfo: true,
+		ReturnUserInfo: &returnUserInfo,
 		Limit:          1,
 		SortBy:         UserEmail,
 		Order:          Asc,
@@ -2505,3 +2507,33 @@ func echoServer(resp interface{}, t *testing.T) *mockAuthServer {
 func (s *mockAuthServer) Close() {
 	s.Srv.Close()
 }
+
+func TestQueryUsersDefaultReturnUserInfo(t *testing.T) {
+	resp := `{
+		"userInfo": [{
+			"localId": "testuser"
+		}],
+		"recordsCount": "1"
+	}`
+	s := echoServer([]byte(resp), t)
+	defer s.Close()
+
+	// ReturnUserInfo is nil, should default to true in build()
+	query := &QueryUsersRequest{
+		Limit: 1,
+	}
+
+	_, err := s.Client.QueryUsers(context.Background(), query)
+	if err != nil {
+		t.Fatalf("QueryUsers() = %v", err)
+	}
+
+	var got map[string]interface{}
+	if err := json.Unmarshal(s.Rbody, &got); err != nil {
+		t.Fatal(err)
+	}
+
+	if got["returnUserInfo"] != true {
+		t.Errorf("QueryUsers() request[\"returnUserInfo\"] = %v; want true", got["returnUserInfo"])
+	}
+}

integration/auth/user_mgt_test.go

@@ -1461,7 +1461,7 @@ func TestQueryUsers(t *testing.T) {
 		t.Fatalf("QueryUsers() = %v", err)
 	}
 	if len(result.Users) != 1 || result.Users[0].UID != u1.UID {
-		t.Errorf("QueryUsers(email=%s) = %v; want user %s", u1.Email, result.Users, u1.UID)
+		t.Errorf("QueryUsers(uid=%s) = %v; want user %s", u1.UID, result.Users, u1.UID)
 	}
 
 	// Query with limit and sort