You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/04/07 16:18:29 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1864] tests
should be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new ca5d67a [OPENMEETINGS-1864] tests should be fixed
ca5d67a is described below
commit ca5d67aea6973ccdcc4eb5929213538b324ae4c2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Apr 7 17:27:40 2018 +0700
[OPENMEETINGS-1864] tests should be fixed
---
.../org/apache/openmeetings/core/ldap/LdapLoginManager.java | 4 ++--
.../apache/openmeetings/db/dao/basic/ConfigurationDao.java | 11 +++++++++++
.../apache/openmeetings/installation/ImportInitvalues.java | 3 ++-
.../org/apache/openmeetings/service/user/UserManager.java | 6 +++---
.../org/apache/openmeetings/util/OpenmeetingsVariables.java | 9 +++++++++
.../org/apache/openmeetings/webservice/UserWebService.java | 9 ++++++++-
6 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 8028ef9..4faa674 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.db.util.LocaleHelper.validateCountry;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
import static org.apache.openmeetings.util.OmException.BAD_CREDENTIALS;
import static org.apache.openmeetings.util.OmException.UNKNOWN;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import java.io.Closeable;
import java.io.File;
@@ -344,7 +344,7 @@ public class LdapLoginManager {
u.setType(Type.ldap);
u.getRights().remove(Right.Login);
u.setDomainId(domainId);
- Group g = groupDao.get(cfgDao.getLong(CONFIG_DEFAULT_GROUP_ID, null));
+ Group g = groupDao.get(getDefaultGroup());
if (g != null) {
u.getGroupUsers().add(new GroupUser(g, u));
}
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index f907990..b3576fa 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang3.math.NumberUtils.toInt;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_TIMEZONE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
@@ -43,6 +44,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_UR
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MAX_UPLOAD_SIZE;
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.getDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getRoomSettings;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setApplicationName;
@@ -50,6 +52,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.setAudioBitrate
import static org.apache.openmeetings.util.OpenmeetingsVariables.setAudioRate;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setBaseUrl;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setCryptClassName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setDefaultLang;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setExtProcessTtl;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setGaCode;
@@ -334,6 +337,9 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
case CONFIG_PASS_MIN_LENGTH:
reloadPasswdMinLength();
break;
+ case CONFIG_DEFAULT_GROUP_ID:
+ reloadDefaultGroup();
+ break;
}
return entity;
}
@@ -413,6 +419,10 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
setMinPasswdLength(getInt(CONFIG_LOGIN_MIN_LENGTH, USER_PASSWORD_MINIMUM_LENGTH));
}
+ private void reloadDefaultGroup() {
+ setDefaultGroup(getLong(CONFIG_DEFAULT_GROUP_ID, getDefaultGroup()));
+ }
+
public void reinit() {
reloadMaxUpload();
reloadCrypt();
@@ -428,6 +438,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
reloadRoomSettings();
reloadLoginMinLength();
reloadPasswdMinLength();
+ reloadDefaultGroup();
}
private JSONObject reloadRoomSettings() {
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 24ced4e..a9992c6 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -95,6 +95,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINI
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getAudioBitrate;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getAudioRate;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl;
import java.util.ArrayList;
@@ -192,7 +193,7 @@ public class ImportInitvalues {
addCfg(list, CONFIG_REGISTER_SOAP, String.valueOf(true), Configuration.Type.bool, "Is user register available via SOAP/REST", VER_3_0);
addCfg(list, CONFIG_REGISTER_OAUTH, String.valueOf(true), Configuration.Type.bool, "Is user register available via OAuth", VER_3_0);
// this group_id is the Group of users who register through the frontend or SOAP
- addCfg(list, CONFIG_DEFAULT_GROUP_ID, "1", Configuration.Type.number, "", VER_1_8);
+ addCfg(list, CONFIG_DEFAULT_GROUP_ID, String.valueOf(getDefaultGroup()), Configuration.Type.number, "", VER_1_8);
addCfg(list, CONFIG_SMTP_SERVER, cfg.getSmtpServer(), Configuration.Type.string, "this is the smtp server to send messages", VER_1_9);
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
index 95c58b5..b23a5aa 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
@@ -21,10 +21,10 @@ package org.apache.openmeetings.service.user;
import static org.apache.openmeetings.db.dao.user.UserDao.getNewUserInstance;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
import static org.apache.openmeetings.util.OmException.UNKNOWN;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getBaseUrl;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultLang;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getMinLoginLength;
@@ -110,7 +110,7 @@ public class UserManager implements IUserManager {
// this is needed cause the language is not a needed data at registering
u.setLanguageId(languageId != 0 ? languageId : 1);
- u.getGroupUsers().add(new GroupUser(groupDao.get(cfgDao.getLong(CONFIG_DEFAULT_GROUP_ID, null)), u));
+ u.getGroupUsers().add(new GroupUser(groupDao.get(getDefaultGroup()), u));
Object user = registerUser(u, password, null);
@@ -274,7 +274,7 @@ public class UserManager implements IUserManager {
u.setType(Type.oauth);
u.getRights().remove(Right.Login);
u.setDomainId(serverId);
- u.getGroupUsers().add(new GroupUser(groupDao.get(cfgDao.getLong(CONFIG_DEFAULT_GROUP_ID, null)), u));
+ u.getGroupUsers().add(new GroupUser(groupDao.get(getDefaultGroup()), u));
u.setLogin(user.getUid());
u.setShowContactDataToContacts(true);
u.setLastname(user.getLastName());
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 0394b5a..42f65b0 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -130,6 +130,7 @@ public class OpenmeetingsVariables {
private static boolean sipEnabled = false;
private static String gaCode = null;
private static Long defaultLang = 1L;
+ private static Long defaultGroup = 1L;
private static int audioRate = 22050;
private static String audioBitrate = "32k";
private static String defaultTimezone = "Europe/Berlin";
@@ -285,4 +286,12 @@ public class OpenmeetingsVariables {
public static void setMinPasswdLength(int length) {
minPasswdLength = length;
}
+
+ public static Long getDefaultGroup() {
+ return defaultGroup;
+ }
+
+ public static void setDefaultGroup(Long group) {
+ defaultGroup = group;
+ }
}
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 03f8f23..6b55ea1 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.db.dto.basic.ServiceResult.UNKNOWN;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultTimezone;
import static org.apache.openmeetings.webservice.Constants.TNS;
import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_NAME;
@@ -44,6 +45,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.util.StrongPasswordValidator;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
+import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.dto.room.RoomOptionsDTO;
@@ -52,6 +54,7 @@ import org.apache.openmeetings.db.dto.user.UserDTO;
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.Address;
+import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.manager.IClientManager;
@@ -90,6 +93,8 @@ public class UserWebService extends BaseWebService {
private IClientManager clientManager;
@Autowired
private SOAPLoginDao soapDao;
+ @Autowired
+ private GroupDao groupDao;
/**
* @param user - login or email of Openmeetings user with admin or SOAP-rights
@@ -187,7 +192,9 @@ public class UserWebService extends BaseWebService {
}
Object _user;
try {
- _user = userManager.registerUser(user.get(userDao), user.getPassword(), null);
+ User u = user.get(userDao);
+ u.getGroupUsers().add(new GroupUser(groupDao.get(getDefaultGroup()), u));
+ _user = userManager.registerUser(u, user.getPassword(), null);
} catch (NoSuchAlgorithmException | OmException e) {
throw new ServiceException("Unexpected error while creating user");
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.