diff options
| -rw-r--r-- | projecttemplates/RelyingPartyLogic/OAuthServiceProvider.cs | 6 | ||||
| -rw-r--r-- | samples/OAuthServiceProvider/Code/Global.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/DotNetOpenAuth.csproj | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs (renamed from src/DotNetOpenAuth/OAuth2/WebServerAuthorizationServer.cs) | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/projecttemplates/RelyingPartyLogic/OAuthServiceProvider.cs b/projecttemplates/RelyingPartyLogic/OAuthServiceProvider.cs index 9b6fb50..69181f5 100644 --- a/projecttemplates/RelyingPartyLogic/OAuthServiceProvider.cs +++ b/projecttemplates/RelyingPartyLogic/OAuthServiceProvider.cs @@ -25,7 +25,7 @@ namespace RelyingPartyLogic { /// <summary> /// The shared authorization server. /// </summary> - private static WebServerAuthorizationServer authorizationServer; + private static AuthorizationServer authorizationServer; /// <summary> /// The lock to synchronize initialization of the <see cref="authorizationServer"/> field. @@ -36,7 +36,7 @@ namespace RelyingPartyLogic { /// Gets the service provider. /// </summary> /// <value>The service provider.</value> - public static WebServerAuthorizationServer AuthorizationServer { + public static AuthorizationServer AuthorizationServer { get { EnsureInitialized(); return authorizationServer; @@ -68,7 +68,7 @@ namespace RelyingPartyLogic { } if (authorizationServer == null) { - authorizationServer = new WebServerAuthorizationServer(new OAuthAuthorizationServer()); + authorizationServer = new AuthorizationServer(new OAuthAuthorizationServer()); } } } diff --git a/samples/OAuthServiceProvider/Code/Global.cs b/samples/OAuthServiceProvider/Code/Global.cs index e8bacae..7c2e9f7 100644 --- a/samples/OAuthServiceProvider/Code/Global.cs +++ b/samples/OAuthServiceProvider/Code/Global.cs @@ -22,7 +22,7 @@ /// </summary> public static log4net.ILog Logger = log4net.LogManager.GetLogger("DotNetOpenAuth.OAuthServiceProvider"); - public static WebServerAuthorizationServer AuthorizationServer = new WebServerAuthorizationServer(new OAuth2AuthorizationServer()); + public static AuthorizationServer AuthorizationServer = new AuthorizationServer(new OAuth2AuthorizationServer()); /// <summary> /// Gets the transaction-protected database connection for the current request. diff --git a/src/DotNetOpenAuth/DotNetOpenAuth.csproj b/src/DotNetOpenAuth/DotNetOpenAuth.csproj index 8ade97a..8f33c8d 100644 --- a/src/DotNetOpenAuth/DotNetOpenAuth.csproj +++ b/src/DotNetOpenAuth/DotNetOpenAuth.csproj @@ -392,7 +392,7 @@ http://opensource.org/licenses/ms-pl.html <Compile Include="OAuth2\ResourceServer.cs" /> <Compile Include="OAuth2\StandardAccessTokenAnalyzer.cs" /> <Compile Include="OAuth2\UserAgentClient.cs" /> - <Compile Include="OAuth2\WebServerAuthorizationServer.cs" /> + <Compile Include="OAuth2\AuthorizationServer.cs" /> <Compile Include="OAuth2\OAuthUtilities.cs" /> <Compile Include="OAuth\ChannelElements\ICombinedOpenIdProviderTokenManager.cs" /> <Compile Include="OAuth\ChannelElements\IConsumerDescription.cs" /> diff --git a/src/DotNetOpenAuth/OAuth2/WebServerAuthorizationServer.cs b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs index 09ad193..ce4f6bb 100644 --- a/src/DotNetOpenAuth/OAuth2/WebServerAuthorizationServer.cs +++ b/src/DotNetOpenAuth/OAuth2/AuthorizationServer.cs @@ -1,5 +1,5 @@ //----------------------------------------------------------------------- -// <copyright file="WebServerAuthorizationServer.cs" company="Andrew Arnott"> +// <copyright file="AuthorizationServer.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- @@ -18,12 +18,12 @@ namespace DotNetOpenAuth.OAuth2 { /// <summary> /// Authorization Server supporting the web server flow. /// </summary> - public class WebServerAuthorizationServer : AuthorizationServerBase { + public class AuthorizationServer : AuthorizationServerBase { /// <summary> - /// Initializes a new instance of the <see cref="WebServerAuthorizationServer"/> class. + /// Initializes a new instance of the <see cref="AuthorizationServer"/> class. /// </summary> /// <param name="authorizationServer">The authorization server.</param> - public WebServerAuthorizationServer(IAuthorizationServer authorizationServer) + public AuthorizationServer(IAuthorizationServer authorizationServer) : base(authorizationServer) { Contract.Requires<ArgumentNullException>(authorizationServer != null, "authorizationServer"); } |