[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory james.mmbase.org:/tmp/cvs-serv4642
Modified Files:
LoginPortlet.java
Log Message:
CMSC-1104 JForum portlet does not work on test environment can add admin super
user for jforum
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- LoginPortlet.java 8 Apr 2009 12:05:13 - 1.21
+++ LoginPortlet.java 13 Apr 2009 05:30:58 - 1.22
@@ -77,8 +77,6 @@
String send_password = request.getParameter(SEND_PASSWORD);
if (StringUtils.isEmpty(send_password)) {
-request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
-
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
} else {
@@ -92,6 +90,7 @@
}
if (Community.isAuthenticated()) {
+ request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
String pageid = preferences.getValue(PAGE, null);
if (StringUtils.isNotEmpty(pageid)) {
Cloud cloud =
CloudProviderFactory.getCloudProvider().getCloud();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory james.mmbase.org:/tmp/cvs-serv4609
Modified Files:
Tag: b1_5
LoginPortlet.java
Log Message:
CMSC-1104 JForum portlet does not work on test environment can add admin super
user for jforum
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.10
retrieving revision 1.11.2.11
diff -u -b -r1.11.2.10 -r1.11.2.11
--- LoginPortlet.java 8 Apr 2009 12:05:26 - 1.11.2.10
+++ LoginPortlet.java 13 Apr 2009 05:30:12 - 1.11.2.11
@@ -77,8 +77,6 @@
String send_password = request.getParameter(SEND_PASSWORD);
if (StringUtils.isEmpty(send_password)) {
-request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
-
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
} else {
@@ -92,6 +90,8 @@
}
if (Community.isAuthenticated()) {
+ request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
+
String pageid = preferences.getValue(PAGE, null);
if (StringUtils.isNotEmpty(pageid)) {
Cloud cloud =
CloudProviderFactory.getCloudProvider().getCloud();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory james.mmbase.org:/tmp/cvs-serv4558
Modified Files:
Tag: b1_6
LoginPortlet.java
Log Message:
CMSC-1104 JForum portlet does not work on test environment can add admin super
user for jforum
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -u -b -r1.15.2.6 -r1.15.2.7
--- LoginPortlet.java 8 Apr 2009 12:05:19 - 1.15.2.6
+++ LoginPortlet.java 13 Apr 2009 05:29:23 - 1.15.2.7
@@ -74,7 +74,6 @@
String send_password = request.getParameter(SEND_PASSWORD);
if (StringUtils.isEmpty(send_password)) {
-request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
@@ -89,6 +88,7 @@
}
if (Community.isAuthenticated()) {
+ request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
String pageid = preferences.getValue(PAGE, null);
if (StringUtils.isNotEmpty(pageid)) {
Cloud cloud =
CloudProviderFactory.getCloudProvider().getCloud();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv17776/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java
Log Message:
CMSC-1375 - LoginPortlet does not return error message for existing users who
entered an incorrect password
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1375
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.9
retrieving revision 1.11.2.10
diff -u -b -r1.11.2.9 -r1.11.2.10
--- LoginPortlet.java 6 Apr 2009 13:07:52 - 1.11.2.9
+++ LoginPortlet.java 8 Apr 2009 12:05:26 - 1.11.2.10
@@ -104,15 +104,14 @@
PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
- if (person == null) {
- log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter(ERRORMESSAGE, "login.failed");
- }
- else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+ if (person != null &&
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
- else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+ else if (person != null &&
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.blocked");
+ } else {
+ log.info(String.format("Login failed for user %s",
userName));
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv17740/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_6
LoginPortlet.java
Log Message:
CMSC-1375 - LoginPortlet does not return error message for existing users who
entered an incorrect password
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1375
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -u -b -r1.15.2.5 -r1.15.2.6
--- LoginPortlet.java 6 Apr 2009 14:25:56 - 1.15.2.5
+++ LoginPortlet.java 8 Apr 2009 12:05:19 - 1.15.2.6
@@ -101,15 +101,14 @@
PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
- if (person == null) {
- log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter(ERRORMESSAGE, "login.failed");
- }
- else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+ if (person != null &&
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
- else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+ else if (person != null &&
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.blocked");
+ } else {
+ log.info(String.format("Login failed for user %s",
userName));
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv17710/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
CMSC-1375 - LoginPortlet does not return error message for existing users who
entered an incorrect password
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1375
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- LoginPortlet.java 6 Apr 2009 14:29:16 - 1.20
+++ LoginPortlet.java 8 Apr 2009 12:05:13 - 1.21
@@ -104,15 +104,14 @@
PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
- if (person == null) {
- log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter(ERRORMESSAGE, "login.failed");
- }
- else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+ if (person != null &&
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
- else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+ else if (person != null &&
RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
response.setRenderParameter(ERRORMESSAGE,
"view.account.blocked");
+ } else {
+ log.info(String.format("Login failed for user %s",
userName));
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv24478/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java
Log Message:
CMSC-1357: renamed field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1357
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.8
retrieving revision 1.11.2.9
diff -u -b -r1.11.2.8 -r1.11.2.9
--- LoginPortlet.java 2 Apr 2009 09:22:39 - 1.11.2.8
+++ LoginPortlet.java 6 Apr 2009 13:07:52 - 1.11.2.9
@@ -62,7 +62,7 @@
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException,
PortletException {
- super.DEFAULT_EMAIL_CONFIRM_TEMPLATE_DIR = EMAIL_TEMPLATE_DIR;
+ super.DEFAULT_EMAIL_CONFIRM_TEMPLATE = EMAIL_TEMPLATE_DIR;
super.doEditDefaults(req, res);
}
@@ -209,7 +209,7 @@
protected String getEmailBody(String emailText,ActionRequest request,
Authentication authentication, Person person) {
- super.DEFAULT_EMAIL_CONFIRM_TEMPLATE_DIR = EMAIL_TEMPLATE_DIR;
+ super.DEFAULT_EMAIL_CONFIRM_TEMPLATE = EMAIL_TEMPLATE_DIR;
return String.format(emailText ==
null?getConfirmationTemplate():emailText, authentication
.getUserId(), authentication.getPassword(), person.getFirstName(),
person.getInfix(), person.getLastName());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv31941/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_6
LoginPortlet.java
Log Message:
CMSC-1320 - LoginPortlet did not correctly check for input of the user. No
returns correct message.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1320
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- LoginPortlet.java 5 Mar 2009 14:27:08 - 1.15.2.1
+++ LoginPortlet.java 5 Mar 2009 15:15:19 - 1.15.2.2
@@ -41,48 +41,66 @@
* @author Remco Bos
*/
public class LoginPortlet extends AbstractLoginPortlet {
+
+ public static final String ERRORMESSAGE = "errormessage";
+
protected static final String ACTION_PARAMETER = "action";
- private static final String ACEGI_SECURITY_FORM_USERNAME_KEY = "j_username";
- private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY = "j_password";
- private static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+ protected static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+ protected static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+ protected static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+
+ protected static final String SEND_PASSWORD = "send_password";
- private static final String SEND_PASSWORD = "send_password";
+ protected static final Log log = LogFactory.getLog(LoginPortlet.class);
- private static final Log log = LogFactory.getLog(LoginPortlet.class);
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException,
PortletException {
super.DEFAULT_EMAIL_CONFIRM_TEMPLATE_DIR = EMAIL_TEMPLATE_DIR;
super.doEditDefaults(req, res);
}
+
@Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter(ACTION_PARAMETER);
PortletPreferences preferences = request.getPreferences();
+
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
String send_password = request.getParameter(SEND_PASSWORD);
+
if (StringUtils.isEmpty(send_password)) {
request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
+
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
+} else {
+ if (StringUtils.isBlank(userName)) {
+ response.setRenderParameter(ERRORMESSAGE,
"register.email.empty");
+ } else {
+ response.setRenderParameter(ERRORMESSAGE,
"register.password.empty");
}
+
+ return; //Because one of the required fields are empty, there
is nothing to check anymore
+}
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s",
userName));
} else {
- PersonService personHibernateService = (PersonService)
ApplicationContextFactory
- .getBean("personService");
+
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
+
if (person == null) {
log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter("errormessage", "login.failed");
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.unconfirmed");
+ response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.blocked");
+ response.setRenderParameter(ERRORM
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv31885/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
CMSC-1320 - LoginPortlet did not correctly check for input of the user. No
returns correct message.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1320
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- LoginPortlet.java 5 Mar 2009 14:27:02 - 1.16
+++ LoginPortlet.java 5 Mar 2009 15:14:59 - 1.17
@@ -41,48 +41,66 @@
* @author Remco Bos
*/
public class LoginPortlet extends AbstractLoginPortlet {
+
+ public static final String ERRORMESSAGE = "errormessage";
+
protected static final String ACTION_PARAMETER = "action";
- private static final String ACEGI_SECURITY_FORM_USERNAME_KEY = "j_username";
- private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY = "j_password";
- private static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+ protected static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+ protected static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+ protected static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+
+ protected static final String SEND_PASSWORD = "send_password";
- private static final String SEND_PASSWORD = "send_password";
+ protected static final Log log = LogFactory.getLog(LoginPortlet.class);
- private static final Log log = LogFactory.getLog(LoginPortlet.class);
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException,
PortletException {
super.DEFAULT_EMAIL_CONFIRM_TEMPLATE_DIR = EMAIL_TEMPLATE_DIR;
super.doEditDefaults(req, res);
}
+
@Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter(ACTION_PARAMETER);
PortletPreferences preferences = request.getPreferences();
+
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
String send_password = request.getParameter(SEND_PASSWORD);
+
if (StringUtils.isEmpty(send_password)) {
request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
+
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
+} else {
+ if (StringUtils.isBlank(userName)) {
+ response.setRenderParameter(ERRORMESSAGE,
"register.email.empty");
+ } else {
+ response.setRenderParameter(ERRORMESSAGE,
"register.password.empty");
}
+
+ return; //Because one of the required fields are empty, there
is nothing to check anymore
+}
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s",
userName));
} else {
- PersonService personHibernateService = (PersonService)
ApplicationContextFactory
- .getBean("personService");
+
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
+
if (person == null) {
log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter("errormessage", "login.failed");
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.unconfirmed");
+ response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.blocked");
+ response.setRenderParameter(ERRORMESSAGE,
"view.account.blocked");
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv31850/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java
Log Message:
CMSC-1320 - LoginPortlet did not correctly check for input of the user. No
returns correct message.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1320
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -b -r1.11.2.5 -r1.11.2.6
--- LoginPortlet.java 5 Mar 2009 14:26:57 - 1.11.2.5
+++ LoginPortlet.java 5 Mar 2009 15:14:52 - 1.11.2.6
@@ -41,48 +41,66 @@
* @author Remco Bos
*/
public class LoginPortlet extends AbstractLoginPortlet {
+
+ public static final String ERRORMESSAGE = "errormessage";
+
protected static final String ACTION_PARAMETER = "action";
- private static final String ACEGI_SECURITY_FORM_USERNAME_KEY = "j_username";
- private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY = "j_password";
- private static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+ protected static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+ protected static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+ protected static final String EMAIL_TEMPLATE_DIR =
"../templates/view/login/forgotpassword.txt";
+
+ protected static final String SEND_PASSWORD = "send_password";
- private static final String SEND_PASSWORD = "send_password";
+ protected static final Log log = LogFactory.getLog(LoginPortlet.class);
- private static final Log log = LogFactory.getLog(LoginPortlet.class);
protected void doEditDefaults(RenderRequest req, RenderResponse res) throws
IOException,
PortletException {
super.DEFAULT_EMAIL_CONFIRM_TEMPLATE_DIR = EMAIL_TEMPLATE_DIR;
super.doEditDefaults(req, res);
}
+
@Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter(ACTION_PARAMETER);
PortletPreferences preferences = request.getPreferences();
+
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
String send_password = request.getParameter(SEND_PASSWORD);
+
if (StringUtils.isEmpty(send_password)) {
request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
+
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
+} else {
+ if (StringUtils.isBlank(userName)) {
+ response.setRenderParameter(ERRORMESSAGE,
"register.email.empty");
+ } else {
+ response.setRenderParameter(ERRORMESSAGE,
"register.password.empty");
}
+
+ return; //Because one of the required fields are empty, there
is nothing to check anymore
+}
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s",
userName));
} else {
- PersonService personHibernateService = (PersonService)
ApplicationContextFactory
- .getBean("personService");
+
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
Person person =
personHibernateService.getPersonByUserId(userName);
+
if (person == null) {
log.info(String.format("Login failed for user %s",
userName));
- response.setRenderParameter("errormessage", "login.failed");
+ response.setRenderParameter(ERRORMESSAGE, "login.failed");
}
else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.unconfirmed");
+ response.setRenderParameter(ERRORMESSAGE,
"view.account.unconfirmed");
}
else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
- response.setRenderParameter("errormessage",
"view.account.blocked");
+ response.setRenderParameter(ERRORM
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java RegisterPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv30221/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_6
LoginPortlet.java RegisterPortlet.java
Log Message:
CMSC-1320 - Registration portlet: made more error proof, added checks and
improved logic.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1320
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- LoginPortlet.java 4 Feb 2009 12:21:16 - 1.15
+++ LoginPortlet.java 5 Mar 2009 14:27:08 - 1.15.2.1
@@ -98,8 +98,7 @@
String sendMessage = "view.account.success";
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory
.getBean("authenticationService");
- PersonService personHibernateService = (PersonService)
ApplicationContextFactory
- .getBean("personService");
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
if (authenticationService.authenticationExists(email)) {
Person person = personHibernateService.getPersonByUserId(email);
Index: RegisterPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -b -r1.1.4.3 -r1.1.4.4
--- RegisterPortlet.java5 Mar 2009 13:32:57 - 1.1.4.3
+++ RegisterPortlet.java5 Mar 2009 14:27:08 - 1.1.4.4
@@ -2,7 +2,7 @@
import java.io.IOException;
import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -86,10 +86,10 @@
@Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- Map errorMessages = new Hashtable();
+ Map errorMessages = new HashMap();
PortletPreferences preferences = request.getPreferences();
- String email =
request.getParameter(ACEGI_SECURITY_FORM_EMAIL_KEY).trim();
+ String emailTo =
request.getParameter(ACEGI_SECURITY_FORM_EMAIL_KEY).trim();
String firstName =
request.getParameter(ACEGI_SECURITY_FORM_FIRSTNAME_KEY);
String infix = request.getParameter(ACEGI_SECURITY_FORM_INFIX_KEY);
String lastName = request.getParameter(ACEGI_SECURITY_FORM_LASTNAME_KEY);
@@ -98,20 +98,22 @@
Long authId = null;
- if (StringUtils.isBlank(email)) {
+ if (StringUtils.isBlank(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.empty");
- } else if (!isEmailAddress(email)) {
+ } else if (!isEmailAddress(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.match");
}
validateInputFields(request, errorMessages, preferences, firstName,
lastName, passwordText, passwordConfirmation);
+ if (errorMessages.isEmpty()) { //Only continue with Community checks,
when there are no other errors yet.
+
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory.getBean("authenticationService");
PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
- Long authenticationId =
authenticationService.getAuthenticationIdForUserId(email);
+ Long authenticationId =
authenticationService.getAuthenticationIdForUserId(emailTo);
if (authenticationId == null) {
- Authentication authentication =
authenticationService.createAuthentication(email, passwordText);
+Authentication authentication =
authenticationService.createAuthentication(emailTo, passwordText);
if (authentication.getId() != null) {
authId = authentication.getId();
@@ -121,7 +123,7 @@
if (lastName == null) lastName = "";
Person person = personHibernateService.createPerson(firstName,
infix, lastName, authId, RegisterStatus.UNCONFIRMED.getName(), new Date());
-person.setEmail(email);
+ person.setEmail(emailTo);
personHibernateService.updatePerson(person);
String groupName = preferences.getValue(GROUPNAME, null);
@@ -132,27 +134,38 @@
String emailSubject = preferences.getValue(EMAIL_SUBJECT, "Y
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java RegisterPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv30145/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java RegisterPortlet.java
Log Message:
CMSC-1320 - Registration portlet: made more error proof, added checks and
improved logic.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1320
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -b -r1.11.2.4 -r1.11.2.5
--- LoginPortlet.java 4 Feb 2009 12:16:29 - 1.11.2.4
+++ LoginPortlet.java 5 Mar 2009 14:26:57 - 1.11.2.5
@@ -98,8 +98,7 @@
String sendMessage = "view.account.success";
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory
.getBean("authenticationService");
- PersonService personHibernateService = (PersonService)
ApplicationContextFactory
- .getBean("personService");
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
if (authenticationService.authenticationExists(email)) {
Person person = personHibernateService.getPersonByUserId(email);
Index: RegisterPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- RegisterPortlet.java5 Mar 2009 13:32:45 - 1.1.2.3
+++ RegisterPortlet.java5 Mar 2009 14:26:57 - 1.1.2.4
@@ -2,7 +2,7 @@
import java.io.IOException;
import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -86,10 +86,10 @@
@Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- Map errorMessages = new Hashtable();
+ Map errorMessages = new HashMap();
PortletPreferences preferences = request.getPreferences();
- String email =
request.getParameter(ACEGI_SECURITY_FORM_EMAIL_KEY).trim();
+ String emailTo =
request.getParameter(ACEGI_SECURITY_FORM_EMAIL_KEY).trim();
String firstName =
request.getParameter(ACEGI_SECURITY_FORM_FIRSTNAME_KEY);
String infix = request.getParameter(ACEGI_SECURITY_FORM_INFIX_KEY);
String lastName = request.getParameter(ACEGI_SECURITY_FORM_LASTNAME_KEY);
@@ -98,20 +98,22 @@
Long authId = null;
- if (StringUtils.isBlank(email)) {
+ if (StringUtils.isBlank(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.empty");
- } else if (!isEmailAddress(email)) {
+ } else if (!isEmailAddress(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.match");
}
validateInputFields(request, errorMessages, preferences, firstName,
lastName, passwordText, passwordConfirmation);
+ if (errorMessages.isEmpty()) { //Only continue with Community checks,
when there are no other errors yet.
+
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory.getBean("authenticationService");
PersonService personHibernateService = (PersonService)
ApplicationContextFactory.getBean("personService");
- Long authenticationId =
authenticationService.getAuthenticationIdForUserId(email);
+ Long authenticationId =
authenticationService.getAuthenticationIdForUserId(emailTo);
if (authenticationId == null) {
- Authentication authentication =
authenticationService.createAuthentication(email, passwordText);
+Authentication authentication =
authenticationService.createAuthentication(emailTo, passwordText);
if (authentication.getId() != null) {
authId = authentication.getId();
@@ -121,7 +123,7 @@
if (lastName == null) lastName = "";
Person person = personHibernateService.createPerson(firstName,
infix, lastName, authId, RegisterStatus.UNCONFIRMED.getName(), new Date());
-person.setEmail(email);
+ person.setEmail(emailTo);
personHibernateService.updatePerson(person);
String groupName = preferences.getValue(GROUPNAME, null);
@@ -132,27 +134,38 @@
String emailSubject = preferences.getValue(EMAIL
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv9001/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java
Log Message:
CMSC-1171 Enhance login-portlet - check handling of person status modes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1171
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- LoginPortlet.java 5 Dec 2008 08:49:59 - 1.11.2.2
+++ LoginPortlet.java 12 Dec 2008 12:36:46 - 1.11.2.3
@@ -95,7 +95,7 @@
} else if ("send_password".equals(action)) {
//TODO send password
String email = request.getParameter("username");
- String sendMessage = "send_success";
+ String sendMessage = "view.account.success";
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory
.getBean("authenticationService");
PersonService personHibernateService = (PersonService)
ApplicationContextFactory
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory james.mmbase.org:/tmp/cvs-serv8934
Modified Files:
LoginPortlet.java
Log Message:
CMSC-1171 Enhance login-portlet - check handling of person status modes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1171
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- LoginPortlet.java 5 Dec 2008 08:48:04 - 1.13
+++ LoginPortlet.java 12 Dec 2008 12:34:49 - 1.14
@@ -95,7 +95,7 @@
} else if ("send_password".equals(action)) {
//TODO send password
String email = request.getParameter("username");
- String sendMessage = "send_success";
+ String sendMessage = "view.account.success";
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory
.getBean("authenticationService");
PersonService personHibernateService = (PersonService)
ApplicationContextFactory
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java RegisterPorlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv26250/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_5
LoginPortlet.java RegisterPorlet.java
Log Message:
CMSC-1171 Enhance login-portlet - check handling of person status modes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1171
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- LoginPortlet.java 4 Dec 2008 09:41:28 - 1.11.2.1
+++ LoginPortlet.java 5 Dec 2008 08:49:59 - 1.11.2.2
@@ -11,6 +11,8 @@
import java.io.IOException;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
@@ -69,9 +71,20 @@
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s",
userName));
} else {
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory
+ .getBean("personService");
+ Person person =
personHibernateService.getPersonByUserId(userName);
+ if (person == null) {
log.info(String.format("Login failed for user %s", userName));
response.setRenderParameter("errormessage", "login.failed");
}
+ else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+ response.setRenderParameter("errormessage",
"view.account.unconfirmed");
+ }
+ else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+ response.setRenderParameter("errormessage",
"view.account.blocked");
+ }
+}
}
else {
response.setRenderParameter(SEND_PASSWORD, "send");
@@ -91,7 +104,7 @@
if (authenticationService.authenticationExists(email)) {
Person person = personHibernateService.getPersonByUserId(email);
Authentication authentication =
authenticationService.findAuthentication(email);
-
if(RegisterStatus.ACTIVE.getName().equalsIgnoreCase(person.getActive()))
+
if(RegisterStatus.ACTIVE.getName().equalsIgnoreCase(person.getActive()) ||
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive()))
{
//todo reset password and send mail
PasswordGenerator generator = new PasswordGenerator();
@@ -105,16 +118,22 @@
String emailFrom = preferences.getValue(EMAIL_FROMEMAIL,
null);
String nameFrom = preferences.getValue(EMAIL_FROMNAME, null);
emailText = getEmailBody(emailText,request, authentication,
person);
+ if (StringUtils.isNotBlank(emailFrom) &&
!isEmailAddress(emailFrom)) {
+throw new AddressException("Email address "+emailFrom+"is
not availalbe");
+ }
EmailUtils.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
email, "text/plain;charset=utf-8");
sendMessage = "view.account.success";
}
- catch (Exception e) {
- log.error("password generation errors");
+ catch (AddressException e) {
+ log.error("Email address failed",e);
}
+ catch (MessagingException e) {
+ log.error("Email MessagingException failed",e);
+ }
+ catch (Exception e) {
+ log.error(e);
}
- else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())){
- sendMessage = "view.account.unconfirmed";
}
else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())){
sendMessage = "view.account.blocked";
Index: RegisterPorlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPorlet.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -b -r1.1.2.11 -r1.1.2.12
--- RegisterPorlet.java 4 Dec 2008 09:41:28 - 1.1.2.11
+++ RegisterPorlet.java 5 Dec 2008 08:49:59 - 1.1.2.12
@@ -98,6 +98,9 @@
emailText = getEmailBody(emailText,request, au
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java RegisterPorlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv26166/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java RegisterPorlet.java
Log Message:
CMSC-1171 Enhance login-portlet - check handling of person status modes
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-1171
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- LoginPortlet.java 4 Dec 2008 09:39:40 - 1.12
+++ LoginPortlet.java 5 Dec 2008 08:48:04 - 1.13
@@ -11,6 +11,8 @@
import java.io.IOException;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
@@ -69,9 +71,20 @@
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s",
userName));
} else {
+ PersonService personHibernateService = (PersonService)
ApplicationContextFactory
+ .getBean("personService");
+ Person person =
personHibernateService.getPersonByUserId(userName);
+ if (person == null) {
log.info(String.format("Login failed for user %s", userName));
response.setRenderParameter("errormessage", "login.failed");
}
+ else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())) {
+ response.setRenderParameter("errormessage",
"view.account.unconfirmed");
+ }
+ else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())) {
+ response.setRenderParameter("errormessage",
"view.account.blocked");
+ }
+}
}
else {
response.setRenderParameter(SEND_PASSWORD, "send");
@@ -91,7 +104,7 @@
if (authenticationService.authenticationExists(email)) {
Person person = personHibernateService.getPersonByUserId(email);
Authentication authentication =
authenticationService.findAuthentication(email);
-
if(RegisterStatus.ACTIVE.getName().equalsIgnoreCase(person.getActive()))
+
if(RegisterStatus.ACTIVE.getName().equalsIgnoreCase(person.getActive()) ||
RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive()))
{
//todo reset password and send mail
PasswordGenerator generator = new PasswordGenerator();
@@ -105,16 +118,22 @@
String emailFrom = preferences.getValue(EMAIL_FROMEMAIL,
null);
String nameFrom = preferences.getValue(EMAIL_FROMNAME, null);
emailText = getEmailBody(emailText,request, authentication,
person);
+ if (StringUtils.isNotBlank(emailFrom) &&
!isEmailAddress(emailFrom)) {
+throw new AddressException("Email address "+emailFrom+"is
not availalbe");
+ }
EmailUtils.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
email, "text/plain;charset=utf-8");
sendMessage = "view.account.success";
}
- catch (Exception e) {
- log.error("password generation errors");
+ catch (AddressException e) {
+ log.error("Email address failed",e);
}
+ catch (MessagingException e) {
+ log.error("Email MessagingException failed",e);
+ }
+ catch (Exception e) {
+ log.error(e);
}
- else if
(RegisterStatus.UNCONFIRMED.getName().equalsIgnoreCase(person.getActive())){
- sendMessage = "view.account.unconfirmed";
}
else if
(RegisterStatus.BLOCKED.getName().equalsIgnoreCase(person.getActive())){
sendMessage = "view.account.blocked";
Index: RegisterPorlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPorlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- RegisterPorlet.java 4 Dec 2008 09:39:40 - 1.11
+++ RegisterPorlet.java 5 Dec 2008 08:48:04 - 1.12
@@ -98,6 +98,9 @@
emailText = getEmailBody(emailText,request, authentication,
person);
try {
+ if (S
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory james.mmbase.org:/tmp/cvs-serv32158
Modified Files:
LoginPortlet.java
Log Message:
CMSC-998, Integrate JForum single sign on with community module
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-998
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- LoginPortlet.java 10 May 2008 16:32:16 - 1.10
+++ LoginPortlet.java 9 Jul 2008 02:56:17 - 1.11
@@ -14,6 +14,7 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
+import javax.portlet.PortletSession;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -42,11 +43,10 @@
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
-
+ request.getPortletSession().setAttribute("username", userName,
PortletSession.APPLICATION_SCOPE);
if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
}
-
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for user %s", userName));
} else {
@@ -54,6 +54,7 @@
response.setRenderParameter("errormessage", "login.failed");
}
} else if ("logout".equals(action)) {
+ request.getPortletSession().removeAttribute("username",
PortletSession.APPLICATION_SCOPE);
Community.logout();
} else {
// Unknown
@@ -65,7 +66,6 @@
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
String template;
-
String error = request.getParameter("errormessage");
if (StringUtils.isNotBlank(error)) {
request.setAttribute("errormessage", error);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv30840/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- LoginPortlet.java 7 Apr 2008 09:50:09 - 1.9
+++ LoginPortlet.java 10 May 2008 16:32:16 - 1.10
@@ -43,7 +43,7 @@
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
- if (!StringUtils.isBlank(userName) && !StringUtils.isBlank(password))
{
+ if (StringUtils.isNotBlank(userName) &&
StringUtils.isNotBlank(password)) {
Community.login(userName, password);
}
@@ -67,7 +67,7 @@
String template;
String error = request.getParameter("errormessage");
- if (!StringUtils.isBlank(error)) {
+ if (StringUtils.isNotBlank(error)) {
request.setAttribute("errormessage", error);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv2612/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same
time *removed* it from the portlet because it doesn't belong there.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- LoginPortlet.java 14 Mar 2008 12:52:11 - 1.8
+++ LoginPortlet.java 7 Apr 2008 09:50:09 - 1.9
@@ -29,18 +29,20 @@
* @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ protected static final String ACTION_PARAMETER = "action";
private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
-
private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
private static final Log log = LogFactory.getLog(LoginPortlet.class);
+ @Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- String action = request.getParameter("action");
+ String action = request.getParameter(ACTION_PARAMETER);
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+
if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
}
@@ -51,16 +53,9 @@
log.info(String.format("Login failed for user
%s", userName));
response.setRenderParameter("errormessage",
"login.failed");
}
-
} else if ("logout".equals(action)) {
Community.logout();
- } else if ("send_password".equals(action)) {
-throw new UnsupportedOperationException("Community module does not
have all methods yet");
-//String username = request.getParameter("username");
-//if (!StringUtils.isBlank(username)) {
-//}
- }
- else {
+ } else {
// Unknown
log.error(String.format("Unknown action '%s'", action));
}
@@ -68,21 +63,20 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+
+ String template;
+
String error = request.getParameter("errormessage");
if (!StringUtils.isBlank(error)) {
request.setAttribute("errormessage", error);
}
- String template = null;
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
- String action = request.getParameter("action");
- if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
- template = "login/send_password.jsp";
- }
}
+
doInclude("view", template, request, response);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv3878/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
CMSC-830 - *added* some functionality to send the password, but at the same
time *removed* it from the portlet because it doesn't belong there.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -u -b -r1.5.2.6 -r1.5.2.7
--- LoginPortlet.java 25 Mar 2008 15:17:43 - 1.5.2.6
+++ LoginPortlet.java 27 Mar 2008 15:32:40 - 1.5.2.7
@@ -14,7 +14,6 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -22,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.Community;
/**
@@ -31,18 +29,20 @@
* @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ protected static final String ACTION_PARAMETER = "action";
private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
-
private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
private static final Log log = LogFactory.getLog(LoginPortlet.class);
+ @Override
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
- String action = request.getParameter("action");
+ String action = request.getParameter(ACTION_PARAMETER);
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+
if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
}
@@ -53,19 +53,9 @@
log.info(String.format("Login failed for user
%s", userName));
response.setRenderParameter("errormessage",
"login.failed");
}
-
} else if ("logout".equals(action)) {
Community.logout();
- } else if ("send_password".equals(action)) {
-String username = request.getParameter("username");
-if (!StringUtils.isBlank(username)) {
- //Get email text and email header from portlet properties and
use it for sending an email
- String emailText =
request.getPreferences().getValue("email.text", "Your account details
associated with the given email address.\n");
- String emailHeader =
request.getPreferences().getValue("email.header", "Account details");
- Community.sendPassword(username, emailText, emailHeader);
-}
- }
- else {
+ } else {
// Unknown
log.error(String.format("Unknown action '%s'", action));
}
@@ -85,11 +75,8 @@
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
- String action = request.getParameter("action");
- if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
- template = "login/send_password.jsp";
- }
}
+
doInclude("view", template, request, response);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv11444/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
Undo get template from preferences
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- LoginPortlet.java 21 Mar 2008 16:46:23 - 1.5.2.5
+++ LoginPortlet.java 25 Mar 2008 15:17:43 - 1.5.2.6
@@ -74,9 +74,7 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- PortletPreferences preferences = request.getPreferences();
- String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
- if (template==null) template = "login/login.jsp";
+ String template;
String error = request.getParameter("errormessage");
if (!StringUtils.isBlank(error)) {
@@ -86,8 +84,7 @@
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
- // take template from preferences
- // template = "login/login.jsp";
+ template = "login/login.jsp";
String action = request.getParameter("action");
if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
template = "login/send_password.jsp";
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv12532/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
CMSC-830 - Add Send Password functionality and improve Community source code,
not fully ready, but big steps are made.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-830
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -u -b -r1.5.2.4 -r1.5.2.5
--- LoginPortlet.java 17 Mar 2008 10:52:35 - 1.5.2.4
+++ LoginPortlet.java 21 Mar 2008 16:46:23 - 1.5.2.5
@@ -57,10 +57,13 @@
} else if ("logout".equals(action)) {
Community.logout();
} else if ("send_password".equals(action)) {
-throw new UnsupportedOperationException("Community module does not
have all methods yet");
-//String username = request.getParameter("username");
-//if (!StringUtils.isBlank(username)) {
-//}
+String username = request.getParameter("username");
+if (!StringUtils.isBlank(username)) {
+ //Get email text and email header from portlet properties and
use it for sending an email
+ String emailText =
request.getPreferences().getValue("email.text", "Your account details
associated with the given email address.\n");
+ String emailHeader =
request.getPreferences().getValue("email.header", "Account details");
+ Community.sendPassword(username, emailText, emailHeader);
+}
}
else {
// Unknown
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv3651/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
make backwards compatible
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- LoginPortlet.java 17 Mar 2008 10:50:24 - 1.5.2.3
+++ LoginPortlet.java 17 Mar 2008 10:52:35 - 1.5.2.4
@@ -73,6 +73,7 @@
PortletPreferences preferences = request.getPreferences();
String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
+ if (template==null) template = "login/login.jsp";
String error = request.getParameter("errormessage");
if (!StringUtils.isBlank(error)) {
@@ -82,7 +83,7 @@
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
- // take template frompreferences
+ // take template from preferences
// template = "login/login.jsp";
String action = request.getParameter("action");
if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv3561/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
take view from preferences
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -b -r1.5.2.2 -r1.5.2.3
--- LoginPortlet.java 3 Mar 2008 08:43:48 - 1.5.2.2
+++ LoginPortlet.java 17 Mar 2008 10:50:24 - 1.5.2.3
@@ -14,6 +14,7 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
+import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -21,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.Community;
/**
@@ -68,16 +70,20 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+
+ PortletPreferences preferences = request.getPreferences();
+ String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
+
String error = request.getParameter("errormessage");
if (!StringUtils.isBlank(error)) {
request.setAttribute("errormessage", error);
}
- String template = null;
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
- template = "login/login.jsp";
+ // take template frompreferences
+ // template = "login/login.jsp";
String action = request.getParameter("action");
if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
template = "login/send_password.jsp";
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv1248/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
Merge van 1.4 branch
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- LoginPortlet.java 21 Feb 2008 12:51:03 - 1.7
+++ LoginPortlet.java 14 Mar 2008 12:52:11 - 1.8
@@ -17,6 +17,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,36 +40,48 @@
String action = request.getParameter("action");
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
- if (userName == null) {
- userName = "";
- }
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
- if (password == null) {
- password = "";
- }
+ if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
+ }
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for
user %s", userName));
} else {
log.info(String.format("Login failed for user
%s", userName));
+ response.setRenderParameter("errormessage",
"login.failed");
}
} else if ("logout".equals(action)) {
Community.logout();
-
+ } else if ("send_password".equals(action)) {
+throw new UnsupportedOperationException("Community module does not
have all methods yet");
+//String username = request.getParameter("username");
+//if (!StringUtils.isBlank(username)) {
+//}
+ }
+ else {
// Unknown
- } else {
log.error(String.format("Unknown action '%s'", action));
}
}
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+ String error = request.getParameter("errormessage");
+ if (!StringUtils.isBlank(error)) {
+ request.setAttribute("errormessage", error);
+ }
+
String template = null;
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
+ String action = request.getParameter("action");
+ if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
+ template = "login/send_password.jsp";
+ }
}
doInclude("view", template, request, response);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv22295/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
Sendpassword functionailty
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- LoginPortlet.java 25 Feb 2008 16:25:52 - 1.5.2.1
+++ LoginPortlet.java 3 Mar 2008 08:43:48 - 1.5.2.2
@@ -17,6 +17,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -39,36 +40,48 @@
String action = request.getParameter("action");
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
- if (userName == null) {
- userName = "";
- }
String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
- if (password == null) {
- password = "";
- }
+ if (!StringUtils.isBlank(userName) &&
!StringUtils.isBlank(password)) {
Community.login(userName, password);
+ }
+
if (Community.isAuthenticated()) {
log.info(String.format("Login successful for
user %s", userName));
} else {
log.info(String.format("Login failed for user
%s", userName));
+ response.setRenderParameter("errormessage",
"login.failed");
}
} else if ("logout".equals(action)) {
Community.logout();
-
+ } else if ("send_password".equals(action)) {
+throw new UnsupportedOperationException("Community module does not
have all methods yet");
+//String username = request.getParameter("username");
+//if (!StringUtils.isBlank(username)) {
+//}
+ }
+ else {
// Unknown
- } else {
log.error(String.format("Unknown action '%s'", action));
}
}
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+ String error = request.getParameter("errormessage");
+ if (!StringUtils.isBlank(error)) {
+ request.setAttribute("errormessage", error);
+ }
+
String template = null;
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
template = "login/login.jsp";
+ String action = request.getParameter("action");
+ if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
+ template = "login/send_password.jsp";
+ }
}
doInclude("view", template, request, response);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv32069/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
CMSC-617 Personal Pages module
Backport to 1.4
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-617
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- LoginPortlet.java 30 Jan 2008 14:09:38 - 1.5
+++ LoginPortlet.java 25 Feb 2008 16:25:52 - 1.5.2.1
@@ -1,12 +1,12 @@
/*
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
+ This software is OSI Certified Open Source Software.
+ OSI Certified is a certification mark of the Open Source Initiative.
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
+ The license (Mozilla version 1.0) can be read at the MMBase site.
+ See http://www.MMBase.org/license
-*/
+ */
package com.finalist.cmsc.portlets;
import java.io.IOException;
@@ -14,7 +14,8 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -22,29 +23,53 @@
import com.finalist.cmsc.services.community.Community;
/**
- * Login / Logout portlet
+ * Login portlet
*
- * @author Menno Menninga / Remco Bos
- * @version $Revision: 1.5 $
+ * @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+
+ private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+
private static final Log log = LogFactory.getLog(LoginPortlet.class);
- public void processView(ActionRequest request, ActionResponse response)
- throws PortletException, IOException {
+ public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter("action");
if ("login".equals(action)) {
- if (!Community.loginUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
+ if (userName == null) {
+ userName = "";
}
- } else if ("logout".equals(action)) {
- if (!Community.logoutUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+ if (password == null) {
+ password = "";
}
+ Community.login(userName, password);
+ if (Community.isAuthenticated()) {
+ log.info(String.format("Login successful for
user %s", userName));
+ } else {
+ log.info(String.format("Login failed for user
%s", userName));
+ }
+
+ } else if ("logout".equals(action)) {
+ Community.logout();
+
+ // Unknown
} else {
- response.setPortletMode(PortletMode.VIEW);
log.error(String.format("Unknown action '%s'", action));
}
}
+
+ @Override
+ protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
+ String template = null;
+ if (Community.isAuthenticated()) {
+ template = "login/logout.jsp";
+ } else {
+ template = "login/login.jsp";
+ }
+ doInclude("view", template, request, response);
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv8546/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- LoginPortlet.java 8 Feb 2008 10:36:02 - 1.6
+++ LoginPortlet.java 21 Feb 2008 12:51:03 - 1.7
@@ -1,10 +1,10 @@
/*
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
+ This software is OSI Certified Open Source Software.
+ OSI Certified is a certification mark of the Open Source Initiative.
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
+ The license (Mozilla version 1.0) can be read at the MMBase site.
+ See http://www.MMBase.org/license
*/
package com.finalist.cmsc.portlets;
@@ -30,14 +30,13 @@
public class LoginPortlet extends CmscPortlet {
private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+
private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
private static final Log log = LogFactory.getLog(LoginPortlet.class);
- public void processView(ActionRequest request, ActionResponse response)
- throws PortletException, IOException {
+ public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter("action");
-
if ("login".equals(action)) {
String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
if (userName == null) {
@@ -57,15 +56,14 @@
} else if ("logout".equals(action)) {
Community.logout();
-// Unknown
+ // Unknown
} else {
log.error(String.format("Unknown action '%s'", action));
}
}
@Override
- protected void doView(RenderRequest request, RenderResponse response)
- throws PortletException, IOException {
+ protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
String template = null;
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv11556/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
Changes Login portlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LoginPortlet.java 30 Jan 2008 14:09:38 - 1.5
+++ LoginPortlet.java 8 Feb 2008 10:36:02 - 1.6
@@ -6,7 +6,7 @@
The license (Mozilla version 1.0) can be read at the MMBase site.
See http://www.MMBase.org/license
-*/
+ */
package com.finalist.cmsc.portlets;
import java.io.IOException;
@@ -14,7 +14,8 @@
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -22,29 +23,55 @@
import com.finalist.cmsc.services.community.Community;
/**
- * Login / Logout portlet
+ * Login portlet
*
- * @author Menno Menninga / Remco Bos
- * @version $Revision: 1.5 $
+ * @author Remco Bos
*/
public class LoginPortlet extends CmscPortlet {
+ private static final String ACEGI_SECURITY_FORM_USERNAME_KEY =
"j_username";
+ private static final String ACEGI_SECURITY_FORM_PASSWORD_KEY =
"j_password";
+
private static final Log log = LogFactory.getLog(LoginPortlet.class);
public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
String action = request.getParameter("action");
+
if ("login".equals(action)) {
- if (!Community.loginUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String userName =
request.getParameter(ACEGI_SECURITY_FORM_USERNAME_KEY);
+ if (userName == null) {
+ userName = "";
}
- } else if ("logout".equals(action)) {
- if (!Community.logoutUser(request, response)) {
- response.setPortletMode(PortletMode.VIEW);
+ String password =
request.getParameter(ACEGI_SECURITY_FORM_PASSWORD_KEY);
+ if (password == null) {
+ password = "";
}
+ Community.login(userName, password);
+ if (Community.isAuthenticated()) {
+ log.info(String.format("Login successful for
user %s", userName));
+ } else {
+ log.info(String.format("Login failed for user
%s", userName));
+ }
+
+ } else if ("logout".equals(action)) {
+ Community.logout();
+
+// Unknown
} else {
- response.setPortletMode(PortletMode.VIEW);
log.error(String.format("Unknown action '%s'", action));
}
}
+
+ @Override
+ protected void doView(RenderRequest request, RenderResponse response)
+ throws PortletException, IOException {
+ String template = null;
+ if (Community.isAuthenticated()) {
+ template = "login/logout.jsp";
+ } else {
+ template = "login/login.jsp";
+ }
+ doInclude("view", template, request, response);
+ }
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv1271/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
modifiications login portlet
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LoginPortlet.java 16 Jan 2008 12:16:05 - 1.4
+++ LoginPortlet.java 30 Jan 2008 14:09:38 - 1.5
@@ -1,100 +1,50 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
package com.finalist.cmsc.portlets;
import java.io.IOException;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.Community;
/**
- * Fulltext login portlet
+ * Login / Logout portlet
*
- * @author Menno Menninga
- * @version $Revision: 1.4 $
+ * @author Menno Menninga / Remco Bos
+ * @version $Revision: 1.5 $
*/
public class LoginPortlet extends CmscPortlet {
private static final Log log = LogFactory.getLog(LoginPortlet.class);
- private static final String ACTION_PARAM = "action";
-
- private static final String USER_TEXT = "userText";
-
- private static final String PASS_TEXT = "passText";
-
-
- public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
-
- String action = request.getParameter(ACTION_PARAM);
- getLogger().info("Action: " + action);
- if (action.equals("login")) {
- executeLogin(request, response, request.getParameter(USER_TEXT),
request.getParameter(PASS_TEXT));
- }
- if (action.equals("logout")) {
- executeLogout(/** HttpRequest, * */
- request, response);
-
- }
- response.setPortletMode(PortletMode.VIEW);
- log.error("Unknown action: '" + action + "'");
- }
-
-
- @Override
- protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
-
- super.doView(request, response);
- }
-
-
- private void executeLogin(ActionRequest request, ActionResponse response,
String userText, String passText)
+ public void processView(ActionRequest request, ActionResponse response)
throws PortletException, IOException {
-
- String configFileLocation =
getPortletContext().getRealPath("/WEB-INF/classes/jaas.config");
- getLogger().info(configFileLocation);
- System.setProperty("java.security.auth.login.config",
configFileLocation);
- boolean loginSuccesfull = Community.loginUser(request, response,
userText, passText);
-
- getLogger().info(loginSuccesfull);
-
- if (loginSuccesfull == false) {
+ String action = request.getParameter("action");
+ if ("login".equals(action)) {
+ if (!Community.loginUser(request, response)) {
response.setPortletMode(PortletMode.VIEW);
}
- if (loginSuccesfull == true) {
- getLogger().info("Gelukt als het goed is");
- log.info(request.getPortletSession().getAttribute("userName"));
- log.info(request.getPortletSession().getAttribute("firstName"));
- log.info(request.getPortletSession().getAttribute("lastName"));
- }
- }
-
-
- private void executeLogout(/** HttpServletRequest HttpRequest, * */
- ActionRequest request, ActionResponse response) throws PortletException,
IOException {
-
- log.info(request.getPortletSession());
-
- boolean logoutSuccesfull = Community.logoutUser(/** HttpRequest, * */
- request, response);
-
- if (logoutSuccesfull == false) {
- log.info("er is iets fout gegaan");
-
+ } else if ("logout".equals(action)) {
+ if (!Community.logoutUser(request, response)) {
response.setPortletMode(PortletMode.VIEW);
}
- if (logoutSuccesfull == true) {
- log.info("Gelukt als het goed is");
+ } else {
+
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets LoginPortlet.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv15946/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
LoginPortlet.java
Log Message:
CMSC-211 Added generic Hibernate function for extra modules
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
See also: http://www.mmbase.org/jira/browse/CMSC-211
Index: LoginPortlet.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LoginPortlet.java 4 Dec 2007 13:55:35 - 1.3
+++ LoginPortlet.java 16 Jan 2008 12:16:05 - 1.4
@@ -21,7 +21,7 @@
* Fulltext login portlet
*
* @author Menno Menninga
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class LoginPortlet extends CmscPortlet {
@@ -61,7 +61,7 @@
private void executeLogin(ActionRequest request, ActionResponse response,
String userText, String passText)
throws PortletException, IOException {
- String configFileLocation =
getPortletContext().getRealPath("/WEB-INF/config/jaas.config");
+ String configFileLocation =
getPortletContext().getRealPath("/WEB-INF/classes/jaas.config");
getLogger().info(configFileLocation);
System.setProperty("java.security.auth.login.config",
configFileLocation);
boolean loginSuccesfull = Community.loginUser(request, response,
userText, passText);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
