Skip to content

Commit 4ad2a12

Browse files
michael-hawkermichael-hawker
authored
Merge branch 'master' into mhawker/localization-override-fix
2 parents bf15828 + 0e2d49f commit 4ad2a12

File tree

84 files changed

+1137
-704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1137
-704
lines changed

‎Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
This .NET standard library enables access to different data sources such as Microsoft Graph, OneDrive, Twitter, Microsoft Translator, and LinkedIn. It is part of the Windows Community Toolkit.
88
</Description>
99
<PackageTags>UWP Community Toolkit Windows Microsoft Graph OneDrive Twitter Translator LinkedIn service login OAuth</PackageTags>
10-
10+
<LangVersion>8.0</LangVersion>
1111
<NoWarn>CS8002;CS0618</NoWarn>
1212
<DeterministicSourcePaths Condition="'$(EnableSourceLink)' == ''">false</DeterministicSourcePaths>
1313
</PropertyGroup>
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
30+
<PackageReference Include="System.Text.Json" Version="4.7.2" />
3131
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3232
</ItemGroup>
3333

@@ -50,4 +50,4 @@
5050
<ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">
5151
<Compile Remove="PlatformSpecific\Uwp\**\*" />
5252
</ItemGroup>
53-
</Project>
53+
</Project>

‎Microsoft.Toolkit.Services/Properties/Microsoft.Toolkit.Services.rd.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
3+
<Library Name="Microsoft.Toolkit.Services">
4+
<Namespace Name="System.Text.Json.Serialization.Converters" Dynamic="Required All"/>
5+
</Library>
6+
</Directives>

‎Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
using System.Diagnostics;
88
using System.Net.Http;
99
using System.Text;
10+
using System.Text.Json;
1011
using System.Threading.Tasks;
1112
using Microsoft.Toolkit.Services.Core;
12-
using Newtonsoft.Json.Linq;
1313

1414
#if WINRT
1515
using Microsoft.Toolkit.Services.PlatformSpecific.Uwp;
@@ -81,7 +81,8 @@ public LinkedInDataProvider(LinkedInOAuthTokens tokens, LinkedInPermissions requ
8181
throw new ArgumentException("Missing callback uri");
8282
}
8383

84-
if (!Enum.IsDefined(typeof(LinkedInPermissions), requiredPermissions))
84+
// Check if its a valid combination of LinkedInPermissions
85+
if ((~(int)LinkedInPermissionsHelpers.AllPermissions & (int)requiredPermissions) != 0)
8586
{
8687
throw new ArgumentException("Error retrieving required permissions");
8788
}
@@ -186,22 +187,18 @@ public async Task<IEnumerable<TSchema>> GetDataAsync<TSchema>(LinkedInDataConfig
186187

187188
var url = $"{_baseUrl}{config.Query}/~:({fields})?oauth2_access_token={Tokens.AccessToken}&format=json&count={maxRecords}&start={startRecord}";
188189

189-
using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url)))
190-
{
191-
request.Headers.Connection.TryParseAdd("Keep-Alive");
192-
193-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
194-
{
195-
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
190+
using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, new Uri(url));
191+
request.Headers.Connection.TryParseAdd("Keep-Alive");
196192

197-
if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
198-
{
199-
return parser.Parse(data);
200-
}
193+
using var response = await client.SendAsync(request).ConfigureAwait(false);
194+
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
201195

202-
throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
203-
}
196+
if (response.IsSuccessStatusCode && !string.IsNullOrEmpty(data))
197+
{
198+
return parser.Parse(data);
204199
}
200+
201+
throw new RequestFailedException((System.Net.HttpStatusCode)response.StatusCode, data);
205202
}
206203

207204
/// <summary>
@@ -222,22 +219,18 @@ public async Task<U> ShareDataAsync<T, U>(T dataToShare)
222219

223220
var url = $"{_baseUrl}/people/~/shares?oauth2_access_token={Tokens.AccessToken}&format=json";
224221

