React to recent naming changes in aspnet/Security

aspnet/Security@e8090a3
aspnet-contrib · Sep 15, 2015 · 3f58f98 · 3f58f98
1 parent 9b7fb31
commit 3f58f98
Show file tree

Hide file tree

Showing 24 changed files with 54 additions and 54 deletions.
diff --git a/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public static class DeviantArtAuthenticationDefaults {
         public const string AuthenticationScheme = "DeviantArt";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "DeviantArt";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "DeviantArt";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-deviantart";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://www.deviantart.com/oauth2/authorize";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://www.deviantart.com/oauth2/token";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://www.deviantart.com/api/v1/oauth2/user/whoami/";
     }

diff --git a/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.cs b/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationHandler.cs
@@ -16,7 +16,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.DeviantArt {
-    public class DeviantArtAuthenticationHandler : OAuthAuthenticationHandler<DeviantArtAuthenticationOptions> {
+    public class DeviantArtAuthenticationHandler : OAuthHandler<DeviantArtAuthenticationOptions> {
         public DeviantArtAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.DeviantArt {
-    public class DeviantArtAuthenticationMiddleware : OAuthAuthenticationMiddleware<DeviantArtAuthenticationOptions> {
+    public class DeviantArtAuthenticationMiddleware : OAuthMiddleware<DeviantArtAuthenticationOptions> {
         public DeviantArtAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationOptions.cs b/src/AspNet.Security.OAuth.DeviantArt/DeviantArtAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.DeviantArt {
     /// <summary>
     /// Defines a set of options used by <see cref="DeviantArtAuthenticationHandler"/>.
     /// </summary>
-    public class DeviantArtAuthenticationOptions : OAuthAuthenticationOptions {
+    public class DeviantArtAuthenticationOptions : OAuthOptions {
         public DeviantArtAuthenticationOptions() {
             AuthenticationScheme = DeviantArtAuthenticationDefaults.AuthenticationScheme;
             Caption = DeviantArtAuthenticationDefaults.Caption;

diff --git a/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public static class GitHubAuthenticationDefaults {
         public const string AuthenticationScheme = "GitHub";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "GitHub";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "GitHub";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-github";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://github.com/login/oauth/authorize";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://github.com/login/oauth/access_token";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://api.github.com/user";
     }

diff --git a/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationHandler.cs b/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationHandler.cs
@@ -16,7 +16,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.GitHub {
-    public class GitHubAuthenticationHandler : OAuthAuthenticationHandler<GitHubAuthenticationOptions> {
+    public class GitHubAuthenticationHandler : OAuthHandler<GitHubAuthenticationOptions> {
         public GitHubAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.GitHub {
-    public class GitHubAuthenticationMiddleware : OAuthAuthenticationMiddleware<GitHubAuthenticationOptions> {
+    public class GitHubAuthenticationMiddleware : OAuthMiddleware<GitHubAuthenticationOptions> {
         public GitHubAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationOptions.cs b/src/AspNet.Security.OAuth.GitHub/GitHubAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.GitHub {
     /// <summary>
     /// Defines a set of options used by <see cref="GitHubAuthenticationHandler"/>.
     /// </summary>
-    public class GitHubAuthenticationOptions : OAuthAuthenticationOptions {
+    public class GitHubAuthenticationOptions : OAuthOptions {
         public GitHubAuthenticationOptions() {
             AuthenticationScheme = GitHubAuthenticationDefaults.AuthenticationScheme;
             Caption = GitHubAuthenticationDefaults.Caption;

diff --git a/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public class LinkedInAuthenticationDefaults {
         public const string AuthenticationScheme = "LinkedIn";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "LinkedIn";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "LinkedIn";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-linkedin";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://www.linkedin.com/uas/oauth2/authorization";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://www.linkedin.com/uas/oauth2/accessToken";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://api.linkedin.com/v1/people/~:(id,first-name,last-name,formatted-name,email-address,public-profile-url,picture-url)";
     }

diff --git a/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationHandler.cs b/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationHandler.cs
@@ -16,7 +16,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.LinkedIn {
-    public class LinkedInAuthenticationHandler : OAuthAuthenticationHandler<LinkedInAuthenticationOptions> {
+    public class LinkedInAuthenticationHandler : OAuthHandler<LinkedInAuthenticationOptions> {
         public LinkedInAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.LinkedIn {
-    public class LinkedInAuthenticationMiddleware : OAuthAuthenticationMiddleware<LinkedInAuthenticationOptions> {
+    public class LinkedInAuthenticationMiddleware : OAuthMiddleware<LinkedInAuthenticationOptions> {
         public LinkedInAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationOptions.cs b/src/AspNet.Security.OAuth.LinkedIn/LinkedInAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.LinkedIn {
     /// <summary>
     /// Defines a set of options used by <see cref="LinkedInAuthenticationHandler"/>.
     /// </summary>
-    public class LinkedInAuthenticationOptions : OAuthAuthenticationOptions {
+    public class LinkedInAuthenticationOptions : OAuthOptions {
         public LinkedInAuthenticationOptions() {
             AuthenticationScheme = LinkedInAuthenticationDefaults.AuthenticationScheme;
             Caption = LinkedInAuthenticationDefaults.Caption;

diff --git a/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public static class SpotifyAuthenticationDefaults {
         public const string AuthenticationScheme = "Spotify";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "Spotify";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "Spotify";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-spotify";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://accounts.spotify.com/authorize";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://accounts.spotify.com/api/token";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://api.spotify.com/v1/me";
     }

diff --git a/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationHandler.cs
@@ -16,7 +16,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.Spotify {
-    public class SpotifyAuthenticationHandler : OAuthAuthenticationHandler<SpotifyAuthenticationOptions> {
+    public class SpotifyAuthenticationHandler : OAuthHandler<SpotifyAuthenticationOptions> {
         public SpotifyAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.Spotify {
-    public class SpotifyAuthenticationMiddleware : OAuthAuthenticationMiddleware<SpotifyAuthenticationOptions> {
+    public class SpotifyAuthenticationMiddleware : OAuthMiddleware<SpotifyAuthenticationOptions> {
         public SpotifyAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationOptions.cs b/src/AspNet.Security.OAuth.Spotify/SpotifyAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.Spotify {
     /// <summary>
     /// Defines a set of options used by <see cref="SpotifyAuthenticationHandler"/>.
     /// </summary>
-    public class SpotifyAuthenticationOptions : OAuthAuthenticationOptions {
+    public class SpotifyAuthenticationOptions : OAuthOptions {
         public SpotifyAuthenticationOptions() {
             AuthenticationScheme = SpotifyAuthenticationDefaults.AuthenticationScheme;
             Caption = SpotifyAuthenticationDefaults.Caption;

diff --git a/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public class WordPressAuthenticationDefaults {
         public const string AuthenticationScheme = "WordPress";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "WordPress";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "WordPress";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-wordpress";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://public-api.wordpress.com/oauth2/authorize";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://public-api.wordpress.com/oauth2/token";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://public-api.wordpress.com/rest/v1.1/me";
     }

diff --git a/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationHandler.cs b/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationHandler.cs
@@ -16,7 +16,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.WordPress {
-    public class WordPressAuthenticationHandler : OAuthAuthenticationHandler<WordPressAuthenticationOptions> {
+    public class WordPressAuthenticationHandler : OAuthHandler<WordPressAuthenticationOptions> {
         public WordPressAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.WordPress {
-    public class WordPressAuthenticationMiddleware : OAuthAuthenticationMiddleware<WordPressAuthenticationOptions> {
+    public class WordPressAuthenticationMiddleware : OAuthMiddleware<WordPressAuthenticationOptions> {
         public WordPressAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationOptions.cs b/src/AspNet.Security.OAuth.WordPress/WordPressAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.WordPress {
     /// <summary>
     /// Defines a set of options used by <see cref="WordPressAuthenticationHandler"/>.
     /// </summary>
-    public class WordPressAuthenticationOptions : OAuthAuthenticationOptions {
+    public class WordPressAuthenticationOptions : OAuthOptions {
         public WordPressAuthenticationOptions() {
             AuthenticationScheme = WordPressAuthenticationDefaults.AuthenticationScheme;
             Caption = WordPressAuthenticationDefaults.Caption;

diff --git a/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationDefaults.cs b/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationDefaults.cs
@@ -18,32 +18,32 @@ public static class YahooAuthenticationDefaults {
         public const string AuthenticationScheme = "Yahoo";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.Caption"/>.
+        /// Default value for <see cref="OAuthOptions.Caption"/>.
         /// </summary>
         public const string Caption = "Yahoo";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.ClaimsIssuer"/>.
+        /// Default value for <see cref="OAuthOptions.ClaimsIssuer"/>.
         /// </summary>
         public const string Issuer = "Yahoo";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.CallbackPath"/>.
+        /// Default value for <see cref="OAuthOptions.CallbackPath"/>.
         /// </summary>
         public const string CallbackPath = "/signin-yahoo";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.AuthorizationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.AuthorizationEndpoint"/>.
         /// </summary>
         public const string AuthorizationEndpoint = "https://api.login.yahoo.com/oauth2/request_auth";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.TokenEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.TokenEndpoint"/>.
         /// </summary>
         public const string TokenEndpoint = "https://api.login.yahoo.com/oauth2/get_token";
 
         /// <summary>
-        /// Default value for <see cref="OAuthAuthenticationOptions.UserInformationEndpoint"/>.
+        /// Default value for <see cref="OAuthOptions.UserInformationEndpoint"/>.
         /// </summary>
         public const string UserInformationEndpoint = "https://social.yahooapis.com/v1/user/me/profile";
     }

diff --git a/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationHandler.cs
@@ -19,7 +19,7 @@
 using Newtonsoft.Json.Linq;
 
 namespace AspNet.Security.OAuth.Yahoo {
-    public class YahooAuthenticationHandler : OAuthAuthenticationHandler<YahooAuthenticationOptions> {
+    public class YahooAuthenticationHandler : OAuthHandler<YahooAuthenticationOptions> {
         public YahooAuthenticationHandler([NotNull] HttpClient client)
             : base(client) {
         }

diff --git a/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationMiddleware.cs b/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationMiddleware.cs
@@ -14,7 +14,7 @@
 using Microsoft.Framework.WebEncoders;
 
 namespace AspNet.Security.OAuth.Yahoo {
-    public class YahooAuthenticationMiddleware : OAuthAuthenticationMiddleware<YahooAuthenticationOptions> {
+    public class YahooAuthenticationMiddleware : OAuthMiddleware<YahooAuthenticationOptions> {
         public YahooAuthenticationMiddleware(
             [NotNull] RequestDelegate next,
             [NotNull] IDataProtectionProvider dataProtectionProvider,

diff --git a/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationOptions.cs b/src/AspNet.Security.OAuth.Yahoo/YahooAuthenticationOptions.cs
@@ -11,7 +11,7 @@ namespace AspNet.Security.OAuth.Yahoo {
     /// <summary>
     /// Defines a set of options used by <see cref="YahooAuthenticationHandler"/>.
     /// </summary>
-    public class YahooAuthenticationOptions : OAuthAuthenticationOptions {
+    public class YahooAuthenticationOptions : OAuthOptions {
         public YahooAuthenticationOptions() {
             AuthenticationScheme = YahooAuthenticationDefaults.AuthenticationScheme;
             Caption = YahooAuthenticationDefaults.Caption;