summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2009-06-09 08:23:15 -0700
committerAndrew Arnott <andrewarnott@gmail.com>2009-06-09 08:23:15 -0700
commita5c44dbeaefe5872dc92be1d940a65cb56c0a70f (patch)
tree69e9fe613ed4a9336c4302795cc882ac9a98416c
parente6f0ca7a075d345b8da6871c42c0947f55e0867f (diff)
downloadDotNetOpenAuth-a5c44dbeaefe5872dc92be1d940a65cb56c0a70f.zip
DotNetOpenAuth-a5c44dbeaefe5872dc92be1d940a65cb56c0a70f.tar.gz
DotNetOpenAuth-a5c44dbeaefe5872dc92be1d940a65cb56c0a70f.tar.bz2
Fixed a couple of small bugs.
-rw-r--r--samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs2
-rw-r--r--src/DotNetOpenAuth/OAuth/ServiceProvider.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
index 2de1e85..1255717 100644
--- a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs
@@ -26,7 +26,7 @@ public partial class OAuthConsumer : IConsumerDescription {
}
Uri IConsumerDescription.Callback {
- get { return new Uri(this.Callback); }
+ get { return this.Callback != null ? new Uri(this.Callback) : null; }
}
DotNetOpenAuth.OAuth.VerificationCodeFormat IConsumerDescription.VerificationCodeFormat {
diff --git a/src/DotNetOpenAuth/OAuth/ServiceProvider.cs b/src/DotNetOpenAuth/OAuth/ServiceProvider.cs
index 721d40b..d4f64c8 100644
--- a/src/DotNetOpenAuth/OAuth/ServiceProvider.cs
+++ b/src/DotNetOpenAuth/OAuth/ServiceProvider.cs
@@ -273,7 +273,7 @@ namespace DotNetOpenAuth.OAuth {
ErrorUtilities.VerifyArgumentNotNull(request, "request");
ErrorUtilities.VerifyArgumentNotNull(callback, "callback");
- var authorization = new UserAuthorizationResponse(callback, this.ServiceDescription.Version) {
+ var authorization = new UserAuthorizationResponse(callback, request.Version) {
RequestToken = request.RequestToken,
};