[openmeetings] branch master updated: [OPENMEETINGS-1937] externalId/type are required

[solomax]

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 ca5e38a  [OPENMEETINGS-1937] externalId/type are required
ca5e38a is described below

commit ca5e38aea074060208d2580fc6769b0ac8144d44
Author: Maxim Solodovnik <solomax...@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 850b2e9..24228ab 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
@@ -43,30 +43,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 7953369..de0ad42 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
@@ -301,6 +301,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()
@@ -310,7 +313,7 @@ public class UserWebService extends BaseWebService {
 
                        String xmlString = remoteSessionObject.toXml();
 
-                       log.debug("xmlString " + xmlString);
+                       log.debug("xmlString {}", xmlString);
 
                        String hash = soapDao.addSOAPLogin(sid, 
options.getRoomId(),
                                        options.isModerator(), 
options.isShowAudioVideoTest(), options.isAllowSameURLMultipleTimes(),
@@ -323,7 +326,7 @@ public class UserWebService extends BaseWebService {
                                        sd.setPermanent(true);
                                }
                                sd.setXml(xmlString);
-                               sessionDao.update(sd);
+                               sd = sessionDao.update(sd);
                                return new ServiceResult(hash, Type.SUCCESS);
                        }
                        return UNKNOWN;