Updated PhotoService.Replace to support absolute filenames

23 · May 6, 2011 · d222a99 · d222a99
1 parent 8abad27
commit d222a99
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+*.ReSharper*
+*.ReSharper
+_ReSharper*
+obj
+bin
+*.suo
diff --git a/src/23API.sln b/src/23API.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Web Developer Express 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "23API", "23API.csproj", "{DE4C51D3-D764-410A-A34C-D6DA6EEAE35A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DE4C51D3-D764-410A-A34C-D6DA6EEAE35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE4C51D3-D764-410A-A34C-D6DA6EEAE35A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE4C51D3-D764-410A-A34C-D6DA6EEAE35A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE4C51D3-D764-410A-A34C-D6DA6EEAE35A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/Implementations/PhotoService.cs b/src/Implementations/PhotoService.cs
@@ -355,13 +355,17 @@ public bool Replace(int photoId, string filename, string fileContentType, System
             // Build request URL
             List<string> requestUrlParameters = new List<string>();
 
+            // Ensure that only relative filenames are sent
+            int relativeFilenameSplit = filename.LastIndexOf('\\');
+            string relativeFilename = (relativeFilenameSplit == -1 ? filename : filename.Substring(relativeFilenameSplit + 1));
+
             // Do the request
             MessageReceivingEndpoint requestMessage = new MessageReceivingEndpoint(_provider.GetRequestUrl("/api/photo/replace", requestUrlParameters), HttpDeliveryMethods.PostRequest | HttpDeliveryMethods.AuthorizationHeaderRequest);
 
             List<MultipartPostPart> data = new List<MultipartPostPart>
             {
                 MultipartPostPart.CreateFormPart("photo_id", photoId.ToString()),
-                MultipartPostPart.CreateFormFilePart("file", filename, fileContentType, filestream)
+                MultipartPostPart.CreateFormFilePart("file", relativeFilename, fileContentType, filestream)
             };
 
             XPathNavigator responseMessage = _provider.DoRequest(requestMessage, data);