Updates for the inVerse plugin (#859)

* OF-1370: inVerse plugin: hide registration tab. When a user cannot register (if the domain is locked, and IBR is disabled), registration options should not be shown. * OF-1371: Upgrade inVerse to 3.2.1 This commit replaces the converse.js 3.1.0 release with version 3.2.1. Additionally, the plugin now contains a copy of jquery (where previously, a link to a CDN was used).

Updates for the inVerse plugin (#859)
* OF-1370: inVerse plugin: hide registration tab. When a user cannot register (if the domain is locked, and IBR is disabled), registration options should not be shown. * OF-1371: Upgrade inVerse to 3.2.1 This commit replaces the converse.js 3.1.0 release with version 3.2.1. Additionally, the plugin now contains a copy of jquery (where previously, a link to a CDN was used).
ede1e7d0 · Guus der Kinderen · daryl herzmann · f06ab4b3 · ede1e7d0 · ede1e7d0
Commit ede1e7d0 authored Sep 04, 2017 by Guus der Kinderen Committed by daryl herzmann Sep 04, 2017
8 changed files
--- a/src/plugins/inverse/changelog.html
+++ b/src/plugins/inverse/changelog.html
@@ -43,6 +43,12 @@
    inVerse Plugin Changelog
 </h1>

+<p><b>3.2.1 Release 1</b> -- September 4th, 2017</p>
+<ul>
+    <li><a href="https://issues.igniterealtime.org/browse/OF-1370">OF-1370: hide registration tab when appropriate.</a></li>
+    <li><a href="https://issues.igniterealtime.org/browse/OF-1371">OF-1371: upgrade to converse.js 3.2.1.</a></li>
+</ul>
+
 <p><b>3.1.0 Release 1</b> -- July 10th, 2017</p>
 <ul>
    <li><a href="https://issues.igniterealtime.org/browse/OF-1359">OF-1359: Elevate webclients to top level menu in openfire admin UI</a></li>

--- a/src/plugins/inverse/classes/index.html
+++ b/src/plugins/inverse/classes/index.html
@@ -6,9 +6,7 @@
    <title>inVerse</title>
    <link rel="shortcut icon" type="image/ico" href="inverse/css/images/favicon.ico"/>
    <link type="text/css" rel="stylesheet" media="screen" href="inverse/css/inverse.min.css" />
-    <![if gte IE 9]>
    <script src="inverse/dist/inverse.min.js"></script>
-    <![endif]>
 </head>
 <body>
 <div class="content">
@@ -16,7 +14,7 @@
        <h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>
    </div>
 </div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+<script src="jquery/dist/jquery.min.js"></script>
 <script>
    $( document ).ready( function()
    {

--- a/src/plugins/inverse/classes/inverse/css/inverse.min.css
+++ b/src/plugins/inverse/classes/inverse/css/inverse.min.css
--- a/src/plugins/inverse/classes/inverse/dist/inverse.min.js
+++ b/src/plugins/inverse/classes/inverse/dist/inverse.min.js
--- a/src/plugins/inverse/classes/jquery/dist/jquery.min.js
+++ b/src/plugins/inverse/classes/jquery/dist/jquery.min.js
--- a/src/plugins/inverse/plugin.xml
+++ b/src/plugins/inverse/plugin.xml
@@ -4,8 +4,8 @@
    <name>inVerse</name>
    <description>Adds the (third-party) inVerse web client to Openfire.</description>
    <author>Guus der Kinderen</author>
-    <version>3.1.0 Release 1</version>
-    <date>07/10/2017</date>
+    <version>3.2.1 Release 1</version>
+    <date>09/04/2017</date>
    <minServerVersion>4.1.5</minServerVersion>
    <adminconsole>
        <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp">

--- a/src/plugins/inverse/pom.xml
+++ b/src/plugins/inverse/pom.xml
@@ -9,7 +9,7 @@
    <groupId>org.igniterealtime.openfire.plugins</groupId>
    <artifactId>inverse</artifactId>
    <name>Inverse Webchat Plugin</name>
-    <version>3.1.0-release-1</version>
+    <version>3.2.1-release-1</version>

    <build>
        <sourceDirectory>src/java</sourceDirectory>

--- a/src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/ConfigServlet.java
+++ b/src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/ConfigServlet.java
@@ -46,6 +46,7 @@ public class ConfigServlet extends HttpServlet
    {
        Log.trace( "Processing doGet()" );

+        final boolean inbandRegEnabled = XMPPServer.getInstance().getIQRegisterHandler().isInbandRegEnabled();
        final String defaultDomain = JiveGlobals.getProperty( "inverse.config.default_domain", XMPPServer.getInstance().getServerInfo().getXMPPDomain() );
        final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false );
        final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/";
@@ -60,10 +61,18 @@ public class ConfigServlet extends HttpServlet
        config.put( "i18n", language.getCode() );
        config.put( lockedDomain ? "locked_domain" : "default_domain", defaultDomain );

-        if ( XMPPServer.getInstance().getIQRegisterHandler().isInbandRegEnabled() )
+        if ( inbandRegEnabled )
        {
            config.put( "registration_domain", defaultDomain );
        }
+
+        // When the domain that inVerse is locked to does not support IBB, there is no point in showing the
+        // 'registration' taballowing registration. Disallowing registration explicitly will suppress the tab.
+        if ( !inbandRegEnabled && lockedDomain )
+        {
+            config.put( "allow_registration", false );
+        }
+
        config.put( "domain_placeholder", defaultDomain );
        config.put( "bosh_service_url", endpoint );
        config.put( "debug", debug );
@@ -97,4 +106,4 @@ public class ConfigServlet extends HttpServlet
            writer.flush();
        }
    }
-}
\ No newline at end of file
+}