Skip to content

Commit c967227

Browse files
samppissamppis
committed
Updated RestSharp to latest version. Couldn't fix some tests though.
1 parent 18c1115 commit c967227

12 files changed

Lines changed: 39 additions & 22 deletions

‎.nuget/OAuth2.0.9.0.nupkg‎

22.2 KB
Binary file not shown.

‎OAuth2.Example/OAuth2.Example.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<OldToolsVersion>4.0</OldToolsVersion>
2525
<UseIISExpress>false</UseIISExpress>
2626
<MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
27+
<IISExpressSSLPort />
28+
<IISExpressAnonymousAuthentication />
29+
<IISExpressWindowsAuthentication />
30+
<IISExpressUseClassicPipelineMode />
2731
</PropertyGroup>
2832
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2933
<DebugSymbols>true</DebugSymbols>
@@ -53,8 +57,8 @@
5357
<Private>True</Private>
5458
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
5559
</Reference>
56-
<Reference Include="RestSharp, Version=103.4.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\RestSharp.103.4\lib\net4\RestSharp.dll</HintPath>
60+
<Reference Include="RestSharp">
61+
<HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
5862
</Reference>
5963
<Reference Include="System.Configuration" />
6064
<Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎OAuth2.Example/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
77
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
88
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
9-
<package id="RestSharp" version="103.4" targetFramework="net40" />
9+
<package id="RestSharp" version="105.0.1" targetFramework="net40" />
1010
</packages>

‎OAuth2.Tests/Client/OAuth2ClientTests.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public void SetUp()
3737

3838
factory = Substitute.For<IRequestFactory>();
3939
factory.CreateClient().Returns(restClient);
40+
factory.CreateClient(Arg.Any<string>()).Returns(restClient);
4041
factory.CreateRequest().Returns(restRequest);
4142

4243
var configuration = Substitute.For<IClientConfiguration>();
@@ -82,10 +83,10 @@ public void Should_ReturnCorrectAccessCodeRequestUri()
8283
// assert
8384
uri.Should().Be("https://login-link.net/");
8485

85-
factory.Received(1).CreateClient();
86+
factory.Received(1).CreateClient("https://AccessCodeServiceEndpoint");
8687
factory.Received(1).CreateRequest();
8788

88-
restClient.Received(1).BaseUrl = "https://AccessCodeServiceEndpoint";
89+
//restClient.Received(1).BaseUrl = "https://AccessCodeServiceEndpoint";
8990
restRequest.Received(1).Resource = "/AccessCodeServiceEndpoint";
9091

