Author: solomax
Date: Mon Aug 12 08:00:23 2013
New Revision: 1513070
URL: http://svn.apache.org/r1513070
Log:
[OPENMEETINGS-760] auth module was removed
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/base/auth/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/beans/files/TestObject.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/WebContent/project.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Aug 12 08:00:23 2013
@@ -83,7 +83,6 @@
<bean id="meetingmemberservice.service"
class="org.apache.openmeetings.remote.MeetingMemberService" />
<bean id="languageservice.service"
class="org.apache.openmeetings.remote.LanguageService" />
<bean id="invitationservice.service"
class="org.apache.openmeetings.remote.InvitationService" />
- <bean id="ldapconfigservice.service"
class="org.apache.openmeetings.remote.LdapConfigService" />
<bean id="whiteboardservice.service"
class="org.apache.openmeetings.remote.WhiteBoardService" />
<bean id="userservice.service"
class="org.apache.openmeetings.remote.UserService" />
<bean id="fileservice.service"
class="org.apache.openmeetings.remote.ConferenceLibrary" />
Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Mon Aug 12 08:00:23
2013
@@ -3531,22 +3531,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="registerNewUser" type="project:registerNewUser" >
-</xs:element>
- <xs:complexType name="registerNewUser" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="user_pass_minimum_length" type="lzx:number"
default="4" >
-</xs:attribute>
- <xs:attribute name="user_login_minimum_length" type="lzx:number"
default="4" >
-</xs:attribute>
- <xs:attribute name="regObject" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseDrawSelect" type="project:baseDrawSelect" >
</xs:element>
<xs:complexType name="baseDrawSelect" mixed="true">
@@ -3917,40 +3901,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="checkLoginData" type="project:checkLoginData" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- LOGIN panel window </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="checkLoginData" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="user_pass_minimum_length" type="lzx:number"
default="4" >
-</xs:attribute>
- <xs:attribute name="user_login_minimum_length" type="lzx:number"
default="4" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- LOGIN panel window </xs:documentation>
-</xs:annotation>
-</xs:attribute>
- <xs:attribute name="sipLoader" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="showResetBox" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="labeliderror" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="initselect" type="lzx:boolean" default="true" >
-</xs:attribute>
- <xs:attribute name="enterPressed" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="childObj" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="lzRecordingsViewBottom"
type="project:lzRecordingsViewBottom" >
<xs:annotation>
<xs:documentation xml:lang="en">
@@ -5623,18 +5573,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="resetForm" type="project:resetForm" >
-</xs:element>
- <xs:complexType name="resetForm" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="showResetBox" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="baseUrl" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawClipArtWhiteBoard" type="project:drawClipArtWhiteBoard" >
</xs:element>
<xs:complexType name="drawClipArtWhiteBoard" mixed="true">
@@ -6577,16 +6515,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="resetPassword" type="project:resetPassword" >
-</xs:element>
- <xs:complexType name="resetPassword" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:labelExplorerBox">
- <xs:attribute name="tempValue" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="lzRecordNavigation" type="project:lzRecordNavigation" >
<xs:annotation>
<xs:documentation xml:lang="en">
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Mon Aug 12 08:00:23 2013
@@ -733,11 +733,6 @@
//check for password reset
if (canvas.wicketsid != null) {
parent.loginWicket.doCall();
- } else if (canvas.isResetUsername){
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.close();
- }
- new lz.resetPassword(canvas.main_content._content.inner);
} else {
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.close();
@@ -746,7 +741,6 @@
if (parent.testAppLoading){
canvas.loadNextStepTestApp();
} else {
-
if (canvas.isinitRoomDirect || canvas.remoteUserLogin
|| canvas.directUserLogin ||
canvas.secureRemoteUserLogin){
if (canvas.thishib.loaderVar != null) {
@@ -754,22 +748,7 @@
}
if($debug) Debug.write("isinitRoomDirect or
remoteUserLogin is true");
parent.markSessionAsLogedIn.doCall();
- } else {
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.setProgress();
- }
-
- //Check if user is auto-logged in by session
- var g = canvas.getUserData();
- if($debug) Debug.write("checkLoginData/g: ",g);
- var storedSession = g["storedSession"];
- if($debug) Debug.write("checkLoginData/save:
",storedSession);
-
- parent.loginByRemember.currentHashSession =
storedSession;
- parent.loginByRemember.doCall();
-
}
-
}
}
</handler>
@@ -798,7 +777,6 @@
canvas.becomemoderator = value.level_id >= 2;
if (value.sessionData == null) {
if ($debug) Debug.write("No Language
Found to assign");
- new
lz.checkLoginData(canvas.main_content._content.inner);
return;
}
hib.userobject = value;
@@ -820,79 +798,7 @@
]]>
</handler>
</netRemoteCallHib>
-
- <netRemoteCallHib name="loginByRemember" funcname="xmlcrm.loginByRemember"
>
- <attribute name="currentHashSession" value="" type="string"/>
- <attribute name="sipLoader" value="null"/>
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
parent.currentHashSession;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("loginByRemember",value);
- if (value != null){
-
- canvas.setAttribute('user_id',value.user_id);
- canvas.setAttribute('firstName',value.firstname);
- canvas.setAttribute('lastName',value.lastname);
- canvas.setAttribute('mail','');
- canvas.setAttribute('lastLogin','');
- canvas.setAttribute('official_code','');
- canvas.setAttribute('picture_uri','');
- canvas.setAttribute('language','');
- canvas.setAttribute('currentuser',value.login);
- if (value.omTimeZone != null) {
-
canvas.setAttribute('jNameTimeZone',value.omTimeZone.jname);
- canvas.timeZoneId = value.omTimeZone.omtimezoneId;
- }
-
- if (value.forceTimeZoneCheck) {
- new lz.labelerrorPopup(canvas,{errorlabelid:1150});
- }
-
- canvas.becomemoderator = value.level_id >= 2;
-
- if (value.sessionData == null) {
- if ($debug) Debug.write("No Language Found to assign");
- new
lz.checkLoginData(canvas.main_content._content.inner);
- return;
- }
-
- if ($debug) Debug.write("value.sessionData: ",
value.sessionData);
- hib.userlang = isNaN(value.sessionData.language_id) ? 1 :
Number(value.sessionData.language_id);
- canvas.setAttribute('userlang', hib.userlang);
- canvas.setAttribute('language_id', hib.userlang);
- hib.userobject = value;
-
- var found = false;
-
- for (var i=0;i<value.organisation_users.length;i++) {
- if
(value.organisation_users[i].organisation.organisation_id ==
value.sessionData.organization_id) {
- found = true;
- hib.currentdomain =
value.organisation_users[i].organisation.name;
- hib.currentdomainObj =
value.organisation_users[i].organisation;
- break;
- }
- }
-
- if (found) {
- hib.getLanguageByIdAndMax.start = 0;
-
- hib.getLanguageByIdAndMax.doCall();
- canvas.focusOnItem = null;
- } else {
- if ($debug) Debug.write("No Organization Found to
assign");
- new
lz.checkLoginData(canvas.main_content._content.inner);
- }
-
- } else {
- if ($debug) Debug.write("No RPC-Sesion Found to assign");
- new lz.checkLoginData(canvas.main_content._content.inner);
- }
- ]]>
- </handler>
- </netRemoteCallHib>
-
-
+
<netRemoteCallHib name="getRoomTypes"
funcname="conferenceservice.getRoomTypes" >
<netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
<handler name="ondata" args="value">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/library.lzx Mon Aug 12
08:00:23 2013
@@ -26,8 +26,6 @@
<include href="contentviews/" />
<include href="navi/" />
- <include href="auth/" />
-
<!-- for main.lzx -->
<include href="externalJavaScript.lzx" />
<include href="functions.lzx" />
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
Mon Aug 12 08:00:23 2013
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.data.basic.dao;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -175,42 +176,30 @@ public class LdapConfigDao implements ID
}
public List<LdapConfig> getActiveLdapConfigs() {
- log.debug("selectMaxFromConfigurations ");
-
- String hql = "select c from LdapConfig c "
- + "where c.deleted = false "
- + "AND c.isActive = :isActive ";
+ log.debug("getActiveLdapConfigs");
// get all users
- TypedQuery<LdapConfig> query = em
- .createQuery(hql, LdapConfig.class);
+ TypedQuery<LdapConfig> query =
em.createNamedQuery("getActiveLdapConfigs", LdapConfig.class);
query.setParameter("isActive", true);
return query.getResultList();
}
public List<LdapConfig> getLdapConfigs() {
- try {
- log.debug("selectMaxFromConfigurations ");
-
- String hql = "select c from LdapConfig c "
- + "where c.deleted = false ";
-
- // get all users
- TypedQuery<LdapConfig> query = em
- .createQuery(hql, LdapConfig.class);
- List<LdapConfig> ll = query.getResultList();
-
- return ll;
- } catch (Exception ex2) {
- log.error("[getActiveLdapConfigs] ", ex2);
- }
- return null;
+ //Add localhost Domain
+ LdapConfig ldapConfig = new LdapConfig();
+
+ ldapConfig.setName("local DB [internal]");
+ ldapConfig.setLdapConfigId(-1);
+
+ List<LdapConfig> result = new ArrayList<LdapConfig>();
+ result.add(ldapConfig);
+ result.addAll(getActiveLdapConfigs());
+ return result;
}
public List<LdapConfig> get(int start, int count) {
- TypedQuery<LdapConfig> q = em.createNamedQuery(
- "getNondeletedLdapConfigs", LdapConfig.class);
+ TypedQuery<LdapConfig> q =
em.createNamedQuery("getNondeletedLdapConfigs", LdapConfig.class);
q.setFirstResult(start);
q.setMaxResults(count);
return q.getResultList();
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
Mon Aug 12 08:00:23 2013
@@ -333,24 +333,6 @@ public class UsersDao implements IDataPr
return new Long(-1);
}
- public Object resetPassByHash(String hash, String pass) {
- try {
- Object u = this.getUserByHash(hash);
- if (u instanceof User) {
- User us = (User) u;
- us.updatePassword(cryptManager,
configurationDao, pass);
- us.setResethash("");
- update(us, -1L);
- return new Long(-8);
- } else {
- return u;
- }
- } catch (Exception e) {
- log.error("[getUserByAdressesId]", e);
- }
- return new Long(-1);
- }
-
/**
* @param search
* @return
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/LdapConfig.java
Mon Aug 12 08:00:23 2013
@@ -43,6 +43,7 @@ import org.simpleframework.xml.Root;
@Entity
@NamedQueries({
@NamedQuery(name="getNondeletedLdapConfigs", query="SELECT u FROM
LdapConfig u WHERE u.deleted = false")
+ , @NamedQuery(name="getActiveLdapConfigs", query="SELECT c FROM
LdapConfig c WHERE c.deleted = false AND c.isActive = :isActive")
})
@Table(name = "ldapconfig")
@Root(name="ldapconfig")
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
Mon Aug 12 08:00:23 2013
@@ -21,9 +21,7 @@ package org.apache.openmeetings.remote;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_MYROOMS_KEY;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DASHBOARD_SHOW_RSS_KEY;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.LOGIN_MIN_LENGTH_KEY;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.MAX_UPLOAD_SIZE_KEY;
-import static
org.apache.openmeetings.persistence.beans.basic.Configuration.PASS_MIN_LENGTH_KEY;
import java.util.Date;
import java.util.HashMap;
@@ -48,7 +46,6 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.LdapLoginManagement;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.basic.Naviglobal;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.RemoteSessionObject;
@@ -67,7 +64,6 @@ import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
-import org.red5.server.api.service.IServiceCapableConnection;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -180,27 +176,6 @@ public class MainService implements IPen
}
/**
- * This Method is just for testing you can find the corresponding Client
- * Function in xmlcrm/auth/checkLoginData.lzx
- *
- * @param myObject2
- * @return - the size of the map passed, or -1 in case of error
- */
- public int testObject(Object myObject2) {
- try {
- @SuppressWarnings("rawtypes")
- LinkedHashMap myObject = (LinkedHashMap) myObject2;
- log.debug("testObject " + myObject.size());
- log.debug("testObject " + myObject.get(1));
- log.debug("testObject " + myObject.get("stringObj"));
- return myObject.size();
- } catch (Exception e) {
- log.error("ex: ", e);
- }
- return -1;
- }
-
- /**
* load this session id before doing anything else
*
* @return a unique session identifier
@@ -242,181 +217,6 @@ public class MainService implements IPen
return null;
}
- public User loginByRemember(String SID, String remoteHashId) {
- try {
-
- Client currentClient;
- IConnection current = Red5.getConnectionLocal();
-
- User o = null;
-
- currentClient =
sessionManager.getClientByStreamId(current
- .getClient().getId(), null);
-
- o = userManager.loginUserByRemoteHash(SID,
remoteHashId);
-
- if (o == null)
- return null;
-
- if (o.getOrganisation_users().isEmpty()) {
- throw new Exception("Users has no organization
assigned");
- }
-
-
o.setSessionData(sessiondataDao.getSessionByHash(remoteHashId));
- currentClient.setUser_id(o.getUser_id());
- SessionVariablesUtil.setUserId(current.getClient(),
o.getUser_id());
-
- if (currentClient.getUser_id() != null
- && currentClient.getUser_id() > 0) {
-
- currentClient.setFirstname(o.getFirstname());
- currentClient.setLastname(o.getLastname());
-
-
scopeApplicationAdapter.syncMessageToCurrentScope("roomConnect", currentClient,
false);
-
- }
-
- return o;
-
- } catch (Exception err) {
- log.error("[loginByRemember]", err);
- }
- return null;
- }
-
- public Object webLoginUser(String SID, String usernameOrEmail,
- String Userpass, Boolean storePermanent, Long
language_id,
- Long ldapConfigId) {
-
- Object returnValue = this.loginUser(SID, usernameOrEmail,
Userpass,
- storePermanent, language_id, ldapConfigId);
-
- if (returnValue instanceof Long) {
- return returnValue;
- } else if (returnValue instanceof User) {
- User us = (User) returnValue;
- if (authLevelUtil.checkUserLevel(
- us.getLevel_id())) {
- return us;
- } else {
- return -52L;
- }
- }
-
- return returnValue;
-
- }
-
- /**
- * auth function, use the SID you get by getsessiondata
- *
- * @param SID
- * @param usernameOrEmail
- * @param Userpass
- * @param storePermanent
- * @param language_id
- * @param ldapConfigId
- * @return a valid user account or an empty user with an error message
and
- * level -1
- */
- public Object loginUser(String SID, String usernameOrEmail,
- String Userpass, Boolean storePermanent, Long
language_id,
- Long ldapConfigId) {
-
- boolean withLdap = false;
-
- if (ldapConfigId > 0) {
- withLdap = true;
- }
-
- try {
- log.warn("loginUser: " + SID + " " + usernameOrEmail);
-
- Client currentClient;
- IConnection current = Red5.getConnectionLocal();
-
- if (current == null)
- return null;
-
- Object o;
-
- if (withLdap) {
- log.debug("Ldap Login");
-
- currentClient = sessionManager
-
.getClientByStreamId(current.getClient().getId(), null);
-
- // LDAP Loggedin Users cannot use the permanent
Login Flag
-
- LdapConfig ldapConfig =
ldapConfigDao.get(ldapConfigId);
-
- String ldapLogin = usernameOrEmail;
- if (ldapConfig.getAddDomainToUserName()) {
- ldapLogin = usernameOrEmail + "@" +
ldapConfig.getDomain();
- }
-
- o = ldapLoginManagement.doLdapLogin(ldapLogin,
- Userpass, currentClient,
current.getClient(), SID,
- ldapConfig.getConfigFileName());
- } else {
-
- currentClient =
sessionManager.getClientByStreamId(current.getClient().getId(), null);
-
- o = userManager.loginUser(SID, usernameOrEmail,
Userpass,
- currentClient,
current.getClient(), storePermanent);
- }
-
- if (o == null)
- return null;
-
- if (!o.getClass().isAssignableFrom(User.class))
- return o;
-
- if (currentClient.getUser_id() != null
- && currentClient.getUser_id() > 0) {
-
- User u = (User) o;
- currentClient.setFirstname(u.getFirstname());
- currentClient.setLastname(u.getLastname());
-
- for (IConnection cons :
current.getScope().getClientConnections()) {
- if (cons != null) {
- Client rcl = this.sessionManager
-
.getClientByStreamId(cons.getClient()
-
.getId(), null);
- if (rcl != null &&
rcl.getIsScreenClient() != null
- &&
rcl.getIsScreenClient()) {
- // continue;
- } else {
- if (cons instanceof
IServiceCapableConnection) {
- if
(!cons.equals(current)) {
- //
log.error("sending roomDisconnect to "
- // +
cons);
- //
RoomClient rcl =
- //
this.sessionManager.getClientByStreamId(cons.getClient().getId());
- // Send
to all connected users
-
((IServiceCapableConnection) cons)
-
.invoke("roomConnect",
-
new Object[] { currentClient },
-
this);
- //
log.error("sending roomDisconnect to "
- // +
cons);
- }
- }
- }
- }
- }
- }
-
- return o;
-
- } catch (Exception err) {
- log.error("loginUser : ", err);
- }
-
- return null;
- }
-
public Object secureLoginByRemote(String SID, String secureHash) {
try {
@@ -750,102 +550,6 @@ public class MainService implements IPen
return null;
}
- public List<Configuration> getLoginOptions(String SID) {
- try {
- return configurationDao.get(FRONTEND_REGISTER_KEY,
"show.facebook.login",
- LOGIN_MIN_LENGTH_KEY,
PASS_MIN_LENGTH_KEY, PASS_MIN_LENGTH_KEY,
- "ldap_default_id");
- } catch (Exception err) {
- log.error("[getLoginOptions]", err);
- }
- return null;
-
- }
-
- /**
- * Add a user register by an Object see [registerUser] for the index of
the
- * Object To allow the registering the config_key
*allow_frontend_register*
- * has to be the value 1 otherwise the user will get an error code
- *
- * @param regObjectObj
- * @return new users_id OR null if an exception, -1 if an error, -4 if
mail
- * already taken, -5 if username already taken, -3 if login or
pass
- * or mail is empty
- */
- public Long registerUserByObject(Object regObjectObj) {
- try {
- @SuppressWarnings("unchecked")
- Map<?, ?> regObject = (Map<Object, Object>)
regObjectObj;
-
- String domain = regObject.get("domain").toString();
- String port = regObject.get("port").toString();
- String webapp = regObject.get("webapp").toString();
-
- String baseURL = "http://"; + domain + ":" + port +
webapp;
- if (port.equals("80")) {
- baseURL = "http://"; + domain + webapp;
- } else if (port.equals("443")) {
- baseURL = "https://"; + domain + webapp;
- }
- String tz = (String)regObject.get("jNameTimeZone");
- if (tz == null || tz.length() == 0) {
- //Empty tz
- return -55L;
- }
- return
userManager.registerUser(regObject.get("Username")
- .toString(),
regObject.get("Userpass").toString(),
- regObject.get("lastname").toString(),
- regObject.get("firstname").toString(),
- regObject.get("email").toString(), new
Date(), regObject
-
.get("street").toString(),
-
regObject.get("additionalname").toString(),
- regObject.get("fax").toString(),
regObject.get("zip")
- .toString(),
-
Long.valueOf(regObject.get("states_id").toString())
- .longValue(),
regObject.get("town").toString(),
-
Long.valueOf(regObject.get("language_id").toString())
- .longValue(), "",
false, baseURL, true,
- tz);
- } catch (Exception ex) {
- log.error("registerUserByObject", ex);
- }
- return new Long(-1);
- }
-
- /**
- * Register a new User To allow the registering the config_key
- * *allow_frontend_register* has to be the value 1 otherwise the user
will
- * get an error code
- *
- * @deprecated use registerUserByObject instead
- * @param SID
- * @param Username
- * @param Userpass
- * @param lastname
- * @param firstname
- * @param email
- * @param age
- * @param street
- * @param additionalname
- * @param fax
- * @param zip
- * @param states_id
- * @param town
- * @param language_id
- * @return new users_id OR null if an exception, -1 if an error, -4 if
mail
- * already taken, -5 if username already taken, -3 if login or
pass
- * or mail is empty
- */
- @Deprecated
- public Long registerUser(String SID, String Username, String Userpass,
- String lastname, String firstname, String email, Date
age,
- String street, String additionalname, String fax,
String zip,
- long states_id, String town, long language_id, String
phone) {
- return userManager.registerUser(Username, Userpass, lastname,
- firstname, email, age, street, additionalname,
fax, zip,
- states_id, town, language_id, phone, false, "",
true, "");
- }
-
/**
* logs a user out and deletes his account
*
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Mon Aug 12 08:00:23 2013
@@ -157,22 +157,6 @@ public class UserService {
return null;
}
- public Long resetUserPwd(String SID, String email, String login,
- String applink) {
- sessiondataDao.checkSession(SID);
- return userManager.resetUser(email, login, applink);
- }
-
- public Object getUserByHash(String SID, String hash) {
- sessiondataDao.checkSession(SID);
- return usersDao.getUserByHash(hash);
- }
-
- public Object resetPassByHash(String SID, String hash, String pass) {
- sessiondataDao.checkSession(SID);
- return usersDao.resetPassByHash(hash, pass);
- }
-
/**
* refreshes the current SID
*
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1513070&r1=1513069&r2=1513070&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Mon Aug 12 08:00:23 2013
@@ -27,10 +27,10 @@ import static org.apache.wicket.ajax.att
import java.util.ArrayList;
import java.util.List;
+import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.data.oauth.OAuth2Dao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer;
-import org.apache.openmeetings.remote.LdapConfigService;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
@@ -232,7 +232,7 @@ public class SignInDialog extends Abstra
loginField.setLabel(Model.of(WebSession.getString(114)));
add(passField = new PasswordTextField("pass", new
PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
passField.setLabel(Model.of(WebSession.getString(115)));
- List<LdapConfig> ldaps =
getBean(LdapConfigService.class).getActiveLdapConfigs();
+ List<LdapConfig> ldaps =
getBean(LdapConfigDao.class).getLdapConfigs();
domain = ldaps.get(0);
add(new WebMarkupContainer("ldap")
.add(new DropDownChoice<LdapConfig>("domain",
new PropertyModel<LdapConfig>(SignInDialog.this, "domain")
