From 399bee18b8288a997ef18c39a571e3549f849c07 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 20 Apr 2015 09:59:14 -0400 Subject: [PATCH] flatten commits, provide deviantArt support --- .../DeviantArt/Constants.cs | 7 + .../DeviantAuthenticationExtensions.cs | 42 ++++ .../DeviantAuthenticationHandler.cs | 235 ++++++++++++++++++ .../DeviantAuthenticationMiddleware.cs | 89 +++++++ .../DeviantAuthenticationOptions.cs | 150 +++++++++++ .../Provider/DeviantAuthenticatedContext.cs | 79 ++++++ .../Provider/DeviantAuthenticationProvider.cs | 51 ++++ .../Provider/DeviantReturnEndpointContext.cs | 26 ++ .../IDeviantAuthenticationProvider.cs | 24 ++ .../Owin.Security.Providers.csproj | 9 + .../App_Start/Startup.Auth.cs | 3 +- 11 files changed, 714 insertions(+), 1 deletion(-) create mode 100644 Owin.Security.Providers/DeviantArt/Constants.cs create mode 100644 Owin.Security.Providers/DeviantArt/DeviantAuthenticationExtensions.cs create mode 100644 Owin.Security.Providers/DeviantArt/DeviantAuthenticationHandler.cs create mode 100644 Owin.Security.Providers/DeviantArt/DeviantAuthenticationMiddleware.cs create mode 100644 Owin.Security.Providers/DeviantArt/DeviantAuthenticationOptions.cs create mode 100644 Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticatedContext.cs create mode 100644 Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticationProvider.cs create mode 100644 Owin.Security.Providers/DeviantArt/Provider/DeviantReturnEndpointContext.cs create mode 100644 Owin.Security.Providers/DeviantArt/Provider/IDeviantAuthenticationProvider.cs diff --git a/Owin.Security.Providers/DeviantArt/Constants.cs b/Owin.Security.Providers/DeviantArt/Constants.cs new file mode 100644 index 0000000..3d1a0c2 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/Constants.cs @@ -0,0 +1,7 @@ +namespace Owin.Security.Providers.DeviantArt +{ + internal static class Constants + { + public const string DefaultAuthenticationType = "DeviantArt"; + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/DeviantAuthenticationExtensions.cs b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationExtensions.cs new file mode 100644 index 0000000..3f5b8f1 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationExtensions.cs @@ -0,0 +1,42 @@ +using System; +using Owin.Security.Providers.DeviantArt; + +namespace Owin.Security.Providers.DeviantArt +{ + public static class DeviantArtAuthenticationExtensions + { + /// + /// Login with DeviantArt. http://yourUrl/signin-DeviantArt will be used as the redirect URI + /// + /// + /// + /// + public static IAppBuilder UseDeviantArtAuthentication(this IAppBuilder app, + DeviantArtAuthenticationOptions options) + { + if (app == null) + throw new ArgumentNullException("app"); + if (options == null) + throw new ArgumentNullException("options"); + + app.Use(typeof(DeviantArtAuthenticationMiddleware), app, options); + + return app; + } + /// + /// Login with DeviantArt. http://yourUrl/signin-DeviantArt will be used as the redirect URI + /// + /// + /// + /// + /// + public static IAppBuilder UseDeviantArtAuthentication(this IAppBuilder app, string clientId, string clientSecret) + { + return app.UseDeviantArtAuthentication(new DeviantArtAuthenticationOptions + { + ClientId = clientId, + ClientSecret = clientSecret + }); + } + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/DeviantAuthenticationHandler.cs b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationHandler.cs new file mode 100644 index 0000000..4b68278 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationHandler.cs @@ -0,0 +1,235 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Headers; +using System.Security.Claims; +using System.Threading.Tasks; +using Microsoft.Owin; +using Microsoft.Owin.Infrastructure; +using Microsoft.Owin.Logging; +using Microsoft.Owin.Security; +using Microsoft.Owin.Security.Infrastructure; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Owin.Security.Providers.DeviantArt; +using Owin.Security.Providers.DeviantArt.Provider; + +namespace Owin.Security.Providers.DeviantArt +{ + public class DeviantArtAuthenticationHandler : AuthenticationHandler + { + private const string XmlSchemaString = "http://www.w3.org/2001/XMLSchema#string"; + + private readonly ILogger logger; + private readonly HttpClient httpClient; + + public DeviantArtAuthenticationHandler(HttpClient httpClient, ILogger logger) + { + this.httpClient = httpClient; + this.logger = logger; + } + + protected override async Task AuthenticateCoreAsync() + { + AuthenticationProperties properties = null; + + try + { + string code = null; + string state = null; + + IReadableStringCollection query = Request.Query; + IList values = query.GetValues("code"); + if (values != null && values.Count == 1) + { + code = string.Copy(values.First()); + } + values = query.GetValues("state"); + if (values != null && values.Count == 1) + { + state = values[0]; + } + + properties = Options.StateDataFormat.Unprotect(state); + if (properties == null) + { + return null; + } + + // OAuth2 10.12 CSRF + if (!ValidateCorrelationId(properties, logger)) + { + return new AuthenticationTicket(null, properties); + } + + string requestPrefix = Request.Scheme + "://" + Request.Host; + string redirectUri = requestPrefix + Request.PathBase + Options.CallbackPath; + + // Build up the body for the token request + var body = new List>(); + body.Add(new KeyValuePair("client_id", Options.ClientId)); + body.Add(new KeyValuePair("client_secret", Options.ClientSecret)); + body.Add(new KeyValuePair("grant_type", "authorization_code")); + body.Add(new KeyValuePair("code", code)); + body.Add(new KeyValuePair("redirect_uri", redirectUri)); + + // Request the token + var requestMessage = new HttpRequestMessage(HttpMethod.Post, Options.Endpoints.TokenEndpoint); + requestMessage.Content = new FormUrlEncodedContent(body); + requestMessage.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + HttpResponseMessage tokenResponse = await httpClient.SendAsync(requestMessage); + tokenResponse.EnsureSuccessStatusCode(); + string text = await tokenResponse.Content.ReadAsStringAsync(); + + // Deserializes the token response + dynamic response = JsonConvert.DeserializeObject(text); + string accessToken = (string)response.access_token; + + // Get the DeviantArt user + HttpRequestMessage userRequest = new HttpRequestMessage(HttpMethod.Get, Options.Endpoints.UserInfoEndpoint + "?access_token=" + Uri.EscapeDataString(accessToken)); + userRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); + HttpResponseMessage userResponse = await httpClient.SendAsync(userRequest, Request.CallCancelled); + userResponse.EnsureSuccessStatusCode(); + text = await userResponse.Content.ReadAsStringAsync(); + JObject user = JObject.Parse(text); + + var context = new DeviantArtAuthenticatedContext(Context, user, accessToken); + context.Identity = new ClaimsIdentity( + Options.AuthenticationType, + ClaimsIdentity.DefaultNameClaimType, + ClaimsIdentity.DefaultRoleClaimType); + if (!string.IsNullOrEmpty(context.Id)) + { + context.Identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, context.Id, XmlSchemaString, Options.AuthenticationType)); + } + if (!string.IsNullOrEmpty(context.UserName)) + { + context.Identity.AddClaim(new Claim(ClaimsIdentity.DefaultNameClaimType, context.UserName, XmlSchemaString, Options.AuthenticationType)); + } + + if (!string.IsNullOrEmpty(context.Name)) + { + context.Identity.AddClaim(new Claim("urn:DeviantArt:name", context.Name, XmlSchemaString, Options.AuthenticationType)); + } + context.Properties = properties; + + await Options.Provider.Authenticated(context); + + return new AuthenticationTicket(context.Identity, context.Properties); + } + catch (Exception ex) + { + logger.WriteError(ex.Message); + } + return new AuthenticationTicket(null, properties); + } + + protected override Task ApplyResponseChallengeAsync() + { + if (Response.StatusCode != 401) + { + return Task.FromResult(null); + } + + AuthenticationResponseChallenge challenge = Helper.LookupChallenge(Options.AuthenticationType, Options.AuthenticationMode); + + if (challenge != null) + { + string baseUri = + Request.Scheme + + Uri.SchemeDelimiter + + Request.Host + + Request.PathBase; + + string currentUri = + baseUri + + Request.Path + + Request.QueryString; + + string redirectUri = + baseUri + + Options.CallbackPath; + + AuthenticationProperties properties = challenge.Properties; + if (string.IsNullOrEmpty(properties.RedirectUri)) + { + properties.RedirectUri = currentUri; + } + + // OAuth2 10.12 CSRF + GenerateCorrelationId(properties); + + // comma separated + string scope = string.Join(" ", Options.Scope.Distinct()); + + string state = Options.StateDataFormat.Protect(properties); + + string authorizationEndpoint = + Options.Endpoints.AuthorizationEndpoint + + "?client_id=" + Uri.EscapeDataString(Options.ClientId) + + "&redirect_uri=" + Uri.EscapeDataString(redirectUri) + + "&scope=" + Uri.EscapeDataString(scope) + + "&response_type=" + "code" + + "&state=" + Uri.EscapeDataString(state); + + Response.Redirect(authorizationEndpoint); + } + + return Task.FromResult(null); + } + + public override async Task InvokeAsync() + { + return await InvokeReplyPathAsync(); + } + + private async Task InvokeReplyPathAsync() + { + if (Options.CallbackPath.HasValue && Options.CallbackPath == Request.Path) + { + // TODO: error responses + + AuthenticationTicket ticket = await AuthenticateAsync(); + if (ticket == null) + { + logger.WriteWarning("Invalid return state, unable to redirect."); + Response.StatusCode = 500; + return true; + } + + var context = new DeviantArtReturnEndpointContext(Context, ticket); + context.SignInAsAuthenticationType = Options.SignInAsAuthenticationType; + context.RedirectUri = ticket.Properties.RedirectUri; + + await Options.Provider.ReturnEndpoint(context); + + if (context.SignInAsAuthenticationType != null && + context.Identity != null) + { + ClaimsIdentity grantIdentity = context.Identity; + if (!string.Equals(grantIdentity.AuthenticationType, context.SignInAsAuthenticationType, StringComparison.Ordinal)) + { + grantIdentity = new ClaimsIdentity(grantIdentity.Claims, context.SignInAsAuthenticationType, grantIdentity.NameClaimType, grantIdentity.RoleClaimType); + } + Context.Authentication.SignIn(context.Properties, grantIdentity); + } + + if (!context.IsRequestCompleted && context.RedirectUri != null) + { + string redirectUri = context.RedirectUri; + if (context.Identity == null) + { + // add a redirect hint that sign-in failed in some way + redirectUri = WebUtilities.AddQueryString(redirectUri, "error", "access_denied"); + } + Response.Redirect(redirectUri); + context.RequestCompleted(); + } + + return context.IsRequestCompleted; + } + return false; + } + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/DeviantAuthenticationMiddleware.cs b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationMiddleware.cs new file mode 100644 index 0000000..8792490 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationMiddleware.cs @@ -0,0 +1,89 @@ +using System; +using System.Globalization; +using System.Net.Http; +using Microsoft.Owin; +using Microsoft.Owin.Logging; +using Microsoft.Owin.Security; +using Microsoft.Owin.Security.DataHandler; +using Microsoft.Owin.Security.DataProtection; +using Microsoft.Owin.Security.Infrastructure; +using Owin.Security.Providers.DeviantArt; +using Owin.Security.Providers.DeviantArt.Provider; +using Owin.Security.Providers.Properties; + +namespace Owin.Security.Providers.DeviantArt +{ + public class DeviantArtAuthenticationMiddleware : AuthenticationMiddleware + { + private readonly HttpClient httpClient; + private readonly ILogger logger; + + public DeviantArtAuthenticationMiddleware(OwinMiddleware next, IAppBuilder app, + DeviantArtAuthenticationOptions options) + : base(next, options) + { + if (String.IsNullOrWhiteSpace(Options.ClientId)) + throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, + Resources.Exception_OptionMustBeProvided, "ClientId")); + if (String.IsNullOrWhiteSpace(Options.ClientSecret)) + throw new ArgumentException(String.Format(CultureInfo.CurrentCulture, + Resources.Exception_OptionMustBeProvided, "ClientSecret")); + + logger = app.CreateLogger(); + + if (Options.Provider == null) + Options.Provider = new DeviantArtAuthenticationProvider(); + + if (Options.StateDataFormat == null) + { + IDataProtector dataProtector = app.CreateDataProtector( + typeof (DeviantArtAuthenticationMiddleware).FullName, + Options.AuthenticationType, "v1"); + Options.StateDataFormat = new PropertiesDataFormat(dataProtector); + } + + if (String.IsNullOrEmpty(Options.SignInAsAuthenticationType)) + Options.SignInAsAuthenticationType = app.GetDefaultSignInAsAuthenticationType(); + + httpClient = new HttpClient(ResolveHttpMessageHandler(Options)) + { + Timeout = Options.BackchannelTimeout, + MaxResponseContentBufferSize = 1024*1024*10, + }; + httpClient.DefaultRequestHeaders.UserAgent.ParseAdd("Microsoft Owin DeviantArt middleware"); + httpClient.DefaultRequestHeaders.ExpectContinue = false; + } + + /// + /// Provides the object for processing + /// authentication-related requests. + /// + /// + /// An configured with the + /// supplied to the constructor. + /// + protected override AuthenticationHandler CreateHandler() + { + return new DeviantArtAuthenticationHandler(httpClient, logger); + } + + private HttpMessageHandler ResolveHttpMessageHandler(DeviantArtAuthenticationOptions options) + { + HttpMessageHandler handler = options.BackchannelHttpHandler ?? new WebRequestHandler(); + + // If they provided a validator, apply it or fail. + if (options.BackchannelCertificateValidator != null) + { + // Set the cert validate callback + var webRequestHandler = handler as WebRequestHandler; + if (webRequestHandler == null) + { + throw new InvalidOperationException(Resources.Exception_ValidatorHandlerMismatch); + } + webRequestHandler.ServerCertificateValidationCallback = options.BackchannelCertificateValidator.Validate; + } + + return handler; + } + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/DeviantAuthenticationOptions.cs b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationOptions.cs new file mode 100644 index 0000000..f21d253 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/DeviantAuthenticationOptions.cs @@ -0,0 +1,150 @@ +using System; +using System.Collections.Generic; +using System.Net.Http; +using Microsoft.Owin; +using Microsoft.Owin.Security; +using Owin.Security.Providers.DeviantArt.Provider; + +namespace Owin.Security.Providers.DeviantArt +{ + public class DeviantArtAuthenticationOptions : AuthenticationOptions + { + public class DeviantArtAuthenticationEndpoints + { + /// + /// Endpoint which is used to redirect users to request DeviantArt access + /// + /// + /// Defaults to https://www.DeviantArt.com/oauth2/authorize + /// + public string AuthorizationEndpoint { get; set; } + + /// + /// Endpoint which is used to exchange code for access token + /// + /// + /// Defaults to https://www.DeviantArt.com/oauth2/token + /// + public string TokenEndpoint { get; set; } + + /// + /// Endpoint which is used to obtain user information after authentication + /// + /// + /// Defaults to https://www.DeviantArt.com/api/v1/oauth2/user/whoami + /// + public string UserInfoEndpoint { get; set; } + + public string DamnToken { get; set; } + } + + private const string AuthorizationEndPoint = "https://www.DeviantArt.com/oauth2/authorize"; + private const string TokenEndpoint = "https://www.DeviantArt.com/oauth2/token"; + private const string UserInfoEndpoint = "https://www.DeviantArt.com/api/v1/oauth2/user/whoami"; + private const string DamnTokenEndpoint = "https://www.DeviantArt.com/api/v1/oauth2/user/damntoken"; + + /// + /// Gets or sets the a pinned certificate validator to use to validate the endpoints used + /// in back channel communications belong to DeviantArt. + /// + /// + /// The pinned certificate validator. + /// + /// + /// If this property is null then the default certificate checks are performed, + /// validating the subject name and if the signing chain is a trusted party. + /// + public ICertificateValidator BackchannelCertificateValidator { get; set; } + + /// + /// The HttpMessageHandler used to communicate with DeviantArt. + /// This cannot be set at the same time as BackchannelCertificateValidator unless the value + /// can be downcast to a WebRequestHandler. + /// + public HttpMessageHandler BackchannelHttpHandler { get; set; } + + /// + /// Gets or sets timeout value in milliseconds for back channel communications with DeviantArt. + /// + /// + /// The back channel timeout in milliseconds. + /// + public TimeSpan BackchannelTimeout { get; set; } + + /// + /// The request path within the application's base path where the user-agent will be returned. + /// The middleware will process this request when it arrives. + /// Default value is "/signin-DeviantArt". + /// + public PathString CallbackPath { get; set; } + + /// + /// Get or sets the text that the user can display on a sign in user interface. + /// + public string Caption + { + get { return Description.Caption; } + set { Description.Caption = value; } + } + + /// + /// Gets or sets the DeviantArt supplied Client ID + /// + public string ClientId { get; set; } + + /// + /// Gets or sets the DeviantArt supplied Client Secret + /// + public string ClientSecret { get; set; } + + /// + /// Gets the sets of OAuth endpoints used to authenticate against DeviantArt. Overriding these endpoints allows you to use DeviantArt Enterprise for + /// authentication. + /// + public DeviantArtAuthenticationEndpoints Endpoints { get; set; } + + /// + /// Gets or sets the used in the authentication events + /// + public IDeviantArtAuthenticationProvider Provider { get; set; } + + /// + /// A list of permissions to request. + /// + public IList Scope { get; private set; } + + /// + /// Gets or sets the name of another authentication middleware which will be responsible for actually issuing a user + /// . + /// + public string SignInAsAuthenticationType { get; set; } + + /// + /// Gets or sets the type used to secure data handled by the middleware. + /// + public ISecureDataFormat StateDataFormat { get; set; } + + /// + /// Initializes a new + /// + public DeviantArtAuthenticationOptions() + : base("DeviantArt") + { + Caption = Constants.DefaultAuthenticationType; + CallbackPath = new PathString("/signin-DeviantArt"); + AuthenticationMode = AuthenticationMode.Passive; + Scope = new List + { + "user" + }; + BackchannelTimeout = TimeSpan.FromSeconds(60); + Endpoints = new DeviantArtAuthenticationEndpoints + { + AuthorizationEndpoint = AuthorizationEndPoint, + TokenEndpoint = TokenEndpoint, + UserInfoEndpoint = UserInfoEndpoint, + DamnToken = DamnTokenEndpoint + }; + } + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticatedContext.cs b/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticatedContext.cs new file mode 100644 index 0000000..e3d85c9 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticatedContext.cs @@ -0,0 +1,79 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using System.Security.Claims; +using Microsoft.Owin; +using Microsoft.Owin.Security; +using Microsoft.Owin.Security.Provider; +using Newtonsoft.Json.Linq; + +namespace Owin.Security.Providers.DeviantArt.Provider +{ + /// + /// Contains information about the login session as well as the user . + /// + public class DeviantArtAuthenticatedContext : BaseContext + { + /// + /// Initializes a + /// + /// The OWIN environment + /// The JSON-serialized user + /// DeviantArt Access token + public DeviantArtAuthenticatedContext(IOwinContext context, JObject user, string accessToken) + : base(context) + { + User = user; + AccessToken = accessToken; + + Id = TryGetValue(user, "userid"); + Name = TryGetValue(user, "username"); + UserName = TryGetValue(user, "username"); + } + + /// + /// Gets the JSON-serialized user + /// + /// + /// Contains the DeviantArt user obtained from the User Info endpoint. By default this is https://api.DeviantArt.com/user but it can be + /// overridden in the options + /// + public JObject User { get; private set; } + + /// + /// Gets the DeviantArt access token + /// + public string AccessToken { get; private set; } + + /// + /// Gets the DeviantArt user ID + /// + public string Id { get; private set; } + + /// + /// Gets the user's name + /// + public string Name { get; private set; } + + + /// + /// Gets the DeviantArt username + /// + public string UserName { get; private set; } + + /// + /// Gets the representing the user + /// + public ClaimsIdentity Identity { get; set; } + + /// + /// Gets or sets a property bag for common authentication properties + /// + public AuthenticationProperties Properties { get; set; } + + private static string TryGetValue(JObject user, string propertyName) + { + JToken value; + return user.TryGetValue(propertyName, out value) ? value.ToString() : null; + } + } +} diff --git a/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticationProvider.cs b/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticationProvider.cs new file mode 100644 index 0000000..2c61f51 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/Provider/DeviantAuthenticationProvider.cs @@ -0,0 +1,51 @@ +using System; +using System.Threading.Tasks; +using Owin.Security.Providers.DeviantArt; + +namespace Owin.Security.Providers.DeviantArt.Provider +{ + /// + /// Default implementation. + /// + public class DeviantArtAuthenticationProvider : IDeviantArtAuthenticationProvider + { + /// + /// Initializes a + /// + public DeviantArtAuthenticationProvider() + { + OnAuthenticated = context => Task.FromResult(null); + OnReturnEndpoint = context => Task.FromResult(null); + } + + /// + /// Gets or sets the function that is invoked when the Authenticated method is invoked. + /// + public Func OnAuthenticated { get; set; } + + /// + /// Gets or sets the function that is invoked when the ReturnEndpoint method is invoked. + /// + public Func OnReturnEndpoint { get; set; } + + /// + /// Invoked whenever DeviantArt succesfully authenticates a user + /// + /// Contains information about the login session as well as the user . + /// A representing the completed operation. + public virtual Task Authenticated(DeviantArtAuthenticatedContext context) + { + return OnAuthenticated(context); + } + + /// + /// Invoked prior to the being saved in a local cookie and the browser being redirected to the originally requested URL. + /// + /// + /// A representing the completed operation. + public virtual Task ReturnEndpoint(DeviantArtReturnEndpointContext context) + { + return OnReturnEndpoint(context); + } + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/DeviantArt/Provider/DeviantReturnEndpointContext.cs b/Owin.Security.Providers/DeviantArt/Provider/DeviantReturnEndpointContext.cs new file mode 100644 index 0000000..2c4190e --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/Provider/DeviantReturnEndpointContext.cs @@ -0,0 +1,26 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. + +using Microsoft.Owin; +using Microsoft.Owin.Security; +using Microsoft.Owin.Security.Provider; + +namespace Owin.Security.Providers.DeviantArt.Provider +{ + /// + /// Provides context information to middleware providers. + /// + public class DeviantArtReturnEndpointContext : ReturnEndpointContext + { + /// + /// + /// + /// OWIN environment + /// The authentication ticket + public DeviantArtReturnEndpointContext( + IOwinContext context, + AuthenticationTicket ticket) + : base(context, ticket) + { + } + } +} diff --git a/Owin.Security.Providers/DeviantArt/Provider/IDeviantAuthenticationProvider.cs b/Owin.Security.Providers/DeviantArt/Provider/IDeviantAuthenticationProvider.cs new file mode 100644 index 0000000..2f3bf98 --- /dev/null +++ b/Owin.Security.Providers/DeviantArt/Provider/IDeviantAuthenticationProvider.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; + +namespace Owin.Security.Providers.DeviantArt.Provider +{ + /// + /// Specifies callback methods which the invokes to enable developer control over the authentication process. /> + /// + public interface IDeviantArtAuthenticationProvider + { + /// + /// Invoked whenever DeviantArt succesfully authenticates a user + /// + /// Contains information about the login session as well as the user . + /// A representing the completed operation. + Task Authenticated(DeviantArtAuthenticatedContext context); + + /// + /// Invoked prior to the being saved in a local cookie and the browser being redirected to the originally requested URL. + /// + /// + /// A representing the completed operation. + Task ReturnEndpoint(DeviantArtReturnEndpointContext context); + } +} \ No newline at end of file diff --git a/Owin.Security.Providers/Owin.Security.Providers.csproj b/Owin.Security.Providers/Owin.Security.Providers.csproj index 8ac071a..b707a53 100644 --- a/Owin.Security.Providers/Owin.Security.Providers.csproj +++ b/Owin.Security.Providers/Owin.Security.Providers.csproj @@ -94,6 +94,15 @@ + + + + + + + + + diff --git a/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs b/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs index 77ec5fb..7c3e80f 100755 --- a/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs +++ b/OwinOAuthProvidersDemo/App_Start/Startup.Auth.cs @@ -8,6 +8,7 @@ using Owin.Security.Providers.Asana; using Owin.Security.Providers.ArcGISOnline; using Owin.Security.Providers.BattleNet; using Owin.Security.Providers.Buffer; +using Owin.Security.Providers.DeviantArt; using Owin.Security.Providers.Dropbox; using Owin.Security.Providers.EveOnline; using Owin.Security.Providers.Flickr; @@ -45,7 +46,7 @@ namespace OwinOAuthProvidersDemo }); // Use a cookie to temporarily store information about a user logging in with a third party login provider app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie); - + //app.UseDeviantArtAuthentication("id", "secret"); //app.UseUntappdAuthentication("id", "secret"); // Uncomment the following lines to enable logging in with third party login providers //app.UseMicrosoftAccountAuthentication(