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/09/29 13:00:47 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1937]
externalId/type are required
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new d11cd4a [OPENMEETINGS-1937] externalId/type are required
d11cd4a is described below
commit d11cd4a9460d86190fe53d9a9324299b365a3992
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Sep 29 20:00:35 2018 +0700
[OPENMEETINGS-1937] externalId/type are required
---
.../openmeetings/db/dao/server/SOAPLoginDao.java | 40 ++++++++++------------
.../openmeetings/webservice/UserWebService.java | 7 ++--
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
index 9001a1b..a119f1d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
@@ -45,30 +45,26 @@ public class SOAPLoginDao {
boolean becomemoderator, boolean showAudioVideoTest,
boolean allowSameURLMultipleTimes, Long recordingId,
boolean allowRecording) {
- try {
- SOAPLogin soapLogin = new SOAPLogin();
- soapLogin.setCreated(new Date());
- soapLogin.setUsed(false);
- soapLogin.setRoomId(roomId);
- soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
- soapLogin.setHash(UUID.randomUUID().toString());
- soapLogin.setRecordingId(recordingId);
- soapLogin.setSessionHash(sessionHash);
- soapLogin.setModerator(becomemoderator);
- soapLogin.setShowAudioVideoTest(showAudioVideoTest);
- soapLogin.setAllowRecording(allowRecording);
+ SOAPLogin soapLogin = new SOAPLogin();
+ soapLogin.setCreated(new Date());
+ soapLogin.setUsed(false);
+ soapLogin.setRoomId(roomId);
+ soapLogin.setAllowSameURLMultipleTimes(allowSameURLMultipleTimes);
+ soapLogin.setHash(UUID.randomUUID().toString());
+ soapLogin.setRecordingId(recordingId);
+ soapLogin.setSessionHash(sessionHash);
+ soapLogin.setModerator(becomemoderator);
+ soapLogin.setShowAudioVideoTest(showAudioVideoTest);
+ soapLogin.setAllowRecording(allowRecording);
- em.persist(soapLogin);
- em.flush();
- Long soapLoginId = soapLogin.getId();
+ em.persist(soapLogin);
+ em.flush();
+ Long soapLoginId = soapLogin.getId();
- if (soapLoginId != null) {
- return soapLogin.getHash();
- } else {
- log.error("[addSOAPLogin]: Could not store SOAPLogin");
- }
- } catch (Exception ex2) {
- log.error("[addSOAPLogin]: ", ex2);
+ if (soapLoginId != null) {
+ return soapLogin.getHash();
+ } else {
+ log.error("[addSOAPLogin]: Could not store SOAPLogin");
}
return null;
}
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 63bbd6e..55d7113 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
@@ -297,6 +297,9 @@ public class UserWebService extends BaseWebService {
)
{
return performCall(sid, User.Right.Soap, sd -> {
+ if (Strings.isEmpty(user.getExternalId()) || Strings.isEmpty(user.getExternalType())) {
+ return new ServiceResult("externalId and/or externalType are not set", Type.ERROR);
+ }
RemoteSessionObject remoteSessionObject = new RemoteSessionObject(
user.getLogin(), user.getFirstname(), user.getLastname()
, user.getProfilePictureUrl(), user.getEmail()
@@ -306,7 +309,7 @@ public class UserWebService extends BaseWebService {
String xmlString = remoteSessionObject.toXml();
- log.debug("xmlString " + xmlString);
+ log.debug("xmlString {}", xmlString);
String hash = getBean(SOAPLoginDao.class).addSOAPLogin(sid, options.getRoomId(),
options.isModerator(), options.isShowAudioVideoTest(), options.isAllowSameURLMultipleTimes(),
@@ -319,7 +322,7 @@ public class UserWebService extends BaseWebService {
sd.setPermanent(true);
}
sd.setXml(xmlString);
- getSessionDao().update(sd);
+ sd = getSessionDao().update(sd);
return new ServiceResult(hash, Type.SUCCESS);
}
return UNKNOWN;