Merge pull request #187 from CrustyJew/master

Add RevokeToken to AuthProvider

Author: ddevault

RedditSharp/AuthProvider.cs

@@ -11,6 +11,7 @@ public class AuthProvider
     {
         private const string AccessUrl = "https://ssl.reddit.com/api/v1/access_token";
         private const string OauthGetMeUrl = "https://oauth.reddit.com/api/v1/me";
+        private const string RevokeUrl = "https://www.reddit.com/api/v1/revoke_token";
 
         public static string OAuthToken { get; set; }
         public static string RefreshToken { get; set; }
@@ -39,7 +40,7 @@ public enum Scope
             wikiedit = 0x20000,
             wikiread = 0x40000
         }
-        private readonly IWebAgent _webAgent;
+        private IWebAgent _webAgent;
         private readonly string _redirectUri;
         private readonly string _clientId;
         private readonly string _clientSecret;
@@ -57,6 +58,20 @@ public AuthProvider(string clientId, string clientSecret, string redirectUri)
             _redirectUri = redirectUri;
             _webAgent = new WebAgent();
         }
+        /// <summary>
+        /// Allows use of reddit's OAuth interface, using an app set up at https://ssl.reddit.com/prefs/apps/.
+        /// </summary>
+        /// <param name="clientId">Granted by reddit as part of app.</param>
+        /// <param name="clientSecret">Granted by reddit as part of app.</param>
+        /// <param name="redirectUri">Selected as part of app. Reddit will send users back here.</param>
+        /// <param name="agent">Implementation of IWebAgent to use to make requests.</param>
+        public AuthProvider(string clientId, string clientSecret, string redirectUri,IWebAgent agent)
+        {
+            _clientId = clientId;
+            _clientSecret = clientSecret;
+            _redirectUri = redirectUri;
+            _webAgent = agent;
+        }
 
         /// <summary>
         /// Creates the reddit OAuth2 Url to redirect the user to for authorization. 
@@ -154,6 +169,26 @@ public string GetOAuthToken(string username, string password)
             throw new AuthenticationException("Could not log in.");
         }
 
+        public void RevokeToken(string token, bool isRefresh)
+        {
+            string tokenType = isRefresh ? "refresh_token" : "access_token";
+            var request = _webAgent.CreatePost(RevokeUrl);
+
+            request.Headers["Authorization"] = "Basic " + Convert.ToBase64String(Encoding.Default.GetBytes(_clientId + ":" + _clientSecret));
+
+            var stream = request.GetRequestStream();
+
+            _webAgent.WritePostBody(stream, new
+            {
+                token = token,
+                token_type = tokenType
+            });
+
+            stream.Close();
+
+            _webAgent.ExecuteRequest(request);
+
+        }
         /// <summary>
         /// Gets a user authenticated by OAuth2.
         /// </summary>

RedditSharp/WebAgent.cs

@@ -105,34 +105,42 @@ public JToken CreateAndExecuteRequest(string url)
         public JToken ExecuteRequest(HttpWebRequest request)
         {
             EnforceRateLimit();
-            var response = request.GetResponse();
+            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
             var result = GetResponseString(response.GetResponseStream());
 
-            var json = JToken.Parse(result);
-            try
+            JToken json;
+            if (!string.IsNullOrEmpty(result))
             {
-                if (json["json"] != null)
+                json = JToken.Parse(result);
+                try
                 {
-                    json = json["json"]; //get json object if there is a root node
-                }
-                if (json["error"] != null)
-                {
-                    switch (json["error"].ToString())
+                    if (json["json"] != null)
+                    {
+                        json = json["json"]; //get json object if there is a root node
+                    }
+                    if (json["error"] != null)
                     {
-                        case "404":
-                            throw new Exception("File Not Found");
-                        case "403":
-                            throw new Exception("Restricted");
-                        case "invalid_grant":
-                            //Refresh authtoken
-                            //AccessToken = authProvider.GetRefreshToken();
-                            //ExecuteRequest(request);
-                            break;
+                        switch (json["error"].ToString())
+                        {
+                            case "404":
+                                throw new Exception("File Not Found");
+                            case "403":
+                                throw new Exception("Restricted");
+                            case "invalid_grant":
+                                //Refresh authtoken
+                                //AccessToken = authProvider.GetRefreshToken();
+                                //ExecuteRequest(request);
+                                break;
+                        }
                     }
                 }
+                catch
+                {
+                }
             }
-            catch
+            else
             {
+                json = JToken.Parse("{'method':'" + response.Method + "','uri':'" + response.ResponseUri.AbsoluteUri + "','status':'" + response.StatusCode.ToString() + "'}");
             }
             return json;