225-
using (HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
226-
{
227-
request.Headers.Add("x-li-format", "json");
228-
var stringContent = requestParser.Parse(shareRequest);
229-
request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
222+
using HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
223+
request.Headers.Add("x-li-format", "json");
224+
var stringContent = requestParser.Parse(shareRequest);
225+
request.Content = new StringContent(stringContent, Encoding.UTF8, "application/json");
230226

231-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
232-
{
233-
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
227+
using var response = await client.SendAsync(request).ConfigureAwait(false);
228+
var data = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
234229

235-
var responseParser = new LinkedInParser<U>();
230+
var responseParser = new LinkedInParser<U>();
236231

237-
var listResults = responseParser.Parse(data) as List<U>;
238-
return listResults[0];
239-
}
240-
}
232+
var listResults = responseParser.Parse(data) as List<U>;
233+
return listResults[0];
241234
}
242235

243236
return default(U);
@@ -263,15 +256,13 @@ private async Task<string> GetAccessTokenAsync(LinkedInOAuthTokens tokens, strin
263256
+ "&client_id=" + tokens.ClientId
264257
+ "&client_secret=" + tokens.ClientSecret;
265258

266-
using (var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url)))
267-
{
268-
using (var response = await client.SendAsync(request).ConfigureAwait(false))
269-
{
270-
var jsonString = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
271-
var json = JObject.Parse(jsonString);
272-
return json.GetValue("access_token").Value<string>();
273-
}
274-
}
259+
using var request = new HttpRequestMessage(HttpMethod.Post, new Uri(url));
260+
using var response = await client.SendAsync(request).ConfigureAwait(false);
261+
using var jsonStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
262+
using var jsonDoc = await JsonDocument.ParseAsync(jsonStream).ConfigureAwait(false);
263+
264+
var value = jsonDoc.RootElement.GetProperty("access_token");
265+
return value.GetString();
275266
}
276267

277268
private async Task<string> GetAuthorizeCodeAsync(LinkedInOAuthTokens tokens, LinkedInPermissions permissions)

‎Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInParser.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Collections.Generic;
6-
using Newtonsoft.Json;
6+
using System.Text.Json;
77

88
namespace Microsoft.Toolkit.Services.LinkedIn
99
{
@@ -24,11 +24,11 @@ public IEnumerable<T> Parse(string data)
2424

2525
try
2626
{
27-
results = JsonConvert.DeserializeObject<List<T>>(data);
27+
results = JsonSerializer.Deserialize<List<T>>(data);
2828
}
29-
catch (JsonSerializationException)
29+
catch (JsonException)
3030
{
31-
T linkedInResult = JsonConvert.DeserializeObject<T>(data);
31+
T linkedInResult = JsonSerializer.Deserialize<T>(data);
3232
results = new List<T> { linkedInResult };
3333
}
3434

@@ -42,7 +42,7 @@ public IEnumerable<T> Parse(string data)
4242
/// <returns>Returns string data.</returns>
4343
public string Parse(T dataToShare)
4444
{
45-
return JsonConvert.SerializeObject(dataToShare, Formatting.None, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
45+
return JsonSerializer.Serialize(dataToShare, typeof(T), new JsonSerializerOptions { IgnoreNullValues = true });
4646
}
4747
}
4848
}

‎Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInPermissions.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,18 @@ public enum LinkedInPermissions
3737
/// </summary>
3838
WriteShare = 8
3939
}
40+
41+
#pragma warning disable SA1649 // File name should match first type name
42+
internal static class LinkedInPermissionsHelpers
43+
{
44+
/// <summary>
45+
/// Internal AllPermissions for LinkedInPermissions, so we don't expose it. Keep it in sync with <see cref="LinkedInPermissions"/>
46+
/// </summary>
47+
internal const LinkedInPermissions AllPermissions =
48+
LinkedInPermissions.ReadBasicProfile |
49+
LinkedInPermissions.ReadEmailAddress |
50+
LinkedInPermissions.ReadWriteCompanyAdmin |
51+
LinkedInPermissions.WriteShare;
52+
}
53+
#pragma warning restore SA1649 // File name should match first type name
4054
}

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/AzureAuthToken.cs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
using System;
66
using System.Net.Http;
7+
using System.Text.Json;
78
using System.Threading.Tasks;
8-
using Newtonsoft.Json;
99

