Merge pull request #373 from Redor/master

Update REST API Plugin to 1.1.7

src/plugins/restAPI/changelog.html

@@ -44,6 +44,13 @@
 REST API Plugin Changelog
 </h1>
 
+<p><b>1.1.7</b> -- November 13th, 2015</p>
+<ul>
+     <li>Added: Provide the possibility to use a Custom Auth Filter</li>
+     <li>Fixed: Preflight request will be not blocked by Authentication</li>
+     <li>Added: Group names in ChatRoom Entity</li>
+</ul>
+
 <p><b>1.1.6</b> -- September 24th, 2015</p>
 <ul>
      <li>Added: Endpoints to add / remove a user from a user group</li>

src/plugins/restAPI/plugin.xml

@@ -5,8 +5,8 @@
     <name>REST API</name>
     <description>Allows administration over a RESTful API.</description>
     <author>Roman Soldatow</author>
-    <version>1.1.6</version>
-    <date>09/24/2015</date>
+    <version>1.1.7</version>
+    <date>11/13/2015</date>
     <minServerVersion>3.10.0</minServerVersion>
     
     <adminconsole>		

src/plugins/restAPI/src/java/org/jivesoftware/openfire/plugin/rest/AuthFilter.java

@@ -46,6 +46,11 @@ public class AuthFilter implements ContainerRequestFilter {
 			throw new WebApplicationException(Status.FORBIDDEN);
 		}
 		
+		// Let the preflight request through the authentication
+		if ("OPTIONS".equals(containerRequest.getMethod())) {
+			return containerRequest;
+		}
+		
 		// To be backwards compatible to userservice 1.*
 		if ("restapi/v1/userservice".equals(containerRequest.getPath())) {
 			return containerRequest;