Skip to content

Commit 00881f2

Browse files
Licantrop0Licantrop0
committed
enhancements in dialog handling for WinUI
Updated README.md added pagesize parameter for WPF project
1 parent 1d70f29 commit 00881f2

File tree

17 files changed

+198
-238
lines changed

17 files changed

+198
-238
lines changed

‎.vscode/tasks.json‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎MsGraph Samples.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.10.35013.160
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsGraphSamples.Services", "MsGraphSamples.Services\MsGraphSamples.Services.csproj", "{1E9C3189-31E3-4D46-B9B2-CD221E6882B3}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSGraphSamples.WPF", "MsGraphSamples.WPF\MSGraphSamples.WPF.csproj", "{C0A150FB-2AB2-4818-AF59-E6C0BD71D510}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsGraphSamples.WPF", "MsGraphSamples.WPF\MsGraphSamples.WPF.csproj", "{C0A150FB-2AB2-4818-AF59-E6C0BD71D510}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsGraphSamples.WinUI", "MsGraphSamples.WinUI\MsGraphSamples.WinUI.csproj", "{9CA749CB-90C9-4338-8812-2D5939B77233}"
1111
EndProject
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{85C2D888-4
2121
docs\api_permissions.png = docs\api_permissions.png
2222
docs\app1.png = docs\app1.png
2323
docs\register_app.png = docs\register_app.png
24+
docs\solution_explorer.png = docs\solution_explorer.png
2425
EndProjectSection
2526
EndProject
2627
Global

‎MsGraphSamples.Services/AsyncEnumerableGraphDataService.cs‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public interface IAsyncEnumerableGraphDataService
3030

3131
public class AsyncEnumerableGraphDataService(GraphServiceClient graphClient) : IAsyncEnumerableGraphDataService
3232
{
33-
private readonly GraphServiceClient _graphClient = graphClient;
3433
private readonly RequestHeaders EventualConsistencyHeader = new() { { "ConsistencyLevel", "eventual" } };
3534

3635
public string? LastUrl { get; private set; } = null;
@@ -40,30 +39,30 @@ public class AsyncEnumerableGraphDataService(GraphServiceClient graphClient) : I
4039
public Task<User?> GetUserAsync(string[] select, string? id = null)
4140
{
4241
return id == null
43-
? _graphClient.Me.GetAsync(rc => rc.QueryParameters.Select = select)
44-
: _graphClient.Users[id].GetAsync(rc => rc.QueryParameters.Select = select);
42+
? graphClient.Me.GetAsync(rc => rc.QueryParameters.Select = select)
43+
: graphClient.Users[id].GetAsync(rc => rc.QueryParameters.Select = select);
4544
}
4645

4746
public IAsyncEnumerable<User> GetUsersInBatch(string[] select, ushort top = 999, CancellationToken cancellationToken = default)
4847
{
49-
return _graphClient.Batch<User, UserCollectionResponse>(cancellationToken,
50-
_graphClient.Users.ToGetRequestInformation(rc =>
48+
return graphClient.Batch<User, UserCollectionResponse>(cancellationToken,
49+
graphClient.Users.ToGetRequestInformation(rc =>
5150
{
5251
rc.Headers = EventualConsistencyHeader;
5352
rc.QueryParameters.Count = true;
5453
rc.QueryParameters.Select = select;
5554
rc.QueryParameters.Filter = "startsWith(displayName, 'x')";
5655
rc.QueryParameters.Top = top;
5756
}),
58-
_graphClient.Users.ToGetRequestInformation(rc =>
57+
graphClient.Users.ToGetRequestInformation(rc =>
5958
{
6059
rc.Headers = EventualConsistencyHeader;
6160
rc.QueryParameters.Count = true;
6261
rc.QueryParameters.Select = select;
6362
rc.QueryParameters.Filter = "startsWith(displayName, 'y')";
6463
rc.QueryParameters.Top = top;
6564
}),
66-
_graphClient.Users.ToGetRequestInformation(rc =>
65+
graphClient.Users.ToGetRequestInformation(rc =>
6766
{
6867
rc.Headers = EventualConsistencyHeader;
6968
rc.QueryParameters.Count = true;
@@ -75,7 +74,7 @@ public IAsyncEnumerable<User> GetUsersInBatch(string[] select, ushort top = 999,
7574

7675
public IAsyncEnumerable<Application> GetApplications(string[] select, string? filter = null, string[]? orderBy = null, string? search = null, ushort top = 999, CancellationToken cancellationToken = default)
7776
{
78-
var requestInfo = _graphClient.Applications
77+
var requestInfo = graphClient.Applications
7978
.ToGetRequestInformation(rc =>
8079
{
8180
rc.Headers = EventualConsistencyHeader;
@@ -88,12 +87,12 @@ public IAsyncEnumerable<Application> GetApplications(string[] select, string? fi
8887
});
8988

9089
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
91-
return requestInfo.ToAsyncEnumerable<Application, ApplicationCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
90+
return requestInfo.ToAsyncEnumerable<Application, ApplicationCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
9291
}
9392

9493
public IAsyncEnumerable<ServicePrincipal> GetServicePrincipals(string[] select, string? filter, string[]? orderBy, string? search = null, ushort top = 999, CancellationToken cancellationToken = default)
9594
{
96-
var requestInfo = _graphClient.ServicePrincipals
95+
var requestInfo = graphClient.ServicePrincipals
9796
.ToGetRequestInformation(rc =>
9897
{
9998
rc.Headers = EventualConsistencyHeader;
@@ -106,12 +105,12 @@ public IAsyncEnumerable<ServicePrincipal> GetServicePrincipals(string[] select,
106105
});
107106

108107
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
109-
return requestInfo.ToAsyncEnumerable<ServicePrincipal, ServicePrincipalCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
108+
return requestInfo.ToAsyncEnumerable<ServicePrincipal, ServicePrincipalCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
110109
}
111110

112111
public IAsyncEnumerable<Device> GetDevices(string[] select, string? filter = null, string[]? orderBy = null, string? search = null, ushort top = 999, CancellationToken cancellationToken = default)
113112
{
114-
var requestInfo = _graphClient.Devices
113+
var requestInfo = graphClient.Devices
115114
.ToGetRequestInformation(rc =>
116115
{
117116
rc.Headers = EventualConsistencyHeader;
@@ -124,12 +123,12 @@ public IAsyncEnumerable<Device> GetDevices(string[] select, string? filter = nul
124123
});
125124

126125
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
127-
return requestInfo.ToAsyncEnumerable<Device, DeviceCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
126+
return requestInfo.ToAsyncEnumerable<Device, DeviceCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
128127
}
129128

130129
public IAsyncEnumerable<Group> GetGroups(string[] select, string? filter = null, string[]? orderBy = null, string? search = null, ushort top = 999, CancellationToken cancellationToken = default)
131130
{
132-
var requestInfo = _graphClient.Groups
131+
var requestInfo = graphClient.Groups
133132
.ToGetRequestInformation(rc =>
134133
{
135134
rc.Headers = EventualConsistencyHeader;
@@ -142,12 +141,12 @@ public IAsyncEnumerable<Group> GetGroups(string[] select, string? filter = null,
142141
});
143142

144143
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
145-
return requestInfo.ToAsyncEnumerable<Group, GroupCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
144+
return requestInfo.ToAsyncEnumerable<Group, GroupCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
146145
}
147146

148147
public IAsyncEnumerable<User> GetUsers(string[] select, string? filter = null, string[]? orderBy = null, string? search = null, ushort top = 999, CancellationToken cancellationToken = default)
149148
{
150-
var requestInfo = _graphClient.Users
149+
var requestInfo = graphClient.Users
151150
.ToGetRequestInformation(rc =>
152151
{
153152
rc.Headers = EventualConsistencyHeader;
@@ -160,12 +159,12 @@ public IAsyncEnumerable<User> GetUsers(string[] select, string? filter = null, s
160159
});
161160

162161
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
163-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
162+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
164163
}
165164

166165
public IAsyncEnumerable<User> GetApplicationOwnersAsUsers(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
167166
{
168-
var requestInfo = _graphClient.Applications[id]
167+
var requestInfo = graphClient.Applications[id]
169168
.Owners.GraphUser
170169
.ToGetRequestInformation(rc =>
171170
{
@@ -176,12 +175,12 @@ public IAsyncEnumerable<User> GetApplicationOwnersAsUsers(string id, string[] se
176175
});
177176

178177
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
179-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
178+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
180179
}
181180

182181
public IAsyncEnumerable<User> GetServicePrincipalOwnersAsUsers(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
183182
{
184-
var requestInfo = _graphClient.ServicePrincipals[id]
183+
var requestInfo = graphClient.ServicePrincipals[id]
185184
.Owners.GraphUser
186185
.ToGetRequestInformation(rc =>
187186
{
@@ -192,12 +191,12 @@ public IAsyncEnumerable<User> GetServicePrincipalOwnersAsUsers(string id, string
192191
});
193192

194193
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
195-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
194+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
196195
}
197196

198197
public IAsyncEnumerable<User> GetDeviceOwnersAsUsers(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
199198
{
200-
var requestInfo = _graphClient.Devices[id]
199+
var requestInfo = graphClient.Devices[id]
201200
.RegisteredOwners.GraphUser
202201
.ToGetRequestInformation(rc =>
203202
{
@@ -208,12 +207,12 @@ public IAsyncEnumerable<User> GetDeviceOwnersAsUsers(string id, string[] select,
208207
});
209208

210209
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
211-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
210+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
212211
}
213212

214213
public IAsyncEnumerable<User> GetGroupOwnersAsUsers(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
215214
{
216-
var requestInfo = _graphClient.Groups[id]
215+
var requestInfo = graphClient.Groups[id]
217216
.Owners.GraphUser
218217
.ToGetRequestInformation(rc =>
219218
{
@@ -225,12 +224,12 @@ public IAsyncEnumerable<User> GetGroupOwnersAsUsers(string id, string[] select,
225224
});
226225

227226
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
228-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
227+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
229228
}
230229

231230
public IAsyncEnumerable<Group> GetTransitiveMemberOfAsGroups(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
232231
{
233-
var requestInfo = _graphClient.Users[id]
232+
var requestInfo = graphClient.Users[id]
234233
.TransitiveMemberOf.GraphGroup
235234
.ToGetRequestInformation(rc =>
236235
{
@@ -241,12 +240,12 @@ public IAsyncEnumerable<Group> GetTransitiveMemberOfAsGroups(string id, string[]
241240
});
242241

243242
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
244-
return requestInfo.ToAsyncEnumerable<Group, GroupCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
243+
return requestInfo.ToAsyncEnumerable<Group, GroupCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
245244
}
246245

247246
public IAsyncEnumerable<User> GetTransitiveMembersAsUsers(string id, string[] select, ushort top = 999, CancellationToken cancellationToken = default)
248247
{
249-
var requestInfo = _graphClient.Groups[id]
248+
var requestInfo = graphClient.Groups[id]
250249
.TransitiveMembers.GraphUser
251250
.ToGetRequestInformation(rc =>
252251
{
@@ -257,6 +256,6 @@ public IAsyncEnumerable<User> GetTransitiveMembersAsUsers(string id, string[] se
257256
});
258257

259258
LastUrl = WebUtility.UrlDecode(requestInfo.URI.AbsoluteUri);
260-
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(_graphClient.RequestAdapter, SetCount, cancellationToken);
259+
return requestInfo.ToAsyncEnumerable<User, UserCollectionResponse>(graphClient.RequestAdapter, SetCount, cancellationToken);
261260
}
262261
}

‎MsGraphSamples.Services/AuthService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public class AuthService : IAuthService
2929
public AuthService()
3030
{
3131
var localAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
32-
var appName = AppDomain.CurrentDomain.FriendlyName;
33-
_tokenPath = Path.Combine(localAppData, appName, "authToken.bin");
32+
_tokenPath = Path.Combine(localAppData, AppDomain.CurrentDomain.FriendlyName, "authToken.bin");
3433
}
3534

3635
private ClientSecretCredential GetAppCredential() => new(

0 commit comments

Comments
 (0)