diff options
Diffstat (limited to 'src/DotNetOpenAuth.OpenId.Provider')
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj | 8 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Behaviors/AXFetchAsSregTransform.cs | 1 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/ExtensionsInteropHelper.cs (renamed from src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/ExtensionsInteropProviderHelper.cs) | 9 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs (renamed from src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/UI/UIRequestProvider.cs) | 22 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HmacShaAssociationProvider.cs (renamed from src/DotNetOpenAuth.OpenId.Provider/OpenId/HmacShaAssociationProvider.cs) | 2 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/OpenIdProviderUtilities.cs (renamed from src/DotNetOpenAuth.OpenId.Provider/OpenId/OpenIdProviderUtilities.cs) | 2 |
6 files changed, 26 insertions, 18 deletions
diff --git a/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj b/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj index 793ab3e..4460629 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj +++ b/src/DotNetOpenAuth.OpenId.Provider/DotNetOpenAuth.OpenId.Provider.csproj @@ -27,9 +27,9 @@ <Compile Include="OpenId\ChannelElements\OpenIdProviderChannel.cs" /> <Compile Include="OpenId\ChannelElements\OpenIdProviderMessageFactory.cs" /> <Compile Include="OpenId\ChannelElements\ProviderSigningBindingElement.cs" /> - <Compile Include="OpenId\Extensions\ExtensionsInteropProviderHelper.cs" /> - <Compile Include="OpenId\Extensions\UI\UIRequestProvider.cs" /> - <Compile Include="OpenId\HmacShaAssociationProvider.cs" /> + <Compile Include="OpenId\Provider\Extensions\ExtensionsInteropHelper.cs" /> + <Compile Include="OpenId\Provider\Extensions\UI\UIRequestTools.cs" /> + <Compile Include="OpenId\Provider\HmacShaAssociationProvider.cs" /> <Compile Include="OpenId\Messages\AssociateDiffieHellmanProviderRequest.cs" /> <Compile Include="OpenId\Messages\AssociateDiffieHellmanProviderResponse.cs" Condition=" '$(ExcludeDiffieHellman)' != 'true' " /> <Compile Include="OpenId\Messages\IAssociateRequestProvider.cs" /> @@ -38,7 +38,7 @@ <Compile Include="OpenId\Messages\AssociateSuccessfulResponseProviderContract.cs" /> <Compile Include="OpenId\Messages\AssociateUnencryptedResponseProvider.cs" /> <Compile Include="OpenId\Messages\CheckAuthenticationResponseProvider.cs" /> - <Compile Include="OpenId\OpenIdProviderUtilities.cs" /> + <Compile Include="OpenId\Provider\OpenIdProviderUtilities.cs" /> <Compile Include="OpenId\Provider\AssociationDataBag.cs" /> <Compile Include="OpenId\Provider\IProviderAssociationStore.cs" /> <Compile Include="OpenId\Provider\ProviderAssociationHandleEncoder.cs" /> diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Behaviors/AXFetchAsSregTransform.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Behaviors/AXFetchAsSregTransform.cs index 09bde00..3a72c5e 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Behaviors/AXFetchAsSregTransform.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Behaviors/AXFetchAsSregTransform.cs @@ -16,6 +16,7 @@ namespace DotNetOpenAuth.OpenId.Provider.Behaviors { using DotNetOpenAuth.OpenId.Extensions.AttributeExchange; using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration; using DotNetOpenAuth.OpenId.Provider; + using DotNetOpenAuth.OpenId.Provider.Extensions; using DotNetOpenAuth.OpenId.RelyingParty; /// <summary> diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/ExtensionsInteropProviderHelper.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/ExtensionsInteropHelper.cs index 558b8fe..eda768b 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/ExtensionsInteropProviderHelper.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/ExtensionsInteropHelper.cs @@ -1,16 +1,17 @@ //----------------------------------------------------------------------- -// <copyright file="ExtensionsInteropProviderHelper.cs" company="Andrew Arnott"> +// <copyright file="ExtensionsInteropHelper.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.OpenId.Extensions { +namespace DotNetOpenAuth.OpenId.Provider.Extensions { using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Linq; using DotNetOpenAuth.Messaging; + using DotNetOpenAuth.OpenId.Extensions; using DotNetOpenAuth.OpenId.Extensions.AttributeExchange; using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration; using DotNetOpenAuth.OpenId.Messages; @@ -19,7 +20,7 @@ namespace DotNetOpenAuth.OpenId.Extensions { /// A set of methods designed to assist in improving interop across different /// OpenID implementations and their extensions. /// </summary> - public static class ExtensionsInteropProviderHelper { + internal static class ExtensionsInteropHelper { /// <summary> /// Transforms an AX attribute type URI from the axschema.org format into a given format. /// </summary> @@ -51,7 +52,7 @@ namespace DotNetOpenAuth.OpenId.Extensions { var ax = req.GetExtension<FetchRequest>(); if (ax != null) { - sreg = new ClaimsRequest(SimpleRegistration.Constants.sreg_ns); + sreg = new ClaimsRequest(DotNetOpenAuth.OpenId.Extensions.SimpleRegistration.Constants.sreg_ns); sreg.Synthesized = true; ((IProtocolMessageWithExtensions)req.RequestMessage).Extensions.Add(sreg); sreg.BirthDate = GetDemandLevelFor(ax, WellKnownAttributes.BirthDate.WholeBirthDate); diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/UI/UIRequestProvider.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs index e4e5f6e..519efd7 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/Extensions/UI/UIRequestProvider.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/Extensions/UI/UIRequestTools.cs @@ -1,10 +1,10 @@ //----------------------------------------------------------------------- -// <copyright file="UIRequestProvider.cs" company="Andrew Arnott"> +// <copyright file="UIRequestTools.cs" company="Andrew Arnott"> // Copyright (c) Andrew Arnott. All rights reserved. // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.OpenId.Extensions.UI { +namespace DotNetOpenAuth.OpenId.Provider.Extensions.UI { using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -29,12 +29,13 @@ namespace DotNetOpenAuth.OpenId.Extensions.UI { /// whether to use a standard full window redirect or a popup) via the /// <see cref="IdentifierDiscoveryResult.IsExtensionSupported<T>()"/> method.</para> /// </remarks> - public static class UIRequestProvider { + public static class UIRequestTools { /// <summary> /// Gets the URL of the RP icon for the OP to display. /// </summary> /// <param name="realm">The realm of the RP where the authentication request originated.</param> - /// <param name="provider">The Provider instance used to obtain the authentication request.</param> + /// <param name="webRequestHandler">The web request handler to use for discovery. + /// Usually available via <see cref="Channel.WebRequestHandler">OpenIdProvider.Channel.WebRequestHandler</see>.</param> /// <returns> /// A sequence of the RP's icons it has available for the Provider to display, in decreasing preferred order. /// </returns> @@ -49,13 +50,18 @@ namespace DotNetOpenAuth.OpenId.Extensions.UI { /// </Service> /// </example> /// </remarks> - public static IEnumerable<Uri> GetRelyingPartyIconUrls(Realm realm, OpenIdProvider provider) { + public static IEnumerable<Uri> GetRelyingPartyIconUrls(Realm realm, IDirectWebRequestHandler webRequestHandler) { Contract.Requires(realm != null); - Contract.Requires(provider != null); + Contract.Requires(webRequestHandler != null); ErrorUtilities.VerifyArgumentNotNull(realm, "realm"); - ErrorUtilities.VerifyArgumentNotNull(provider, "provider"); + ErrorUtilities.VerifyArgumentNotNull(webRequestHandler, "webRequestHandler"); - return UIRequest.GetRelyingPartyIconUrls(realm, provider.Channel.WebRequestHandler); + XrdsDocument xrds = realm.Discover(webRequestHandler, false); + if (xrds == null) { + return Enumerable.Empty<Uri>(); + } else { + return xrds.FindRelyingPartyIcons(); + } } } } diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/HmacShaAssociationProvider.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HmacShaAssociationProvider.cs index e31c5a4..3cfc0b6 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/HmacShaAssociationProvider.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/HmacShaAssociationProvider.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.OpenId { +namespace DotNetOpenAuth.OpenId.Provider { using System; using System.Collections.Generic; using System.Diagnostics.Contracts; diff --git a/src/DotNetOpenAuth.OpenId.Provider/OpenId/OpenIdProviderUtilities.cs b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/OpenIdProviderUtilities.cs index f09d0e9..cf525f1 100644 --- a/src/DotNetOpenAuth.OpenId.Provider/OpenId/OpenIdProviderUtilities.cs +++ b/src/DotNetOpenAuth.OpenId.Provider/OpenId/Provider/OpenIdProviderUtilities.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.OpenId { +namespace DotNetOpenAuth.OpenId.Provider { using System; using System.Collections.Generic; using System.Diagnostics.Contracts; |