1010
namespace Microsoft.Toolkit.Services.MicrosoftTranslator
1111
{
@@ -24,6 +24,9 @@ internal class AzureAuthToken
2424
/// </summary>
2525
private static readonly Uri ServiceUrl = new Uri("https://api.cognitive.microsoft.com/sts/v1.0/issueToken");
2626

27+
// TODO
28+
// private static readonly Uri ServiceUrl = new Uri(THIS SHOULD BE A PARAMETER NOW);
29+
2730
/// <summary>
2831
/// After obtaining a valid token, this class will cache it for this duration.
2932
/// Use a duration of 8 minutes, which is less than the actual token lifetime of 10 minutes.
@@ -90,24 +93,22 @@ public async Task<string> GetAccessTokenAsync()
9093
return _storedTokenValue;
9194
}
9295

93-
using (var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl))
94-
{
95-
request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
96+
using var request = new HttpRequestMessage(HttpMethod.Post, ServiceUrl);
97+
request.Headers.Add(OcpApimSubscriptionKeyHeader, SubscriptionKey);
9698

97-
var response = await client.SendAsync(request).ConfigureAwait(false);
98-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
99+
var response = await client.SendAsync(request).ConfigureAwait(false);
100+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
99101

100-
if (!response.IsSuccessStatusCode)
101-
{
102-
var error = JsonConvert.DeserializeObject<ErrorResponse>(content);
103-
throw new TranslatorServiceException(error.Message);
104-
}
102+
if (!response.IsSuccessStatusCode)
103+
{
104+
var error = JsonSerializer.Deserialize<ErrorResponse>(content);
105+
throw new TranslatorServiceException(error?.Error?.Message);
106+
}
105107

106-
_storedTokenTime = DateTime.Now;
107-
_storedTokenValue = $"Bearer {content}";
108+
_storedTokenTime = DateTime.Now;
109+
_storedTokenValue = $"Bearer {content}";
108110

109-
return _storedTokenValue;
110-
}
111+
return _storedTokenValue;
111112
}
112113
}
113114
}

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ErrorResponse.cs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,27 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.Text.Json.Serialization;
6+
57
namespace Microsoft.Toolkit.Services.MicrosoftTranslator
68
{
9+
#pragma warning disable SA1402 // File may only contain a single type
710
/// <summary>
811
/// Holds information about an error occurred while accessing Microsoft Translator Service.
912
/// </summary>
1013
internal class ErrorResponse
14+
{
15+
[JsonPropertyName("error")]
16+
public Error Error { get; set; }
17+
}
18+
19+
internal class Error
1120
{
1221
/// <summary>
1322
/// Gets or sets the error message.
1423
/// </summary>
24+
[JsonPropertyName("message")]
1525
public string Message { get; set; }
16-
17-
/// <summary>
18-
/// Gets or sets the HTTP status code.
19-
/// </summary>
20-
public int StatusCode { get; set; }
2126
}
27+
#pragma warning restore SA1402 // File may only contain a single type
2228
}

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/ServiceLanguage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using Newtonsoft.Json;
5+
using System.Text.Json.Serialization;
66

77
namespace Microsoft.Toolkit.Services.MicrosoftTranslator
88
{
@@ -30,7 +30,7 @@ public class ServiceLanguage
3030
/// <summary>
3131
/// Gets the directionality, which is rtl for right-to-left languages or ltr for left-to-right languages.
3232
/// </summary>
33-
[JsonProperty("dir")]
33+
[JsonPropertyName("dir")]
3434
public string Directionality { get; }
3535

3636
/// <summary>

‎Microsoft.Toolkit.Services/Services/MicrosoftTranslator/TranslatorService.cs‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
using System.Linq;
99
using System.Net.Http;
1010
using System.Net.Http.Headers;
11+
using System.Text.Json;
1112
using System.Threading.Tasks;
12-
using Newtonsoft.Json;
13-
using Newtonsoft.Json.Linq;
1413

1514
namespace Microsoft.Toolkit.Services.MicrosoftTranslator
1615
{
@@ -108,14 +107,13 @@ public async Task<IEnumerable<DetectedLanguageResponse>> DetectLanguagesWithResp
108107
await CheckUpdateTokenAsync().ConfigureAwait(false);
109108

110109
var uriString = $"{BaseUrl}detect?{ApiVersion}";
111-
using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) })))
112-
{
113-
var response = await client.SendAsync(request).ConfigureAwait(false);
114-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
110+
using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t.Substring(0, Math.Min(t.Length, _MaxTextLengthForDetection)) }));
115111

