diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:20:01 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-08-31 22:20:01 -0700 |
| commit | 0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f (patch) | |
| tree | a6681a912fab62ccf5e8e005ac382f6bcfb34a4b /samples/OAuthServiceProvider | |
| parent | 0918f556a7da5f731b97cb4bbaa1ee5349c29d41 (diff) | |
| parent | 307ba2d4b5ad4574a52922b40027ea978e3d8a04 (diff) | |
| download | DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.zip DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.tar.gz DotNetOpenAuth-0488ebcfaef60e51bfcf7958b4a59d0ba5332a0f.tar.bz2 | |
Merge branch 'v3.0' into v3.1
Conflicts:
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/OpenId/OpenIdStrings.Designer.cs
src/DotNetOpenAuth/OpenId/OpenIdStrings.resx
Diffstat (limited to 'samples/OAuthServiceProvider')
| -rw-r--r-- | samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs | 2 | ||||
| -rw-r--r-- | samples/OAuthServiceProvider/App_Code/OAuthToken.cs | 2 | ||||
| -rw-r--r-- | samples/OAuthServiceProvider/Default.aspx | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs b/samples/OAuthServiceProvider/App_Code/OAuthConsumer.cs index 1255717..db8f469 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 this.Callback != null ? new Uri(this.Callback) : null; } + get { return string.IsNullOrEmpty(this.Callback) ? null : new Uri(this.Callback); } } DotNetOpenAuth.OAuth.VerificationCodeFormat IConsumerDescription.VerificationCodeFormat { diff --git a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs index ec9b31e..2f26799 100644 --- a/samples/OAuthServiceProvider/App_Code/OAuthToken.cs +++ b/samples/OAuthServiceProvider/App_Code/OAuthToken.cs @@ -26,7 +26,7 @@ public partial class OAuthToken : IServiceProviderRequestToken { } Uri IServiceProviderRequestToken.Callback { - get { return new Uri(this.RequestTokenCallback); } + get { return string.IsNullOrEmpty(this.RequestTokenCallback) ? null : new Uri(this.RequestTokenCallback); } set { this.RequestTokenCallback = value.AbsoluteUri; } } diff --git a/samples/OAuthServiceProvider/Default.aspx b/samples/OAuthServiceProvider/Default.aspx index 67efe3a..683a939 100644 --- a/samples/OAuthServiceProvider/Default.aspx +++ b/samples/OAuthServiceProvider/Default.aspx @@ -47,4 +47,7 @@ <asp:Button ID="createDatabaseButton" runat="server" Text="(Re)create Database" OnClick="createDatabaseButton_Click" /> <asp:Label runat="server" ID="databaseStatus" EnableViewState="false" Text="Database recreated!" Visible="false" /> + <p>Note that to be useful, you really need to either modify the database to add an + account with data that will be accessed by this sample, or modify this very page + to inject that data into the database. </p> </asp:Content> |