@@ -78,25 +78,16 @@ public static async Task<IGroupMembersCollectionWithReferencesPage> GetGroupMemb
78
78
79
79
try
80
80
{
81
- var group = await graphClient . Groups [ groupId ] . Request ( ) . GetAsync ( ) ;
81
+ var group = await graphClient . Groups [ groupId ] . Request ( ) . Expand ( "members" ) . GetAsync ( ) ;
82
82
members = group . Members ;
83
83
84
- //Work around the fact that some groups don't have owners.
85
- //Return a non-null collection whenever the call has worked
86
- //but the group has no owners.
87
- if ( members != null )
84
+
85
+ foreach ( var member in members )
88
86
{
89
- foreach ( var member in members )
90
- {
91
- Debug . WriteLine ( "Member Id:" + member . Id ) ;
87
+ Debug . WriteLine ( "Member Id:" + member . Id ) ;
92
88
93
- }
94
89
}
95
90
96
- else
97
- {
98
- members = new GroupMembersCollectionWithReferencesPage ( ) ;
99
- }
100
91
}
101
92
102
93
catch ( ServiceException e )
@@ -117,24 +108,13 @@ public static async Task<IGroupOwnersCollectionWithReferencesPage> GetGroupOwner
117
108
try
118
109
{
119
110
120
- var group = await graphClient . Groups [ groupId ] . Request ( ) . GetAsync ( ) ;
111
+ var group = await graphClient . Groups [ groupId ] . Request ( ) . Expand ( "owners" ) . GetAsync ( ) ;
121
112
owners = group . Owners ;
122
113
123
-
124
- //Work around the fact that some groups don't have owners.
125
- //Return a non-null collection whenever the call has worked
126
- //but the group has no owners.
127
- if ( owners != null )
114
+ foreach ( var owner in owners )
128
115
{
129
- foreach ( var owner in owners )
130
- {
131
- Debug . WriteLine ( "Owner Id:" + owner . Id ) ;
132
- }
116
+ Debug . WriteLine ( "Owner Id:" + owner . Id ) ;
133
117
}
134
- else
135
- {
136
- owners = new GroupOwnersCollectionWithReferencesPage ( ) ;
137
- }
138
118
139
119
}
140
120
0 commit comments