HttpTwitter.SendDirectMessageメソッドをTwitterApiクラスに置き換え

[opentween/open-tween.git] / OpenTween / Connection / HttpConnectionOAuthEcho.cs

diff --git a/OpenTween/Connection/HttpConnectionOAuthEcho.cs b/OpenTween/Connection/HttpConnectionOAuthEcho.cs
index 3ae96bd..7f8802a 100644 (file)
--- a/OpenTween/Connection/HttpConnectionOAuthEcho.cs
+++ b/OpenTween/Connection/HttpConnectionOAuthEcho.cs
@@ -25,6 +25,7 @@
 // Boston, MA 02110-1301, USA.
 
 using HttpConnectionOAuth = OpenTween.HttpConnectionOAuth;
+using OAuthUtility = OpenTween.Connection.OAuthUtility;
 using Uri = System.Uri;
 using HttpWebRequest = System.Net.HttpWebRequest;
 using System.Collections.Generic; // for Dictionary<TKey, TValue>, KeyValuePair<TKey, TValue>
@@ -35,44 +36,24 @@ namespace OpenTween
 {
        public class HttpConnectionOAuthEcho : HttpConnectionOAuth
        {
-               private Uri _realm;
+               public Uri Realm { get; set; }
+               public Uri ServiceProvider { get; set; }
 
-               private Uri _serviceProvider;
-
-               public Uri Realm
+               protected override void AppendOAuthInfo( HttpWebRequest webRequest, Dictionary< string, string > query, string token, string tokenSecret )
                {
-                       set { this._realm = value; }
-               }
+                       var realm = this.Realm.Scheme + "://" + this.Realm.Host + this.Realm.AbsolutePath;
 
-               public Uri ServiceProvider
-               {
-                       set { this._serviceProvider = value; }
-               }
+                       var credential = OAuthUtility.CreateAuthorization( HttpConnection.GetMethod, this.ServiceProvider, query,
+                               this.consumerKey, this.consumerSecret, token, tokenSecret, realm );
 
-               protected override void AppendOAuthInfo( HttpWebRequest webRequest, Dictionary< string, string > query, string token, string tokenSecret )
-               {
-                       // OAuth共通情報取得
-                       Dictionary< string, string > parameter = this.GetOAuthParameter( token );
-                       // OAuth共通情報にquery情報を追加
-                       if ( query != null )
-                               foreach ( KeyValuePair< string, string > item in query )
-                                       parameter.Add( item.Key, item.Value );
-                       // 署名の作成・追加(GETメソッド固定。ServiceProvider呼び出し用の署名作成)
-                       parameter.Add( "oauth_signature", this.CreateSignature( tokenSecret, HttpConnection.GetMethod, this._serviceProvider, parameter ) );
-                       // HTTPリクエストのヘッダに追加
-                       StringBuilder sb = new StringBuilder( "OAuth " );
-                       sb.AppendFormat( "realm=\"{0}://{1}{2}\",", this._realm.Scheme, this._realm.Host, this._realm.AbsolutePath);
-                       foreach ( KeyValuePair< string, string > item in parameter )
-                               if ( item.Key.StartsWith( "oauth_" ) )
-                                       sb.AppendFormat( "{0}=\"{1}\",", item.Key, MyCommon.UrlEncode( item.Value ) );
-                       webRequest.Headers.Add( "X-Verify-Credentials-Authorization", sb.ToString() );
-                       webRequest.Headers.Add( "X-Auth-Service-Provider", string.Format("{0}://{1}{2}", this._serviceProvider.Scheme, this._serviceProvider.Host, this._serviceProvider.AbsolutePath));
+                       webRequest.Headers.Add( "X-Verify-Credentials-Authorization", credential );
+                       webRequest.Headers.Add( "X-Auth-Service-Provider", string.Format("{0}://{1}{2}", this.ServiceProvider.Scheme, this.ServiceProvider.Host, this.ServiceProvider.AbsolutePath));
                }
 
                public HttpConnectionOAuthEcho( Uri realm, Uri serviceProvider )
                {
-                       this._realm = realm;
-                       this._serviceProvider = serviceProvider;
+                       this.Realm = realm;
+                       this.ServiceProvider = serviceProvider;
                }
        }
 }