Fixing invalid endpoint values in list command classes.

digitallyborn · digitallyborn · commit ce952f873311 · 2010-09-04T16:07:04.000Z
Made OAuth tokens read-only to the public. It's a lame attempt at some kind of security for the tokens, but it's the least I can do, right?
diff --git a/GettingStarted.txt b/GettingStarted.txt
@@ -35,5 +35,12 @@ A)
 		All of the functionality found in this library is available within Twitterizer2.dll.
 		This file is not necessary for most projects.
 
+	Twitterizer2lite.dll
+		This is a slimmed down version of the Twitterizer2.dll file built with the client profile as the target framework.
+		It will lack some extra pieces of functionality, such as the built-in data caching and support for application 
+		configuration settings.
+		_DO_NOT_ include this file in your project if you are using Twitterizer2.dll. 
+		This file is not necessary for most projects.
+
 Q) What about the license files?
 A) The license files must accompany the dlls. That means that they must be distributed along with your application.
diff --git a/Twitterizer2.TestCases/OAuthTests.cs b/Twitterizer2.TestCases/OAuthTests.cs
@@ -16,10 +16,10 @@ public static void RequestToken()
         {
             OAuthTokens tokens = Configuration.GetTokens();
 
-            OAuthTokenResponse response = OAuthUtility.GetRequestToken(tokens.ConsumerKey, tokens.ConsumerSecret, "oob");
+            //OAuthTokenResponse response = OAuthUtility.GetRequestToken(tokens.ConsumerKey, tokens.ConsumerSecret, "oob");
 
-            Assert.IsNotNull(response);
-            Assert.IsNotNullOrEmpty(response.Token);
+            //Assert.IsNotNull(response);
+            //Assert.IsNotNullOrEmpty(response.Token);
         }
 
         [Test]
diff --git a/Twitterizer2.TestCases/TwitterListTests.cs b/Twitterizer2.TestCases/TwitterListTests.cs
@@ -66,5 +66,35 @@ public static void GetMemberships()
 
             Assert.IsNotNull(lists);
         }
+
+        [Test]
+        public static void CreateAddAndDelete()
+        {
+            OAuthTokens tokens = Configuration.GetTokens();
+
+            string listName = "test-list-ignore";
+            TwitterUser myUser = TwitterAccount.VerifyCredentials(tokens).ResponseObject;
+            var userIdToAdd = TwitterUser.Show(tokens, userName).ResponseObject.Id;
+
+            var listResponse = TwitterList.GetList(tokens, myUser.ScreenName, listName);
+            if (listResponse.Result == RequestResult.FileNotFound)
+            {
+                // Create the new list
+                listResponse = TwitterList.New(tokens, myUser.ScreenName, listName, false, "Testing Twitterizer");
+                Assert.That(listResponse.Result == RequestResult.Success);
+            }
+
+            // Add a user
+            var addMemberResponse = TwitterList.AddMember(tokens, myUser.ScreenName, listName, userIdToAdd);
+            Assert.That(addMemberResponse.Result == RequestResult.Success);
+
+            // Remove the user
+            var removeMemberResponse = TwitterList.RemoveMember(tokens, myUser.ScreenName, listName, userIdToAdd);
+            Assert.That(removeMemberResponse.Result == RequestResult.Success);
+
+            // Delete the list
+            listResponse = TwitterList.Delete(tokens, myUser.ScreenName, listName, null);
+            Assert.That(listResponse.Result == RequestResult.Success);
+        }
     }
 }
diff --git a/Twitterizer2/Core/TwitterCommand.cs b/Twitterizer2/Core/TwitterCommand.cs
@@ -324,6 +324,9 @@ internal virtual TwitterCommand<T> Clone()
         /// <param name="endPoint">The end point.</param>
         protected void SetCommandUri(string endPoint)
         {
+            if (endPoint.StartsWith("/"))
+                throw new ArgumentException("The API endpoint cannot begin with a forward slash. This will result in 404 errors and headaches.", "endPoint");
+
             this.Uri = new Uri(string.Concat(this.OptionalProperties.APIBaseAddress, endPoint));
         }
 
