summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2010-03-12 18:42:48 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2010-03-12 18:42:48 -0800
commit4de05257ce09d117e5e28fa2e9026459a738607f (patch)
tree688f388cc57ba9df7262464d95daa86a03c91ec5
parent5bc2a84178f6bb08867de2f4fc88b2909f3cf33c (diff)
downloadDotNetOpenAuth-4de05257ce09d117e5e28fa2e9026459a738607f.zip
DotNetOpenAuth-4de05257ce09d117e5e28fa2e9026459a738607f.tar.gz
DotNetOpenAuth-4de05257ce09d117e5e28fa2e9026459a738607f.tar.bz2
Reversed some changes that turned out were not necessary.
-rw-r--r--src/DotNetOpenAuth/Messaging/OutgoingWebResponse.cs2
-rw-r--r--src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/DotNetOpenAuth/Messaging/OutgoingWebResponse.cs b/src/DotNetOpenAuth/Messaging/OutgoingWebResponse.cs
index c0fb06c..6ccc1cb 100644
--- a/src/DotNetOpenAuth/Messaging/OutgoingWebResponse.cs
+++ b/src/DotNetOpenAuth/Messaging/OutgoingWebResponse.cs
@@ -191,7 +191,7 @@ namespace DotNetOpenAuth.Messaging {
/// This is useful for desktop applications that will spawn a user agent to transmit the message
/// rather than cause a redirect.
/// </remarks>
- public Uri GetDirectUriRequest(Channel channel) {
+ internal Uri GetDirectUriRequest(Channel channel) {
Contract.Requires<ArgumentNullException>(channel != null);
var message = this.OriginalMessage as IDirectedProtocolMessage;
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
index 1031e4f..672bbfa 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
@@ -914,9 +914,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
// Resolve the trust root, and swap out the scheme and port if necessary to match the
// return_to URL, since this match is required by OpenId, and the consumer app
// may be using HTTP at some times and HTTPS at others.
- // Only resolve the realm URL if we're actually hosted in a page, as opposed to being invoked
- // from RelyingPartyUtilities.
- UriBuilder realm = this.Page != null ? OpenIdUtilities.GetResolvedRealm(this.Page, this.RealmUrl, this.RelyingParty.Channel.GetRequestFromContext()) : new UriBuilder(this.RealmUrl);
+ UriBuilder realm = OpenIdUtilities.GetResolvedRealm(this.Page, this.RealmUrl, this.RelyingParty.Channel.GetRequestFromContext());
realm.Scheme = returnToApproximation.Scheme;
realm.Port = returnToApproximation.Port;