这是indexloc提供的服务，不要输入任何密码
Skip to content

CORS fix #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 14, 2024
Merged

CORS fix #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd8adbd
small code cleanup
jonsequitur May 14, 2024
c06ca9a
support /v2/editor route for backcompat
jonsequitur May 14, 2024
e00e11d
CORS fixes
jonsequitur May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Microsoft.TryDotNet/ContentGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ public static Task<string> GenerateEditorPageAsync(HttpRequest request)

var hostUri = new Uri($"{scheme}://{request.Host.Value}", UriKind.Absolute);
var wasmRunnerUri = new Uri(hostUri, "/wasmrunner");
var commansdUri = new Uri(hostUri, "/commands");
var commandsUri = new Uri(hostUri, "/commands");

var enableLogging = false;
if (request.Query.TryGetValue("enableLogging", out var enableLoggingString))
{
enableLogging = enableLoggingString.FirstOrDefault()?.ToLowerInvariant() == "true";
}

var configuration = new
{
wasmRunnerUrl = wasmRunnerUri.AbsoluteUri,
commandsUrl = commansdUri.AbsoluteUri,
commandsUrl = commandsUri.AbsoluteUri,
refererUrl = !string.IsNullOrWhiteSpace(referer) ? new Uri(referer, UriKind.Absolute) : null,
enableLogging
};
Expand Down
22 changes: 14 additions & 8 deletions src/Microsoft.TryDotNet/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static async Task<WebApplication> CreateWebApplicationAsync(WebApplicatio
builder.Services.AddCors(
opts =>
{
opts.AddPolicy("trydotnet",
opts.AddDefaultPolicy(
policy =>
{
policy
Expand Down Expand Up @@ -108,21 +108,26 @@ public static async Task<WebApplication> CreateWebApplicationAsync(WebApplicatio
CSharpProjectKernel.RegisterEventsAndCommands();

var app = builder.Build();

app.UseCors("trydotnet");

app.UseCors();

app.UseBlazorFrameworkFiles("/wasmrunner");
app.UsePeaky();
app.UseStaticFiles();
app.MapFallbackToFile("/wasmrunner/{*path:nonfile}", "wasmrunner/index.html");

app.UsePeaky();
app.UseResponseCompression();

app.MapGet("/editor", async (HttpRequest request, HttpResponse response) =>
Func<HttpRequest, HttpResponse, Task<IResult>> editorHandler = async (request, response) =>
{
var html = await ContentGenerator.GenerateEditorPageAsync(request);
response.ContentType = MediaTypeNames.Text.Html;
response.ContentLength = Encoding.UTF8.GetByteCount(html);
return Results.Content(html);
});
};

app.MapGet("/editor", editorHandler);
app.MapGet("/editor/v2", editorHandler);

app.MapPost("/commands", async (HttpRequest request) =>
{
Expand All @@ -131,12 +136,13 @@ public static async Task<WebApplication> CreateWebApplicationAsync(WebApplicatio
await using (var requestBody = request.Body)
{
using var kernel = CreateKernel();
using var streamReader = new StreamReader(requestBody);

var body = await new StreamReader(requestBody).ReadToEndAsync();
var body = await streamReader.ReadToEndAsync();

var bundle = JsonDocument.Parse(body).RootElement;

var commandEnvelopes = ReadCommands(bundle).ToList();
var commandEnvelopes = ReadCommands(bundle);

foreach (var commandEnvelope in commandEnvelopes)
{
Expand Down