diff --git a/Twitterizer2/Methods/Favorites/CreateFavoriteCommand.cs b/Twitterizer2/Methods/Favorites/CreateFavoriteCommand.cs
@@ -52,7 +52,7 @@ internal sealed class CreateFavoriteCommand : TwitterCommand<TwitterStatus>
         /// <param name="statusId">The status id.</param>
         /// <param name="options">The options.</param>
         public CreateFavoriteCommand(OAuthTokens tokens, decimal statusId, OptionalProperties options) :
-            base(HTTPVerb.POST, string.Format(CultureInfo.InvariantCulture.NumberFormat, "/favorites/{0}/create.json", statusId), tokens, options)
+            base(HTTPVerb.POST, string.Format(CultureInfo.InvariantCulture.NumberFormat, "favorites/{0}/create.json", statusId), tokens, options)
         {
             if (tokens == null)
             {
diff --git a/Twitterizer2/Methods/Favorites/DeleteFavoriteCommand.cs b/Twitterizer2/Methods/Favorites/DeleteFavoriteCommand.cs
@@ -54,7 +54,7 @@ internal sealed class DeleteFavoriteCommand : TwitterCommand<TwitterStatus>
         /// <param name="statusId">The status id.</param>
         /// <param name="options">The options.</param>
         public DeleteFavoriteCommand(OAuthTokens tokens, decimal statusId, OptionalProperties options)
-            : base(HTTPVerb.POST, "/favorites/destroy.json", tokens, options)
+            : base(HTTPVerb.POST, "favorites/destroy.json", tokens, options)
         {
             if (statusId <= 0)
             {
diff --git a/Twitterizer2/Methods/List/AddListMemberCommand.cs b/Twitterizer2/Methods/List/AddListMemberCommand.cs
@@ -54,7 +54,7 @@ internal class AddListMemberCommand : TwitterCommand<TwitterList>
         /// <param name="userId">The user id.</param>
         /// <param name="options">The options.</param>
         public AddListMemberCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)
-            : base(HTTPVerb.POST, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)
+            : base(HTTPVerb.POST, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)
         {
             if (requestTokens == null)
             {
@@ -90,7 +90,7 @@ public AddListMemberCommand(OAuthTokens requestTokens, string ownerUsername, str
         /// </summary>
         public override void Init()
         {
-            this.RequestParameters.Add("user_id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            this.RequestParameters.Add("id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));
         }
     }
 }
diff --git a/Twitterizer2/Methods/List/CheckListMembershipCommand.cs b/Twitterizer2/Methods/List/CheckListMembershipCommand.cs
@@ -54,7 +54,7 @@ internal class CheckListMembershipCommand : TwitterCommand<TwitterUser>
         /// <param name="userId">The user id.</param>
         /// <param name="options">The options.</param>
         public CheckListMembershipCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)
-            : base(HTTPVerb.GET, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members/{2}.json", ownerUsername, listId), requestTokens, options)
+            : base(HTTPVerb.GET, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members/{2}.json", ownerUsername, listId), requestTokens, options)
         {
             if (requestTokens == null)
             {
diff --git a/Twitterizer2/Methods/List/RemoveListMemberCommand.cs b/Twitterizer2/Methods/List/RemoveListMemberCommand.cs
@@ -54,7 +54,7 @@ internal class RemoveListMemberCommand : TwitterCommand<TwitterList>
         /// <param name="userId">The user id.</param>
         /// <param name="options">The options.</param>
         public RemoveListMemberCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)
-            : base(HTTPVerb.DELETE, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)
+            : base(HTTPVerb.DELETE, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)
         {
             if (requestTokens == null)
             {
@@ -90,7 +90,7 @@ public RemoveListMemberCommand(OAuthTokens requestTokens, string ownerUsername,
         /// </summary>
         public override void Init()
         {
-            this.RequestParameters.Add("user_id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));
+            this.RequestParameters.Add("id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));
         }
     }
 }
diff --git a/Twitterizer2/Methods/List/TwitterList.cs b/Twitterizer2/Methods/List/TwitterList.cs
@@ -154,6 +154,20 @@ public static TwitterResponse<TwitterList> New(OAuthTokens tokens, string userna
             return Core.CommandPerformer<TwitterList>.PerformAction(command);
         }
 
+        /// <summary>
+        /// Creates a new list for the authenticated user. Accounts are limited to 20 lists.
+        /// </summary>
+        /// <param name="tokens">The oauth tokens.</param>
+        /// <param name="username">The username.</param>
+        /// <param name="name">The list name.</param>
+        /// <param name="isPublic">if set to <c>true</c> creates a public list.</param>
+        /// <param name="description">The description.</param>
+        /// <returns>A <see cref="TwitterList"/> instance.</returns>
+        public static TwitterResponse<TwitterList> New(OAuthTokens tokens, string username, string name, bool isPublic, string description)
+        {
+            return New(tokens, username, name, isPublic, description, null);
+        }
+
         /// <summary>
         /// Updates the specified list.
         /// </summary>
@@ -219,6 +233,20 @@ public static TwitterResponse<TwitterList> GetList(OAuthTokens tokens, string us
             return Core.CommandPerformer<TwitterList>.PerformAction(command);
         }
 
+        /// <summary>
+        /// Show the specified list. Private lists will only be shown if the authenticated user owns the specified list.
+        /// </summary>
+        /// <param name="tokens">The tokens.</param>
+        /// <param name="username">The username.</param>
+        /// <param name="listIdOrSlug">The list id or slug.</param>
+        /// <returns>
+        /// A <see cref="TwitterListCollection"/> instance.
+        /// </returns>
+        public static TwitterResponse<TwitterList> GetList(OAuthTokens tokens, string username, string listIdOrSlug)
+        {
+            return GetList(tokens, username, listIdOrSlug, null);
+        }
+
         /// <summary>
         /// Deletes the specified list. Must be owned by the authenticated user.
         /// </summary>
diff --git a/Twitterizer2/OAuth/OAuthTokens.cs b/Twitterizer2/OAuth/OAuthTokens.cs
@@ -42,24 +42,24 @@ public class OAuthTokens
         /// Gets or sets the access token.
         /// </summary>
         /// <value>The access token.</value>
-        public string AccessToken { get; set; }
+        public string AccessToken { internal get; set; }
 
         /// <summary>
         /// Gets or sets the access token secret.
         /// </summary>
         /// <value>The access token secret.</value>
-        public string AccessTokenSecret { get; set; }
+        public string AccessTokenSecret { internal get; set; }
 
         /// <summary>
         /// Gets or sets the consumer key.
         /// </summary>
         /// <value>The consumer key.</value>
-        public string ConsumerKey { get; set; }
+        public string ConsumerKey { internal get; set; }
 
         /// <summary>
         /// Gets or sets the consumer secret.
         /// </summary>
         /// <value>The consumer secret.</value>
-        public string ConsumerSecret { get; set; }
+        public string ConsumerSecret { internal get; set; }
     }
 }
diff --git a/Twitterizer2/Twitterizer2.cd b/Twitterizer2/Twitterizer2.cd

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ public static void RequestToken()`
`16`	`16`	`{`
`17`	`17`	`OAuthTokens tokens = Configuration.GetTokens();`
`18`	`18`
`19`		`- OAuthTokenResponse response = OAuthUtility.GetRequestToken(tokens.ConsumerKey, tokens.ConsumerSecret, "oob");`
	`19`	`+ //OAuthTokenResponse response = OAuthUtility.GetRequestToken(tokens.ConsumerKey, tokens.ConsumerSecret, "oob");`
`20`	`20`
`21`		`- Assert.IsNotNull(response);`
`22`		`- Assert.IsNotNullOrEmpty(response.Token);`
	`21`	`+ //Assert.IsNotNull(response);`
	`22`	`+ //Assert.IsNotNullOrEmpty(response.Token);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,9 @@ internal virtual TwitterCommand<T> Clone()`
`324`	`324`	`/// <param name="endPoint">The end point.</param>`
`325`	`325`	`protected void SetCommandUri(string endPoint)`
`326`	`326`	`{`
	`327`	`+ if (endPoint.StartsWith("/"))`
	`328`	`+ throw new ArgumentException("The API endpoint cannot begin with a forward slash. This will result in 404 errors and headaches.", "endPoint");`
	`329`	`+`
`327`	`330`	`this.Uri = new Uri(string.Concat(this.OptionalProperties.APIBaseAddress, endPoint));`
`328`	`331`	`}`
`329`	`332`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ internal sealed class CreateFavoriteCommand : TwitterCommand<TwitterStatus>`
`52`	`52`	`/// <param name="statusId">The status id.</param>`
`53`	`53`	`/// <param name="options">The options.</param>`
`54`	`54`	`public CreateFavoriteCommand(OAuthTokens tokens, decimal statusId, OptionalProperties options) :`
`55`		`- base(HTTPVerb.POST, string.Format(CultureInfo.InvariantCulture.NumberFormat, "/favorites/{0}/create.json", statusId), tokens, options)`
	`55`	`+ base(HTTPVerb.POST, string.Format(CultureInfo.InvariantCulture.NumberFormat, "favorites/{0}/create.json", statusId), tokens, options)`
`56`	`56`	`{`
`57`	`57`	`if (tokens == null)`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal sealed class DeleteFavoriteCommand : TwitterCommand<TwitterStatus>`
`54`	`54`	`/// <param name="statusId">The status id.</param>`
`55`	`55`	`/// <param name="options">The options.</param>`
`56`	`56`	`public DeleteFavoriteCommand(OAuthTokens tokens, decimal statusId, OptionalProperties options)`
`57`		`- : base(HTTPVerb.POST, "/favorites/destroy.json", tokens, options)`
	`57`	`+ : base(HTTPVerb.POST, "favorites/destroy.json", tokens, options)`
`58`	`58`	`{`
`59`	`59`	`if (statusId <= 0)`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal class AddListMemberCommand : TwitterCommand<TwitterList>`
`54`	`54`	`/// <param name="userId">The user id.</param>`
`55`	`55`	`/// <param name="options">The options.</param>`
`56`	`56`	`public AddListMemberCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)`
`57`		`- : base(HTTPVerb.POST, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)`
	`57`	`+ : base(HTTPVerb.POST, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)`
`58`	`58`	`{`
`59`	`59`	`if (requestTokens == null)`
`60`	`60`	`{`
`@@ -90,7 +90,7 @@ public AddListMemberCommand(OAuthTokens requestTokens, string ownerUsername, str`
`90`	`90`	`/// </summary>`
`91`	`91`	`public override void Init()`
`92`	`92`	`{`
`93`		`- this.RequestParameters.Add("user_id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));`
	`93`	`+ this.RequestParameters.Add("id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal class CheckListMembershipCommand : TwitterCommand<TwitterUser>`
`54`	`54`	`/// <param name="userId">The user id.</param>`
`55`	`55`	`/// <param name="options">The options.</param>`
`56`	`56`	`public CheckListMembershipCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)`
`57`		`- : base(HTTPVerb.GET, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members/{2}.json", ownerUsername, listId), requestTokens, options)`
	`57`	`+ : base(HTTPVerb.GET, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members/{2}.json", ownerUsername, listId), requestTokens, options)`
`58`	`58`	`{`
`59`	`59`	`if (requestTokens == null)`
`60`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ internal class RemoveListMemberCommand : TwitterCommand<TwitterList>`
`54`	`54`	`/// <param name="userId">The user id.</param>`
`55`	`55`	`/// <param name="options">The options.</param>`
`56`	`56`	`public RemoveListMemberCommand(OAuthTokens requestTokens, string ownerUsername, string listId, decimal userId, OptionalProperties options)`
`57`		`- : base(HTTPVerb.DELETE, string.Format(CultureInfo.CurrentCulture, "/{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)`
	`57`	`+ : base(HTTPVerb.DELETE, string.Format(CultureInfo.CurrentCulture, "{0}/{1}/members.json", ownerUsername, listId), requestTokens, options)`
`58`	`58`	`{`
`59`	`59`	`if (requestTokens == null)`
`60`	`60`	`{`
`@@ -90,7 +90,7 @@ public RemoveListMemberCommand(OAuthTokens requestTokens, string ownerUsername,`
`90`	`90`	`/// </summary>`
`91`	`91`	`public override void Init()`
`92`	`92`	`{`
`93`		`- this.RequestParameters.Add("user_id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));`
	`93`	`+ this.RequestParameters.Add("id", this.UserId.ToString(CultureInfo.InvariantCulture.NumberFormat));`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`