Merge pull request #76 from Redor/openfire

User Service plugin update to 2.0.1

src/plugins/userservice/changelog.html

@@ -43,9 +43,15 @@
 <h1>
 User Service Plugin Changelog
 </h1>
+
+<p><b>2.0.1</b> -- October 7th, 2014</p>
+<ul>
+    <li>Fixed the problem that authentication type was not saved</li>
+</ul>
+
 <p><b>2.0.0</b> -- October 4th, 2014</p>
 <ul>
-    <li>New restfull API (see readme). The plugin is backward compatible.</li>
+    <li>New restfull API (see readme). The plugin is backward compatible</li>
     <li>Added new requst to get all or specific users</li>
     <li>The user is now extendible with key / values properties</li>
     <li>Added new requst to get roster entries of a specific users</li>

src/plugins/userservice/plugin.xml

@@ -5,8 +5,8 @@
     <name>User Service</name>
     <description>Allows administration of users via HTTP requests.</description>
     <author>Roman Soldatow, Justin Hunt</author>
-    <version>2.0.0</version>
-    <date>10/04/2014</date>
+    <version>2.0.1</version>
+    <date>10/07/2014</date>
     <minServerVersion>3.9.0</minServerVersion>
     
     <adminconsole>		

src/plugins/userservice/src/java/org/jivesoftware/openfire/plugin/UserServicePlugin.java

@@ -438,7 +438,7 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
 
 	public void setHttpBasicAuth(boolean httpBasicAuth) {
 		this.httpBasicAuth = httpBasicAuth;
-		JiveGlobals.setProperty("plugin.userservice.httpAuth.enabled", enabled ? "true" : "false");
+		JiveGlobals.setProperty("plugin.userservice.httpAuth.enabled", httpBasicAuth ? "true" : "false");
 	}
 
 	public void propertySet(String property, Map<String, Object> params) {
@@ -448,6 +448,8 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
 			this.enabled = Boolean.parseBoolean((String) params.get("value"));
 		} else if (property.equals("plugin.userservice.allowedIPs")) {
 			this.allowedIPs = StringUtils.stringToCollection((String) params.get("value"));
+		} else if (property.equals("plugin.userservice.httpAuth.enabled")) {
+			this.httpBasicAuth = Boolean.parseBoolean((String) params.get("value"));
 		}
 	}
 
@@ -458,6 +460,8 @@ public class UserServicePlugin implements Plugin, PropertyEventListener {
 			this.enabled = false;
 		} else if (property.equals("plugin.userservice.allowedIPs")) {
 			this.allowedIPs = Collections.emptyList();
+		} else if (property.equals("plugin.userservice.httpAuth.enabled")) {
+			this.httpBasicAuth = false;
 		}
 	}