116-
var responseContent = JsonConvert.DeserializeObject<IEnumerable<DetectedLanguageResponse>>(content);
117-
return responseContent;
118-
}
112+
var response = await client.SendAsync(request).ConfigureAwait(false);
113+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
114+
115+
var responseContent = JsonSerializer.Deserialize<IEnumerable<DetectedLanguageResponse>>(content);
116+
return responseContent;
119117
}
120118

121119
/// <inheritdoc/>
@@ -132,24 +130,23 @@ public async Task<IEnumerable<ServiceLanguage>> GetLanguageNamesAsync(string lan
132130
await CheckUpdateTokenAsync().ConfigureAwait(false);
133131

134132
var uriString = $"{BaseUrl}languages?scope=translation&{ApiVersion}";
135-
using (var request = CreateHttpRequest(uriString))
133+
using var request = CreateHttpRequest(uriString);
134+
135+
language = language ?? Language;
136+
if (!string.IsNullOrWhiteSpace(language))
136137
{
137-
language = language ?? Language;
138-
if (!string.IsNullOrWhiteSpace(language))
139-
{
140-
// If necessary, adds the Accept-Language header in order to get localized language names.
141-
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
142-
}
138+
// If necessary, adds the Accept-Language header in order to get localized language names.
139+
request.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(language));
140+
}
143141

144-
var response = await client.SendAsync(request).ConfigureAwait(false);
145-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
142+
var response = await client.SendAsync(request).ConfigureAwait(false);
143+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
146144

147-
var jsonContent = JToken.Parse(content)["translation"];
148-
var responseContent = JsonConvert.DeserializeObject<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
149-
responseContent.ForEach(r => r.Value.Code = r.Key);
145+
var jsonContent = JsonDocument.Parse(content).RootElement.GetProperty("translation");
146+
var responseContent = JsonSerializer.Deserialize<Dictionary<string, ServiceLanguage>>(jsonContent.ToString()).ToList();
147+
responseContent.ForEach(r => r.Value.Code = r.Key);
150148

151-
return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
152-
}
149+
return responseContent.Select(r => r.Value).OrderBy(r => r.Name).ToList();
153150
}
154151

155152
/// <inheritdoc/>
@@ -216,14 +213,13 @@ public async Task<IEnumerable<TranslationResponse>> TranslateWithResponseAsync(I
216213

217214
var toQueryString = string.Join("&", to.Select(t => $"to={t}"));
218215
var uriString = (string.IsNullOrWhiteSpace(from) ? $"{BaseUrl}translate?{toQueryString}" : $"{BaseUrl}translate?from={from}&{toQueryString}") + $"&{ApiVersion}";
219-
using (var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t })))
220-
{
221-
var response = await client.SendAsync(request).ConfigureAwait(false);
222-
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
216+
using var request = CreateHttpRequest(uriString, HttpMethod.Post, input.Select(t => new { Text = t }));
223217

224-
var responseContent = JsonConvert.DeserializeObject<IEnumerable<TranslationResponse>>(content);
225-
return responseContent;
226-
}
218+
var response = await client.SendAsync(request).ConfigureAwait(false);
219+
var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
220+
221+
var responseContent = JsonSerializer.Deserialize<IEnumerable<TranslationResponse>>(content);
222+
return responseContent;
227223
}
228224

229225
/// <inheritdoc/>
@@ -254,7 +250,7 @@ private HttpRequestMessage CreateHttpRequest(string uriString, HttpMethod method
254250

255251
if (content != null)
256252
{
257-
var jsonRequest = JsonConvert.SerializeObject(content);
253+
var jsonRequest = JsonSerializer.Serialize(content);
258254
var requestContent = new StringContent(jsonRequest, System.Text.Encoding.UTF8, JsonMediaType);
259255
request.Content = requestContent;
260256
}

0 commit comments

Comments
 (0)