Skip to content

Commit 5d09d43

Browse files
mythzmythz
committed
Mega Commit: Merge RequestContext into IRequest / IResponse.
- IHttpRequest/IHttpResponse implements IRequest / IResponse. - Only HTTP Requests implement IHttp* interfaces - Response is now accessible via IRequest.Response - AspNetRequest/Response are now binded to HttpContextBase/HttpRequestBase abstractions
1 parent bc0ef7a commit 5d09d43

204 files changed

Lines changed: 1432 additions & 1795 deletions

File tree

Some content is hidden

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

‎src/ServiceStack.Api.Swagger/SwaggerApiService.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Runtime.Serialization;
77
using System.Text.RegularExpressions;
88
using ServiceStack.Host;
9-
using ServiceStack.Text;
109
using ServiceStack.Web;
1110

1211
namespace ServiceStack.Api.Swagger
@@ -144,7 +143,7 @@ public class SwaggerApiService : Service
144143

145144
public object Get(ResourceRequest request)
146145
{
147-
var httpReq = RequestContext.Get<IHttpRequest>();
146+
var httpReq = Request;
148147
var path = "/" + request.Name;
149148
var map = HostContext.ServiceController.RestPathMap;
150149
var paths = new List<RestPath>();

‎src/ServiceStack.Authentication.OAuth2/OAuth2Provider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ protected override void LoadUserAuthInfo(AuthUserSession userSession, IAuthToken
171171

172172
protected IAuthTokens Init(IServiceBase authService, ref IAuthSession session, Authenticate request)
173173
{
174-
var requestUri = authService.RequestContext.AbsoluteUri;
174+
var requestUri = authService.Request.AbsoluteUri;
175175
if (this.CallbackUrl.IsNullOrEmpty())
176176
{
177177
this.CallbackUrl = requestUri;
178178
}
179179

180180
if (session.ReferrerUrl.IsNullOrEmpty())
181181
{
182-
session.ReferrerUrl = (request != null ? request.Continue : null) ?? authService.RequestContext.GetHeader("Referer");
182+
session.ReferrerUrl = (request != null ? request.Continue : null) ?? authService.Request.GetHeader("Referer");
183183
}
184184

185185
if (session.ReferrerUrl.IsNullOrEmpty() || session.ReferrerUrl.IndexOf("/auth", StringComparison.OrdinalIgnoreCase) >= 0)

‎src/ServiceStack.Authentication.OpenId/OpenIdOAuthProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class OpenIdOAuthProvider : OAuthProvider
2222
public OpenIdOAuthProvider(IAppSettings appSettings, string name = DefaultName, string realm = null)
2323
: base(appSettings, realm, name) { }
2424

25-
public virtual ClaimsRequest CreateClaimsRequest(IHttpRequest httpReq)
25+
public virtual ClaimsRequest CreateClaimsRequest(IRequest httpReq)
2626
{
2727
return new ClaimsRequest {
2828
Country = DemandLevel.Request,
@@ -45,7 +45,7 @@ public override object Authenticate(IServiceBase authService, IAuthSession sessi
4545
{
4646
var tokens = Init(authService, ref session, request);
4747

48-
var httpReq = authService.RequestContext.Get<IHttpRequest>();
48+
var httpReq = authService.Request;
4949
var isOpenIdRequest = !httpReq.GetParam("openid.mode").IsNullOrEmpty();
5050

5151
if (!isOpenIdRequest)

‎src/ServiceStack.Client/ContentFormat.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static string ToContentType(this Format formats)
187187
}
188188
}
189189

190-
public static RequestAttributes GetEndpointAttribute(string httpMethod)
190+
public static RequestAttributes GetRequestAttribute(string httpMethod)
191191
{
192192
switch (httpMethod.ToUpper())
193193
{

‎src/ServiceStack.Client/JsonServiceClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public override string ContentType
3333
get { return String.Format("application/{0}", Format); }
3434
}
3535

36-
public override void SerializeToStream(IRequestContext requestContext, object request, Stream stream)
36+
public override void SerializeToStream(IRequest requestContext, object request, Stream stream)
3737
{
3838
JsonDataContractSerializer.Instance.SerializeToStream(request, stream);
3939
}

‎src/ServiceStack.Client/JsvServiceClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public override string ContentType
3232
get { return String.Format("application/{0}", Format); }
3333
}
3434

35-
public override void SerializeToStream(IRequestContext requestContext, object request, Stream stream)
35+
public override void SerializeToStream(IRequest requestContext, object request, Stream stream)
3636
{
3737
using (var writer = new StreamWriter(stream))
3838
{

‎src/ServiceStack.Client/ServiceClientBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public Action<HttpWebResponse> ResponseFilter
362362
}
363363
}
364364

365-
public abstract void SerializeToStream(IRequestContext requestContext, object request, Stream stream);
365+
public abstract void SerializeToStream(IRequest requestContext, object request, Stream stream);
366366

367367
public abstract T DeserializeFromStream<T>(Stream stream);
368368

‎src/ServiceStack.Client/XmlServiceClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public override string ContentType
3232
get { return String.Format("application/{0}", Format); }
3333
}
3434

35-
public override void SerializeToStream(IRequestContext requestContext, object request, Stream stream)
35+
public override void SerializeToStream(IRequest requestContext, object request, Stream stream)
3636
{
3737
if (request == null) return;
3838
DataContractSerializer.Instance.SerializeToStream(request, stream);

‎src/ServiceStack.Interfaces/Caching/ISessionFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public interface ISessionFactory
1414
/// <param name="httpReq"></param>
1515
/// <param name="httpRes"></param>
1616
/// <returns></returns>
17-
ISession GetOrCreateSession(IHttpRequest httpReq, IHttpResponse httpRes);
17+
ISession GetOrCreateSession(IRequest httpReq, IResponse httpRes);
1818

1919
/// <summary>
2020
/// Gets the session for this request, creates one if it doesn't exist.

‎src/ServiceStack.Interfaces/RequestLogEntry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class RequestLogEntry
2525
public string Referer { get; set; }
2626
public Dictionary<string, string> Headers { get; set; }
2727
public Dictionary<string, string> FormData { get; set; }
28-
public Dictionary<string, object> Items { get; set; }
28+
public Dictionary<string, string> Items { get; set; }
2929
public object Session { get; set; }
3030
public object ResponseDto { get; set; }
3131
public object ErrorResponse { get; set; }

0 commit comments

Comments
 (0)