diff --git a/.gitignore b/.gitignore index 0edab2c..8d02966 100644 --- a/.gitignore +++ b/.gitignore @@ -224,7 +224,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -320,7 +320,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log @@ -329,12 +329,13 @@ ASALocalRun/ # NVidia Nsight GPU debugger configuration file *.nvuser -# MFractors (Xamarin productivity tool) working folder +# MFractors (Xamarin productivity tool) working folder .mfractor/ .sonarqube/ testoutput/ +__mismatch__/ tools/** -!tools/packages.config \ No newline at end of file +!tools/packages.config diff --git a/Directory.Build.props b/Directory.Build.props index 7e7e5b7..b334146 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,7 +12,7 @@ - net6.0 + net6.0;net7.0 latest disable false diff --git a/Version.props b/Version.props index ffa17dd..80a26a6 100644 --- a/Version.props +++ b/Version.props @@ -1,9 +1,16 @@ - 12.12.1 + 13.0.2 2.9.3 + + + 6.0.0 + + 7.0.0 + + diff --git a/global.json b/global.json index ef5ea15..c3e7120 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "6.0.401" + "version": "7.0.101" } } diff --git a/samples/HotChocolate_FileDownload/Mutation.cs b/samples/HotChocolate_FileDownload/Mutation.cs index e3c0dfa..e99e1b5 100644 --- a/samples/HotChocolate_FileDownload/Mutation.cs +++ b/samples/HotChocolate_FileDownload/Mutation.cs @@ -14,7 +14,7 @@ public Mutation(DocumentsRepository repository, IConfiguration configuration) { _repository = repository ?? throw new ArgumentNullException(nameof(repository)); - _downloadUrl = configuration["DownloadUrl"]; + _downloadUrl = configuration["DownloadUrl"]!; } public string CreateDownloadLink( diff --git a/src/Extensions.HotChocolate/Generation/BewitMiddleware.cs b/src/Extensions.HotChocolate/Generation/BewitMiddleware.cs index 03e232a..db4d14b 100644 --- a/src/Extensions.HotChocolate/Generation/BewitMiddleware.cs +++ b/src/Extensions.HotChocolate/Generation/BewitMiddleware.cs @@ -23,9 +23,7 @@ public async Task InvokeAsync( if (context.Result is TPayload result) { BewitToken bewit - = await tokenGenerator.GenerateBewitTokenAsync( - result, - context.RequestAborted); + = await tokenGenerator.GenerateBewitTokenAsync(result, context.RequestAborted); context.Result = (string)bewit; } diff --git a/src/Storage.MongoDB/BewitAuthorizationBuilderExtensions.cs b/src/Storage.MongoDB/BewitAuthorizationBuilderExtensions.cs index 2e7cf7f..4b12a5e 100644 --- a/src/Storage.MongoDB/BewitAuthorizationBuilderExtensions.cs +++ b/src/Storage.MongoDB/BewitAuthorizationBuilderExtensions.cs @@ -14,7 +14,7 @@ public static void UseMongoPersistence( { MongoNonceOptions options = configuration .GetSection("Bewit:Mongo") - .Get(); + .Get()!; configure?.Invoke(options); diff --git a/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareIntegrationTests.cs b/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareIntegrationTests.cs index 4fa8a55..131001a 100644 --- a/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareIntegrationTests.cs +++ b/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareIntegrationTests.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using HotChocolate; using HotChocolate.Execution; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; @@ -33,7 +34,7 @@ public async Task Query_WhenAuthorize_Success() // assert IHttpContextAccessor httpContextAccessor = services.GetService(); CustomPayload customPayload = httpContextAccessor.GetBewitPayload(); - new { QueryResult = result, BewitContext = customPayload }.MatchSnapshot(); + new { QueryResult = result.ToJson(), BewitContext = customPayload }.MatchSnapshot(); } } } diff --git a/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareTests.cs b/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareTests.cs index f77232f..655a202 100644 --- a/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareTests.cs +++ b/test/Extensions.HotChocolate.Tests/BewitAuthorizationMiddlewareTests.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using HotChocolate; using HotChocolate.Execution; using Snapshooter.Xunit; using Xunit; @@ -20,7 +21,7 @@ public async Task Query_WhenAuthorize_Success() IExecutionResult result = await TestHelpers.ExecuteQuery(serviceProvider, token); // assert - result.MatchSnapshot(); + result.ToJson().MatchSnapshot(); } [Fact] @@ -34,10 +35,7 @@ public async Task Query_WhenWrongToken_Fail() IExecutionResult result = await TestHelpers.ExecuteQuery(serviceProvider, token); // assert - result.MatchSnapshot(options => - options - .IgnoreField("Errors.[*].Exception.StackTraceString") - ); + result.ToJson().MatchSnapshot(); } [Fact] @@ -50,7 +48,7 @@ public async Task Query_WhenNotAuthorize_Fail() IExecutionResult result = await TestHelpers.ExecuteQuery(serviceProvider); // assert - result.MatchSnapshot(); + result.ToJson().MatchSnapshot(); } } } diff --git a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareIntegrationTests.Query_WhenAuthorize_Success.snap b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareIntegrationTests.Query_WhenAuthorize_Success.snap index 3aaa18c..960ff2b 100644 --- a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareIntegrationTests.Query_WhenAuthorize_Success.snap +++ b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareIntegrationTests.Query_WhenAuthorize_Success.snap @@ -1,15 +1,5 @@ { - "QueryResult": { - "Label": null, - "Path": null, - "Data": { - "foo": "bar" - }, - "Errors": null, - "Extensions": null, - "ContextData": null, - "HasNext": null - }, + "QueryResult": "{\n \"data\": {\n \"foo\": \"bar\"\n }\n}", "BewitContext": { "Email": "foo@bar.gmail.com" } diff --git a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenAuthorize_Success.snap b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenAuthorize_Success.snap index caf1d2b..0ca61aa 100644 --- a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenAuthorize_Success.snap +++ b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenAuthorize_Success.snap @@ -1,11 +1,5 @@ { - "Label": null, - "Path": null, - "Data": { + "data": { "foo": "bar" - }, - "Errors": null, - "Extensions": null, - "ContextData": null, - "HasNext": null + } } diff --git a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenNotAuthorize_Fail.snap b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenNotAuthorize_Fail.snap index 23f703b..bb1354e 100644 --- a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenNotAuthorize_Fail.snap +++ b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenNotAuthorize_Fail.snap @@ -1,53 +1,19 @@ { - "Label": null, - "Path": null, - "Data": { - "foo": null - }, - "Errors": [ + "errors": [ { - "Message": "NotAuthorized", - "Code": null, - "Path": { - "Parent": null, - "Depth": 0, - "Name": "foo" - }, - "Locations": [ + "message": "NotAuthorized", + "locations": [ { - "Line": 1, - "Column": 3 + "line": 1, + "column": 3 } ], - "Extensions": null, - "Exception": null, - "SyntaxNode": { - "Kind": "Field", - "Alias": null, - "Arguments": [], - "Required": null, - "SelectionSet": null, - "Location": { - "Start": 2, - "End": 7, - "Line": 1, - "Column": 3 - }, - "Name": { - "Kind": "Name", - "Location": { - "Start": 2, - "End": 7, - "Line": 1, - "Column": 3 - }, - "Value": "foo" - }, - "Directives": [] - } + "path": [ + "foo" + ] } ], - "Extensions": null, - "ContextData": null, - "HasNext": null + "data": { + "foo": null + } } diff --git a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenWrongToken_Fail.snap b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenWrongToken_Fail.snap index 64ccf2b..bb1354e 100644 --- a/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenWrongToken_Fail.snap +++ b/test/Extensions.HotChocolate.Tests/__snapshots__/BewitAuthorizationMiddlewareTests.Query_WhenWrongToken_Fail.snap @@ -1,66 +1,19 @@ { - "Label": null, - "Path": null, - "Data": { - "foo": null - }, - "Errors": [ + "errors": [ { - "Message": "NotAuthorized", - "Code": null, - "Path": { - "Parent": null, - "Depth": 0, - "Name": "foo" - }, - "Locations": [ + "message": "NotAuthorized", + "locations": [ { - "Line": 1, - "Column": 3 + "line": 1, + "column": 3 } ], - "Extensions": null, - "Exception": { - "ClassName": "Bewit.Validation.Exceptions.BewitInvalidException", - "Message": "The given Bewit is invalid.", - "Data": null, - "InnerException": null, - "HelpURL": null, - "StackTraceString": "at Bewit.Validation.BewitTokenValidator`1.ValidateBewitAsync(Bewit`1 bewit, CancellationToken cancellationToken) in ***", - "RemoteStackTraceString": null, - "RemoteStackIndex": 0, - "ExceptionMethod": null, - "HResult": -2146233088, - "Source": "Bewit.Validation", - "WatsonBuckets": null - }, - "SyntaxNode": { - "Kind": "Field", - "Alias": null, - "Arguments": [], - "Required": null, - "SelectionSet": null, - "Location": { - "Start": 2, - "End": 7, - "Line": 1, - "Column": 3 - }, - "Name": { - "Kind": "Name", - "Location": { - "Start": 2, - "End": 7, - "Line": 1, - "Column": 3 - }, - "Value": "foo" - }, - "Directives": [] - } + "path": [ + "foo" + ] } ], - "Extensions": null, - "ContextData": null, - "HasNext": null + "data": { + "foo": null + } }