Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit 719337e

Browse files
AArnottAArnott
committed
A bunch more moving of OAuth2 classes between assemblies.
1 parent 1068d82 commit 719337e

28 files changed

Lines changed: 131 additions & 72 deletions

‎src/DotNetOpenAuth.OAuth2.AuthorizationServer/DotNetOpenAuth.OAuth2.AuthorizationServer.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<Compile Include="OAuth2\ChannelElements\IOAuth2ChannelWithAuthorizationServer.cs" />
3030
<Compile Include="OAuth2\ChannelElements\OAuth2AuthorizationServerChannel.cs" />
3131
<Compile Include="OAuth2\ChannelElements\RefreshToken.cs" />
32+
<Compile Include="OAuth2\ClientDescription.cs" />
3233
<Compile Include="OAuth2\Messages\AccessTokenAuthorizationCodeRequestAS.cs" />
3334
<Compile Include="OAuth2\Messages\AccessTokenRefreshRequestAS.cs" />
3435
<Compile Include="OAuth2\Messages\EndUserAuthorizationSuccessAuthCodeResponseAS.cs" />

src/DotNetOpenAuth.OAuth2/OAuth2/ClientDescription.cs renamed to src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/ClientDescription.cs

File renamed without changes.

‎src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/Messages/AccessTokenAuthorizationCodeRequestAS.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ internal AccessTokenAuthorizationCodeRequestAS(Uri tokenEndpoint, Version versio
2424
: base(tokenEndpoint, version) {
2525
}
2626

27-
/// <summary>
28-
/// Initializes a new instance of the <see cref="AccessTokenAuthorizationCodeRequest"/> class.
29-
/// </summary>
30-
/// <param name="authorizationServer">The authorization server.</param>
31-
internal AccessTokenAuthorizationCodeRequestAS(AuthorizationServerDescription authorizationServer)
32-
: this(authorizationServer.TokenEndpoint, authorizationServer.Version) {
33-
Requires.NotNull(authorizationServer, "authorizationServer");
34-
}
35-
3627
#region IAuthorizationCodeCarryingRequest Members
3728

3829
/// <summary>

‎src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/Messages/AccessTokenRefreshRequestAS.cs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ internal AccessTokenRefreshRequestAS(Uri tokenEndpoint, Version version)
2626
: base(tokenEndpoint, version) {
2727
}
2828

29-
/// <summary>
30-
/// Initializes a new instance of the <see cref="AccessTokenRefreshRequestAS"/> class.
31-
/// </summary>
32-
/// <param name="authorizationServer">The authorization server.</param>
33-
internal AccessTokenRefreshRequestAS(AuthorizationServerDescription authorizationServer)
34-
: this(authorizationServer.TokenEndpoint, authorizationServer.Version) {
35-
}
36-
3729
#region IRefreshTokenCarryingRequest members
3830

3931
/// <summary>

‎src/DotNetOpenAuth.OAuth2.Client/DotNetOpenAuth.OAuth2.Client.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,15 @@
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
1919
</PropertyGroup>
2020
<ItemGroup>
21+
<Compile Include="OAuth2\AuthorizationServerDescription.cs" />
22+
<Compile Include="OAuth2\AuthorizationState.cs" />
2123
<Compile Include="OAuth2\ChannelElements\OAuth2ClientChannel.cs" />
24+
<Compile Include="OAuth2\IAuthorizationState.cs" />
25+
<Compile Include="OAuth2\IClientAuthorizationTracker.cs" />
26+
<Compile Include="OAuth2\Messages\AccessTokenAuthorizationCodeRequestC.cs" />
27+
<Compile Include="OAuth2\Messages\AccessTokenRefreshRequestC.cs" />
28+
<Compile Include="OAuth2\Messages\EndUserAuthorizationImplicitRequestC.cs" />
29+
<Compile Include="OAuth2\Messages\EndUserAuthorizationRequestC.cs" />
2230
<Compile Include="OAuth2\OAuth2Strings.Designer.cs">
2331
<AutoGen>True</AutoGen>
2432
<DesignTime>True</DesignTime>

src/DotNetOpenAuth.OAuth2/OAuth2/AuthorizationServerDescription.cs renamed to src/DotNetOpenAuth.OAuth2.Client/OAuth2/AuthorizationServerDescription.cs

File renamed without changes.

src/DotNetOpenAuth.OAuth2/OAuth2/AuthorizationState.cs renamed to src/DotNetOpenAuth.OAuth2.Client/OAuth2/AuthorizationState.cs

File renamed without changes.

‎src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public bool RefreshAuthorization(IAuthorizationState authorization, TimeSpan? sk
116116
}
117117
}
118118

119-
var request = new AccessTokenRefreshRequest(this.AuthorizationServer) {
119+
var request = new AccessTokenRefreshRequestC(this.AuthorizationServer) {
120120
ClientIdentifier = this.ClientIdentifier,
121121
ClientSecret = this.ClientSecret,
122122
RefreshToken = authorization.RefreshToken,
@@ -143,7 +143,7 @@ public IAuthorizationState GetScopedAccessToken(string refreshToken, HashSet<str
143143
Requires.NotNull(scope, "scope");
144144
Contract.Ensures(Contract.Result<IAuthorizationState>() != null);
145145

146-
var request = new AccessTokenRefreshRequest(this.AuthorizationServer) {
146+
var request = new AccessTokenRefreshRequestC(this.AuthorizationServer) {
147147
ClientIdentifier = this.ClientIdentifier,
148148
ClientSecret = this.ClientSecret,
149149
RefreshToken = refreshToken,
@@ -248,7 +248,7 @@ internal void UpdateAuthorizationWithResponse(IAuthorizationState authorizationS
248248
Requires.NotNull(authorizationState, "authorizationState");
249249
Requires.NotNull(authorizationSuccess, "authorizationSuccess");
250250

251-
var accessTokenRequest = new AccessTokenAuthorizationCodeRequest(this.AuthorizationServer) {
251+
var accessTokenRequest = new AccessTokenAuthorizationCodeRequestC(this.AuthorizationServer) {
252252
ClientIdentifier = this.ClientIdentifier,
253253
ClientSecret = this.ClientSecret,
254254
Callback = authorizationState.Callback,

src/DotNetOpenAuth.OAuth2/OAuth2/IAuthorizationState.cs renamed to src/DotNetOpenAuth.OAuth2.Client/OAuth2/IAuthorizationState.cs

File renamed without changes.

src/DotNetOpenAuth.OAuth2/OAuth2/IClientAuthorizationTracker.cs renamed to src/DotNetOpenAuth.OAuth2.Client/OAuth2/IClientAuthorizationTracker.cs

File renamed without changes.

0 commit comments

Comments
 (0)