9192
restRequest.Received(1).AddObject(Arg.Is<object>(
@@ -143,7 +144,7 @@ public void Should_IssueCorrectRequestForAccessToken_When_GetUserInfoIsCalled()
143144
descendant.GetUserInfo(new NameValueCollection {{"code", "code"}});
144145

145146
// assert
146-
restClient.Received(1).BaseUrl = "https://AccessTokenServiceEndpoint";
147+
//restClient.Received(1).BaseUrl = "https://AccessTokenServiceEndpoint";
147148
restRequest.Received(1).Resource = "/AccessTokenServiceEndpoint";
148149
restRequest.Received(1).Method = Method.POST;
149150
restRequest.Received(1).AddObject(Arg.Is<object>(x => x.AllPropertiesAreEqualTo(
@@ -169,7 +170,7 @@ public void Should_IssueCorrectRequestForUserInfo_When_GetUserInfoIsCalled(strin
169170
descendant.GetUserInfo(new NameValueCollection {{"code", "code"}});
170171

171172
// assert
172-
restClient.Received(1).BaseUrl = "https://UserInfoServiceEndpoint";
173+
//restClient.Received(1).BaseUrl = "https://UserInfoServiceEndpoint";
173174
restRequest.Received(1).Resource = "/UserInfoServiceEndpoint";
174175
restClient.Authenticator.Should().BeOfType<OAuth2UriQueryParameterAuthenticator>();
175176
}

‎OAuth2.Tests/Client/OAuthClientTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void Should_IssueCorrectRequestForRequestToken_When_GetLoginLinkUriIsCall
8585
factory.Received().CreateClient();
8686
factory.Received().CreateRequest();
8787

88-
restClient.Received().BaseUrl = "https://RequestTokenServiceEndpoint";
88+
//restClient.Received().BaseUrl = "https://RequestTokenServiceEndpoint";
8989
restRequest.Received().Resource = "/RequestTokenServiceEndpoint";
9090
restRequest.Received().Method = Method.POST;
9191

@@ -111,7 +111,7 @@ public void Should_ComposeCorrectLoginUri_When_GetLoginLinkIsCalled()
111111
factory.Received().CreateClient();
112112
factory.Received().CreateRequest();
113113

114-
restClient.Received().BaseUrl = "https://LoginServiceEndpoint";
114+
//restClient.Received().BaseUrl = "https://LoginServiceEndpoint";
115115
restRequest.Received().Resource = "/LoginServiceEndpoint";
116116
restRequest.Received().AddParameter("oauth_token", "token5");
117117
}
@@ -135,7 +135,7 @@ public void Should_IssueCorrectRequestForAccessToken_When_GetUserInfoIsCalled()
135135
factory.Received().CreateClient();
136136
factory.Received().CreateRequest();
137137

138-
restClient.Received().BaseUrl = "https://AccessTokenServiceEndpoint";
138+
//restClient.Received().BaseUrl = "https://AccessTokenServiceEndpoint";
139139
restRequest.Received().Resource = "/AccessTokenServiceEndpoint";
140140
restRequest.Received().Method = Method.POST;
141141

@@ -165,7 +165,7 @@ public void Should_IssueCorrectRequestForUserInfo_When_GetUserInfoIsCalled()
165165
factory.Received().CreateClient();
166166
factory.Received().CreateRequest();
167167

168-
restClient.Received().BaseUrl = "https://UserInfoServiceEndpoint";
168+
//restClient.Received().BaseUrl = "https://UserInfoServiceEndpoint";
169169
restRequest.Received().Resource = "/UserInfoServiceEndpoint";
170170

171171
restClient.Authenticator.Should().NotBeNull();

‎OAuth2.Tests/OAuth2.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<Reference Include="nunit.framework">
4646
<HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
4747
</Reference>
48-
<Reference Include="RestSharp, Version=103.4.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\RestSharp.103.4\lib\net4\RestSharp.dll</HintPath>
48+
<Reference Include="RestSharp">
49+
<HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
5050
</Reference>
5151
<Reference Include="System" />
5252
<Reference Include="System.Configuration" />

‎OAuth2.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
55
<package id="NSubstitute" version="1.4.2.0" targetFramework="net40" />
66
<package id="NUnit" version="2.6.0.12054" targetFramework="net40" />
7-
<package id="RestSharp" version="103.4" targetFramework="net40" />
7+
<package id="RestSharp" version="105.0.1" targetFramework="net40" />
88
</packages>

‎OAuth2/Infrastructure/IRequestFactory.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ public interface IRequestFactory
1111
/// Returns new REST client instance.
1212
/// </summary>
1313
IRestClient CreateClient();
14+
15+
/// <summary>
16+
/// Returns new REST client instance.
17+
/// </summary>
18+
IRestClient CreateClient(string baseUri);
1419

1520
/// <summary>
1621
/// Returns new REST request instance.

‎OAuth2/Infrastructure/RequestFactory.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using RestSharp;
23

34
namespace OAuth2.Infrastructure
@@ -15,6 +16,14 @@ public IRestClient CreateClient()
1516
return new RestClient();
1617
}
1718

19+
/// <summary>
20+
/// Returns new REST client instance.
21+
/// </summary>
22+
public IRestClient CreateClient(string baseUri)
23+
{
24+
return new RestClient(new Uri(baseUri));
25+
}
26+
1827
/// <summary>
1928
/// Returns new REST request instance.
2029
/// </summary>

‎OAuth2/Infrastructure/RequestFactoryExtensions.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ public static class RequestFactoryExtensions
77
{
88
public static IRestClient CreateClient(this IRequestFactory factory, Endpoint endpoint)
99
{
10-
var client = factory.CreateClient();
11-
client.BaseUrl = endpoint.BaseUri;
10+
var client = factory.CreateClient(endpoint.BaseUri);
1211
return client;
1312
}
1413

0 commit comments

Comments
 (0)