Skip to content

Commit 6188500

Browse files
niemyjskiniemyjski
committed
Fixed Windows Live OAuth issue and fixed a race condition with cache invalidation.
1 parent 0670355 commit 6188500

File tree

6 files changed

+65
-189
lines changed

6 files changed

+65
-189
lines changed

‎Exceptionless.sln

Lines changed: 21 additions & 173 deletions
Large diffs are not rendered by default.

‎src/Exceptionless.Api/Controllers/AuthController.cs

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,31 +270,59 @@ public async Task<IActionResult> SignupAsync([FromBody] SignupModel model) {
270270
[HttpPost("github")]
271271
[SwaggerResponse(StatusCodes.Status200OK, Type = typeof(TokenResult))]
272272
public Task<IActionResult> GitHubAsync([FromBody] JObject value) {
273-
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(), Settings.Current.GitHubAppId, Settings.Current.GitHubAppSecret, (f, c) => new GitHubClient(f, c));
273+
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(),
274+
Settings.Current.GitHubAppId,
275+
Settings.Current.GitHubAppSecret,
276+
(f, c) => {
277+
c.Scope = "user:email";
278+
return new GitHubClient(f, c);
279+
}
280+
);
274281
}
275282

276283
[ApiExplorerSettings(IgnoreApi = true)]
277284
[AllowAnonymous]
278285
[HttpPost("google")]
279286
[SwaggerResponse(StatusCodes.Status200OK, Type = typeof(TokenResult))]
280287
public Task<IActionResult> GoogleAsync([FromBody] JObject value) {
281-
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(), Settings.Current.GoogleAppId, Settings.Current.GoogleAppSecret, (f, c) => new GoogleClient(f, c));
288+
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(),
289+
Settings.Current.GoogleAppId,
290+
Settings.Current.GoogleAppSecret,
291+
(f, c) => {
292+
c.Scope = "profile email";
293+
return new GoogleClient(f, c);
294+
}
295+
);
282296
}
283297

284298
[ApiExplorerSettings(IgnoreApi = true)]
285299
[AllowAnonymous]
286300
[HttpPost("facebook")]
287301
[SwaggerResponse(StatusCodes.Status200OK, Type = typeof(TokenResult))]
288302
public Task<IActionResult> FacebookAsync([FromBody] JObject value) {
289-
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(), Settings.Current.FacebookAppId, Settings.Current.FacebookAppSecret, (f, c) => new FacebookClient(f, c));
303+
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(),
304+
Settings.Current.FacebookAppId,
305+
Settings.Current.FacebookAppSecret,
306+
(f, c) => {
307+
c.Scope = "email";
308+
return new FacebookClient(f, c);
309+
}
310+
);
290311
}
291312

292313
[ApiExplorerSettings(IgnoreApi = true)]
293314
[AllowAnonymous]
294315
[HttpPost("live")]
295316
[SwaggerResponse(StatusCodes.Status200OK, Type = typeof(TokenResult))]
296317
public Task<IActionResult> LiveAsync([FromBody] JObject value) {
297-
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(), Settings.Current.MicrosoftAppId, Settings.Current.MicrosoftAppSecret, (f, c) => new WindowsLiveClient(f, c));
318+
return ExternalLoginAsync(value.ToObject<ExternalAuthInfo>(),
319+
Settings.Current.MicrosoftAppId,
320+
Settings.Current.MicrosoftAppSecret,
321+
(f, c) => {
322+
c.Scope = "wl.emails";
323+
return new WindowsLiveClient(f, c);
324+
}
325+
);
298326
}
299327

300328
/// <summary>

‎src/Exceptionless.Api/Exceptionless.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="Exceptionless.AspNetCore.Signed" Version="4.2.1982" />
99
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
1010
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
11-
<PackageReference Include="OAuth2" Version="0.9.11-pre" />
11+
<PackageReference Include="OAuth2" Version="0.9.12-pre" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\Exceptionless.Core\Exceptionless.Core.csproj" />

‎src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
<ItemGroup>
2828
<PackageReference Include="AutoMapper" Version="6.2.2" />
2929
<PackageReference Include="AutoMapper.Collection" Version="3.1.3" />
30-
<PackageReference Include="FluentValidation" Version="7.3.3" />
31-
<PackageReference Include="Foundatio" Version="7.0.1629-pre" />
32-
<PackageReference Include="Foundatio.Jobs.Commands" Version="7.0.1629-pre" />
33-
<PackageReference Include="Foundatio.JsonNet" Version="7.0.1629-pre" />
34-
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="5.6.681-pre" />
30+
<PackageReference Include="FluentValidation" Version="7.3.4" />
31+
<PackageReference Include="Foundatio" Version="7.0.1634-pre" />
32+
<PackageReference Include="Foundatio.Jobs.Commands" Version="7.0.1634-pre" />
33+
<PackageReference Include="Foundatio.JsonNet" Version="7.0.1634-pre" />
34+
<PackageReference Include="Foundatio.Repositories.Elasticsearch" Version="5.6.689-pre" />
3535
<PackageReference Include="Handlebars.Net" Version="1.9.0" />
3636
<PackageReference Include="MaxMind.GeoIP2" Version="2.9.0" />
3737
<PackageReference Include="McSherry.SemanticVersioning" Version="1.2.1" />

‎src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Foundatio.Aliyun" Version="7.0.12-pre" />
9-
<PackageReference Include="Foundatio.AzureStorage" Version="7.0.1487-pre" />
10-
<PackageReference Include="Foundatio.Redis" Version="7.0.1517-pre" />
8+
<PackageReference Include="Foundatio.Aliyun" Version="7.0.14-pre" />
9+
<PackageReference Include="Foundatio.AzureStorage" Version="7.0.1489-pre" />
10+
<PackageReference Include="Foundatio.Redis" Version="7.0.1522-pre" />
1111
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
12-
<PackageReference Include="MailKit" Version="2.0.0" />
12+
<PackageReference Include="MailKit" Version="2.0.1" />
1313
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
1515
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
1616
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.3" />
1717
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
18-
<PackageReference Include="MimeKit" Version="2.0.0" />
18+
<PackageReference Include="MimeKit" Version="2.0.1" />
1919
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
2020
<PackageReference Include="Serilog.Formatting.Compact" Version="1.0.0" />
2121
<PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />

‎tests/Exceptionless.Api.Tests/Exceptionless.Api.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="ApprovalTests" Version="3.0.13" />
99
<PackageReference Include="Exceptionless.RandomData" Version="1.1.47" />
1010
<PackageReference Include="FluentRest" Version="4.0.0.45" />
11-
<PackageReference Include="Foundatio.Logging.Xunit" Version="7.0.1629-pre" />
11+
<PackageReference Include="Foundatio.Logging.Xunit" Version="7.0.1634-pre" />
1212
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
1414
<PackageReference Include="xunit" Version="2.3.1" />

0 commit comments

Comments
 (0)