svn commit: r1737306 - in /openmeetings/application: branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/

[solomax]

Author: solomax
Date: Fri Apr  1 05:03:57 2016
New Revision: 1737306

URL: http://svn.apache.org/viewvc?rev=1737306&view=rev
Log:
[OPENMEETINGS-1342] external users get correct User.Type upon creation

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
    
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1737306&r1=1737305&r2=1737306&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
 Fri Apr  1 05:03:57 2016
@@ -56,6 +56,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.util.AuthLevelUtil;
 import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.webservice.error.ServiceException;
+import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,11 +178,12 @@ public class UserWebService {
                                User u = userDao.get(userId);
 
                                u.getRights().add(Right.Room);
-                               if (user.getExternalId() == null && 
user.getExternalType() == null) {
+                               if (Strings.isEmpty(user.getExternalId()) && 
Strings.isEmpty(user.getExternalType())) {
                                        // activate the User
                                        u.getRights().add(Right.Login);
                                        u.getRights().add(Right.Dashboard);
                                } else {
+                                       u.setType(User.Type.external);
                                        u.setExternalId(user.getExternalId());
                                        
u.setExternalType(user.getExternalType());
                                }

Modified: 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1737306&r1=1737305&r2=1737306&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
 Fri Apr  1 05:03:57 2016
@@ -56,6 +56,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.util.AuthLevelUtil;
 import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.webservice.error.ServiceException;
+import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,11 +178,12 @@ public class UserWebService {
                                User u = userDao.get(userId);
 
                                u.getRights().add(Right.Room);
-                               if (user.getExternalId() == null && 
user.getExternalType() == null) {
+                               if (Strings.isEmpty(user.getExternalId()) && 
Strings.isEmpty(user.getExternalType())) {
                                        // activate the User
                                        u.getRights().add(Right.Login);
                                        u.getRights().add(Right.Dashboard);
                                } else {
+                                       u.setType(User.Type.external);
                                        u.setExternalId(user.getExternalId());
                                        
u.setExternalType(user.getExternalType());
                                }