OAuth SP and web consumer work under OAuth 1.0a.

4 files changed, 42 insertions, 4 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/DataClasses.dbml b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
index 6385d14..712abec 100644
--- a/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
@@ -38,7 +38,8 @@
       <Column Name="ConsumerId" Type="System.Int32" DbType="Int NOT NULL" CanBeNull="false" />
       <Column Name="UserId" Type="System.Int32" DbType="Int" CanBeNull="true" />
       <Column Name="Scope" Type="System.String" DbType="nvarchar(MAX)" CanBeNull="false" />
-      <Column Member="RequestTokenVerifier" Type="System.String" CanBeNull="true" />
+      <Column Name="RequestTokenVerifier" Type="System.String" CanBeNull="true" />
+      <Column Member="RequestTokenCallback" Type="System.String" CanBeNull="true" />
       <Association Name="OAuthConsumer_OAuthToken" Member="OAuthConsumer" ThisKey="ConsumerId" OtherKey="ConsumerId" Type="OAuthConsumer" IsForeignKey="true" DeleteRule="CASCADE" DeleteOnNull="true" />
       <Association Name="User_OAuthToken" Member="User" ThisKey="UserId" OtherKey="UserId" Type="User" IsForeignKey="true" DeleteRule="CASCADE" />
     </Type>
diff --git a/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
index 17a5432..d3f0dce 100644
--- a/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
@@ -20,10 +20,10 @@
         <elementListCompartment Id="464308c4-d112-4448-b0c9-d9b82fb0ca4e" absoluteBounds="0.64, 3.71, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
-    <classShape Id="895ebbc8-8352-4c04-9e53-b8e6c8302d36" absoluteBounds="3.5, 3.125, 2, 2.5401025390624996">
+    <classShape Id="895ebbc8-8352-4c04-9e53-b8e6c8302d36" absoluteBounds="3.5, 3.125, 2, 2.7324039713541666">
       <DataClassMoniker Name="/DataClassesDataContext/OAuthToken" />
       <nestedChildShapes>
-        <elementListCompartment Id="403126d0-3d2a-4af4-b0b8-c489a830bbd4" absoluteBounds="3.515, 3.585, 1.9700000000000002, 1.9801025390625" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="403126d0-3d2a-4af4-b0b8-c489a830bbd4" absoluteBounds="3.515, 3.585, 1.9700000000000002, 2.1724039713541665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
     <associationConnector edgePoints="[(2.625 : 1.31814697265625); (3.5 : 1.31814697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
@@ -40,7 +40,7 @@
         <classShapeMoniker Id="895ebbc8-8352-4c04-9e53-b8e6c8302d36" />
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(0.53125 : 2.27089680989583); (0.53125 : 5.1819482421875); (3.5 : 5.1819482421875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(0.53125 : 2.27089680989583); (0.53125 : 5.27809895833333); (3.5 : 5.27809895833333)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/DataClassesDataContext/User/User_OAuthToken" />
       <nodes>
         <classShapeMoniker Id="696d2c69-040e-411d-9257-bb664b743834" />
diff --git a/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
index d9c2ba4..998f781 100644
--- a/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
@@ -633,6 +633,8 @@ public partial class OAuthToken : INotifyPropertyChanging, INotifyPropertyChange
 	
 	private string _RequestTokenVerifier;
 	
+	private string _RequestTokenCallback;
+	
 	private EntityRef<OAuthConsumer> _OAuthConsumer;
 	
 	private EntityRef<User> _User;
@@ -659,6 +661,8 @@ public partial class OAuthToken : INotifyPropertyChanging, INotifyPropertyChange
     partial void OnScopeChanged();
     partial void OnRequestTokenVerifierChanging(string value);
     partial void OnRequestTokenVerifierChanged();
+    partial void OnRequestTokenCallbackChanging(string value);
+    partial void OnRequestTokenCallbackChanged();
     #endregion
 	
 	public OAuthToken()
@@ -856,6 +860,26 @@ public partial class OAuthToken : INotifyPropertyChanging, INotifyPropertyChange
 		}
 	}
 	
+	[Column(Storage="_RequestTokenCallback")]
+	public string RequestTokenCallback
+	{
+		get
+		{
+			return this._RequestTokenCallback;
+		}
+		set
+		{
+			if ((this._RequestTokenCallback != value))
+			{
+				this.OnRequestTokenCallbackChanging(value);
+				this.SendPropertyChanging();
+				this._RequestTokenCallback = value;
+				this.SendPropertyChanged("RequestTokenCallback");
+				this.OnRequestTokenCallbackChanged();
+			}
+		}
+	}
+	
 	[Association(Name="OAuthConsumer_OAuthToken", Storage="_OAuthConsumer", ThisKey="ConsumerId", OtherKey="ConsumerId", IsForeignKey=true, DeleteOnNull=true, DeleteRule="CASCADE")]
 	public OAuthConsumer OAuthConsumer
 	{
diff --git a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
index fb1368f..1a73461 100644
--- a/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
@@ -43,6 +43,18 @@ public class DatabaseTokenManager : IServiceProviderTokenManager {
 		return Global.DataContext.OAuthTokens.First(token => token.Token == requestToken).RequestTokenVerifier;
 	}
 
+	public void SetRequestTokenCallback(string requestToken, Uri callback) {
+		if (String.IsNullOrEmpty(requestToken)) {
+			throw new ArgumentNullException("requestToken");
+		}
+
+		Global.DataContext.OAuthTokens.First(token => token.Token == requestToken).RequestTokenCallback = callback.AbsoluteUri;
+	}
+
+	public Uri GetRequestTokenCallback(string requestToken) {
+		return new Uri(Global.DataContext.OAuthTokens.First(token => token.Token == requestToken).RequestTokenCallback);
+	}
+
 	#endregion
 
 	#region ITokenManager Members
@@ -70,6 +82,7 @@ public class DatabaseTokenManager : IServiceProviderTokenManager {
 		};
 
 		Global.DataContext.OAuthTokens.InsertOnSubmit(newToken);
+		Global.DataContext.SubmitChanges();
 	}
 
 	/// <summary>