Merge remote-tracking branch 'upstream/master'

NuGet/ServiceStack.Common/servicestack.common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ServiceStack.Common</id>
-	<version>3.2.6</version>
+	<version>3.3.0</version>
 	<authors>Demis Bellot</authors> 
     <owners>Demis Bellot</owners>
     <summary>Opensource .NET and Mono REST Web Services framework</summary>

NuGet/ServiceStack/servicestack.nuspec

@@ -2,7 +2,7 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>ServiceStack</id> 
-    <version>3.2.6</version> 
+    <version>3.3.0</version> 
     <authors>Demis Bellot</authors> 
     <owners>Demis Bellot</owners>
     <summary>Opensource .NET and Mono REST Web Services framework</summary>

release/copy.bat

@@ -0,0 +1,6 @@
+COPY ..\NuGet\ServiceStack\lib\*  latest\ServiceStack
+COPY ..\NuGet\ServiceStack.Common\lib\*  latest\ServiceStack
+
+COPY ..\..\ServiceStack.Text\NuGet\lib\*  latest\ServiceStack
+COPY ..\..\ServiceStack.Redis\NuGet\lib\*  latest\ServiceStack
+COPY ..\..\ServiceStack.OrmLite\NuGet\ServiceStack.OrmLite.SqlServer\lib\*  latest\ServiceStack

src/ServiceStack.Common/ServiceClient.Web/ServiceClientBase.cs

@@ -173,11 +173,15 @@ private bool HandleResponseException<TResponse>(Exception ex, string httpMethod,
 					var client = SendRequest(httpMethod, requestUri, request);
 					client.AddBasicAuth(this.UserName, this.Password);
 
-					using (var responseStream = client.GetResponse().GetResponseStream())
+					try
 					{
-						response = DeserializeFromStream<TResponse>(responseStream);
-						return true;
+						using (var responseStream = client.GetResponse().GetResponseStream())
+						{
+							response = DeserializeFromStream<TResponse>(responseStream);
+							return true;
+						}
 					}
+					catch { /* Ignore deserializing error exceptions */ }
 				}
 			}
 			catch (Exception subEx)

src/ServiceStack.Common/Web/HttpResponseStreamWrapper.cs

@@ -54,6 +54,11 @@ public void Close()
 			IsClosed = true;
 		}
 
+		public void End()
+		{
+			Close();
+		}
+
 		public void Flush()
 		{
 			OutputStream.Flush();

src/ServiceStack.Interfaces/ServiceHost/IHttpResponse.cs

@@ -33,6 +33,12 @@ public interface IHttpResponse
 		/// When used in a request or response filter, no more filters or processing is done on this request.
 		/// </summary>
 		void Close();
+
+		/// <summary>
+		/// Calls Response.End() on ASP.NET HttpResponse otherwise is an alias for Close().
+		/// Useful when you want to prevent ASP.NET to provide it's own custom error page.
+		/// </summary>
+		void End();
 
 		/// <summary>
 		/// Response.Flush() and OutputStream.Flush() seem to have different behaviour in ASP.NET

src/ServiceStack.ServiceInterface/Auth/AssignRolesService.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using System.Linq;
+using ServiceStack.Common;
+using ServiceStack.Common.Web;
+using ServiceStack.ServiceInterface.ServiceModel;
+
+namespace ServiceStack.ServiceInterface.Auth
+{
+	public class AssignRoles
+	{
+		public AssignRoles()
+		{
+			this.Roles = new List<string>();
+			this.Permissions = new List<string>();
+		}
+
+		public string UserName { get; set; }
+
+		public List<string> Permissions { get; set; }
+
+		public List<string> Roles { get; set; }
+	}
+
+	public class AssignRolesResponse : IHasResponseStatus
+	{
+		public AssignRolesResponse()
+		{
+			this.AllRoles = new List<string>();
+			this.AllPermissions = new List<string>();
+		}
+
+		public List<string> AllRoles { get; set; }
+
+		public List<string> AllPermissions { get; set; }
+
+		public ResponseStatus ResponseStatus { get; set; }
+	}
+
+	[RequiredRole(AuthFeature.AdminRole)]
+	public class AssignRolesService : RestServiceBase<AssignRoles>
+	{
+		public IUserAuthRepository UserAuthRepo { get; set; }
+
+		public override object OnPost(AssignRoles request)
+		{
+			request.UserName.ThrowIfNullOrEmpty();
+
+			var userAuth = UserAuthRepo.GetUserAuthByUserName(request.UserName);
+			if (userAuth == null)
+				throw HttpError.NotFound(request.UserName);
+
+			if (!request.Roles.IsEmpty())
+			{
+				foreach (var missingRole in request.Roles.Where(x => !userAuth.Roles.Contains(x)))
+				{
+					userAuth.Roles.Add(missingRole);
+				}
+			}
+			if (!request.Permissions.IsEmpty())
+			{
+				foreach (var missingPermission in request.Permissions.Where(x => !userAuth.Permissions.Contains(x)))
+				{
+					userAuth.Permissions.Add(missingPermission);
+				}
+			}
+
+			UserAuthRepo.SaveUserAuth(userAuth);
+
+			return new AssignRolesResponse {
+				AllRoles = userAuth.Roles,
+				AllPermissions = userAuth.Permissions,
+			};
+		}
+	}
+}