Author: solomax
Date: Fri Jan 10 05:11:58 2014
New Revision: 1557032
URL: http://svn.apache.org/r1557032
Log:
[OPENMEETINGS-868] Option for controlling user creation availability via
SOAP/REST is added
Modified:
openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Modified: openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html (original)
+++ openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html Fri Jan 10
05:11:58 2014
@@ -953,6 +953,34 @@ limitations under the License.
2.2.x
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" class="configCell" colspan=""
rowspan="" valign="top" align="left" style="color: black; font-size: small;
font-family: arial, helvetica, sanserif;">
+ allow_frontend_register
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ (configurable during install)
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ Is user register available on login screen
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ 1.8.x
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#a0ddf0" class="configCell" colspan=""
rowspan="" valign="top" align="left" style="color: black; font-size: small;
font-family: arial, helvetica, sanserif;">
+ allow.soap.register
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ 1
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ Is user register available via SOAP/REST
+ </td>
+ <td bgcolor="#a0ddf0" class="configCell"
colspan="" rowspan="" valign="top" align="left" style="color: black; font-size:
small; font-family: arial, helvetica, sanserif;">
+ 3.0.x
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified:
openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
Fri Jan 10 05:11:58 2014
@@ -31,6 +31,7 @@ import static org.apache.openmeetings.ut
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -306,8 +307,8 @@ public class ImportInitvalues {
+ "for more
Information see http://openmeetings.apache.org/CustomCryptMechanism.html";);
configurationDao.add(CONFIG_FRONTEND_REGISTER_KEY,
- cfg.allowFrontendRegister, null, "");
-
+ cfg.allowFrontendRegister, null, "Is user
register available on login screen");
+ configurationDao.add(CONFIG_SOAP_REGISTER_KEY, "1", null, "Is
user register available via SOAP/REST");
configurationDao.add("default_group_id", "1", null, "");
// this domain_id is the Organisation of users who register
through the
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/user/UserManager.java
Fri Jan 10 05:11:58 2014
@@ -19,7 +19,7 @@
package org.apache.openmeetings.data.user;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.util.Arrays;
@@ -604,8 +604,7 @@ public class UserManager implements IUse
boolean generateSipUserData, String jNameTimeZone,
Boolean sendConfirmation) {
try {
// Checks if FrontEndUsers can register
- if ("1".equals(configurationDao.getConfValue(
- CONFIG_FRONTEND_REGISTER_KEY,
String.class, "0"))) {
+ if
("1".equals(configurationDao.getConfValue(CONFIG_SOAP_REGISTER_KEY,
String.class, "0"))) {
// TODO: Read and generate SIP-Data via
RPC-Interface Issue 1098
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/MainService.java
Fri Jan 10 05:11:58 2014
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.remote;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
@@ -492,17 +491,6 @@ public class MainService implements IPen
return Arrays.asList(TimeZone.getAvailableIDs());
}
- /**
- * Load if the users can register itself by using the form without
logging
- * in, needs no authentification to load
- *
- * @param SID
- * @return configuration with key {@link
OpenmeetingsVariables#CONFIG_FRONTEND_REGISTER_KEY}
- */
- public Configuration allowFrontendRegister(String SID) {
- return
configurationDao.get(CONFIG_FRONTEND_REGISTER_KEY).get(0); //FIXME need to be
removed
- }
-
public List<Configuration> getGeneralOptions(String SID) {
try {
return configurationDao.get("exclusive.audio.keycode",
"red5sip.enable", CONFIG_MAX_UPLOAD_SIZE_KEY,
Modified:
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
(original)
+++
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
Fri Jan 10 05:11:58 2014
@@ -24,6 +24,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_DASHBOARD_SHOW_RSS_KEY =
"dashboard.show.rssfeed";
public static final String CONFIG_DEFAUT_LANG_KEY = "default_lang_id";
public static final String CONFIG_FRONTEND_REGISTER_KEY =
"allow_frontend_register";
+ public static final String CONFIG_SOAP_REGISTER_KEY =
"allow.soap.register";
public static final String CONFIG_LOGIN_MIN_LENGTH_KEY =
"user.login.minimum.length";
public static final String CONFIG_MAX_UPLOAD_SIZE_KEY =
"max_upload_size";
public static final String CONFIG_PASS_MIN_LENGTH_KEY =
"user.pass.minimum.length";
Modified: openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml?rev=1557032&r1=1557031&r2=1557032&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml Fri Jan 10
05:11:58 2014
@@ -164,6 +164,18 @@
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Users entered the room via invitationHash or
secureHash will be redirected to this URL on connection lost </td>
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.2.x </td>
</tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> allow_frontend_register </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> (configurable during install) </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Is user register available on login screen </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 1.8.x </td>
+ </tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> allow.soap.register </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 1 </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Is user register available via SOAP/REST </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 3.0.x </td>
+ </tr>
</table>
</section>
