Skip to content

Bugfix to enable all middleware to access the request content #18

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

Open
ape-box wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix to enable all middleware to access the request content #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 65 additions & 48 deletions Source/SuperSimple.MiniWebServer/Environment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,69 @@
namespace SuperSimple.MiniWebServer
namespace SuperSimple.MiniWebServer
{
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;

public class Environment : WrappedDictionary<string, object>, IDictionary<string, object>
{
private RequestHeaders requestHeaders;
private ResponseHeaders responseHeaders;

public Stream RequestBody => this["owin.RequestBody"] as Stream;

public RequestHeaders RequestHeaders
{
get
{
if (requestHeaders == null)
requestHeaders = new RequestHeaders((IDictionary<string, string[]>)this["owin.RequestHeaders"]);

return requestHeaders;
}
}
public string RequestMethod => (string)this["owin.RequestMethod"];
public string RequestPath => (string)this["owin.RequestPath"];
public string RequestPathBase => (string)this["owin.RequestPathBase"];
public string RequestQueryString => (string)this["owin.RequestQueryString"];

public Stream ResponseBody => (Stream)this["owin.ResponseBody"];
public ResponseHeaders ResponseHeaders =>
responseHeaders ?? (responseHeaders = new ResponseHeaders((IDictionary<string, string[]>) this["owin.ResponseHeaders"]));

public int ResponseStatusCode
{
get => (int)this["owin.ResponseStatusCode"];
set => this["owin.ResponseStatusCode"] = value;
}

internal Environment(IDictionary<string, object> environment)
: base(environment)
{ }

public async Task WriteResponseWithCount(string response)
{
var data = Encoding.UTF8.GetBytes(response);

await ResponseBody.WriteAsync(data, 0, data.Length);
ResponseHeaders.ContentLength = data.Length;
}
}
}
using System.Threading.Tasks;
using SuperSimple.MiniWebServer.MiddleWare;

public class Environment : WrappedDictionary<string, object>, IDictionary<string, object>
{
private RequestHeaders requestHeaders;
private ResponseHeaders responseHeaders;

public Stream RequestBody => this["owin.RequestBody"] as Stream;

public RequestHeaders RequestHeaders
{
get
{
if (requestHeaders == null)
requestHeaders = new RequestHeaders((IDictionary<string, string[]>)this["owin.RequestHeaders"]);

return requestHeaders;
}
}
public string RequestMethod => (string)this["owin.RequestMethod"];
public string RequestPath => (string)this["owin.RequestPath"];
public string RequestPathBase => (string)this["owin.RequestPathBase"];
public string RequestQueryString => (string)this["owin.RequestQueryString"];

public string _requestContent = null;
public string RequestContent
{
get
{
if (_requestContent == null && RequestBody != null)
{
var contentBytes = RequestBody.ReadAllBytes().Result;
if (contentBytes != null)
_requestContent = Encoding.UTF8.GetString(contentBytes);
}

return _requestContent;
}
}

public Stream ResponseBody => (Stream)this["owin.ResponseBody"];
public ResponseHeaders ResponseHeaders =>
responseHeaders ?? (responseHeaders = new ResponseHeaders((IDictionary<string, string[]>) this["owin.ResponseHeaders"]));

public int ResponseStatusCode
{
get => (int)this["owin.ResponseStatusCode"];
set => this["owin.ResponseStatusCode"] = value;
}

internal Environment(IDictionary<string, object> environment)
: base(environment)
{ }

public async Task WriteResponseWithCount(string response)
{
var data = Encoding.UTF8.GetBytes(response);

await ResponseBody.WriteAsync(data, 0, data.Length);
ResponseHeaders.ContentLength = data.Length;
}
}
}
15 changes: 1 addition & 14 deletions Source/SuperSimple.MiniWebServer/Request.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
namespace SuperSimple.MiniWebServer
{
using System;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using SuperSimple.MiniWebServer.MiddleWare;

public class Request : IEquatable<Request>
{
Expand All @@ -26,18 +24,7 @@ public Request(string method, string path, string pathBase = null, string queryS
public T GetContentAs<T>() => JsonConvert.DeserializeObject<T>(Content);

public static async Task<Request> FromEnvironment(Environment env)
{
string content = null;

if (env.RequestBody != null)
{
var contentBytes = await env.RequestBody.ReadAllBytes();
if (contentBytes != null)
content = Encoding.UTF8.GetString(contentBytes);
}

return new Request(env.RequestMethod, env.RequestPath, env.RequestPathBase, env.RequestQueryString, content);
}
=> new Request(env.RequestMethod, env.RequestPath, env.RequestPathBase, env.RequestQueryString, env.RequestContent);

public static bool operator !=(Request left, Request right) => !(left == right);
public static bool operator ==(Request left, Request right)
Expand Down