details: https://code.openbravo.com/erp/devel/pi/rev/ecdb2e190966 changeset: 17893:ecdb2e190966 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Sep 10 13:29:25 2012 +0530 summary: Fixes Issue 21502 :selectors in modify transaction window does not work properly
details: https://code.openbravo.com/erp/devel/pi/rev/44b875f62465 changeset: 17894:44b875f62465 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Sep 10 13:46:20 2012 +0200 summary: Fixes bug 21584: NPE not thrown when login with an unassociated google account Now the NPE does not happen, and a warning message is shown to the user. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml | 2 +- modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java | 12 +++++---- modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java | 5 ++++ 3 files changed, 13 insertions(+), 6 deletions(-) diffs (56 lines): diff -r f81066133c89 -r 44b875f62465 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Mon Sep 10 12:49:12 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml Mon Sep 10 13:46:20 2012 +0200 @@ -123,7 +123,7 @@ <!--8BEBA07E78124B2B92B764D9B452B209--> <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH> <!--8BEBA07E78124B2B92B764D9B452B209--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> <!--8BEBA07E78124B2B92B764D9B452B209--> <ISRANGE><![CDATA[N]]></ISRANGE> -<!--8BEBA07E78124B2B92B764D9B452B209--> <DEFAULTVALUE><![CDATA[@C_GLItem_ID@]]></DEFAULTVALUE> +<!--8BEBA07E78124B2B92B764D9B452B209--> <DEFAULTVALUE><![CDATA[@SQL=SELECT name FROM C_GLItem WHERE C_GLItem_ID=@C_GLItem_ID@]]></DEFAULTVALUE> <!--8BEBA07E78124B2B92B764D9B452B209--> <AD_ELEMENT_ID><![CDATA[800080]]></AD_ELEMENT_ID> <!--8BEBA07E78124B2B92B764D9B452B209--></AD_PROCESS_PARA> diff -r f81066133c89 -r 44b875f62465 modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java --- a/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java Mon Sep 10 12:49:12 2012 +0200 +++ b/modules/org.openbravo.service.integration.google/src/org/openbravo/service/integration/google/GoogleAuthServlet.java Mon Sep 10 13:46:20 2012 +0200 @@ -142,7 +142,7 @@ User user = OpenIDManager.getInstance().getUser(oid); - if (user == null) { + if (user == null && oid != null) { user = createUser(oid, req, resp); if (user == null) { return; @@ -151,10 +151,12 @@ req.getSession(true).removeAttribute("#Authenticated_user"); - String sessionId = createDBSession(req, user.getUsername(), user.getId()); - req.getSession(true).setAttribute("#Authenticated_user", user.getId()); - vars.setSessionValue("#AD_SESSION_ID", sessionId); - vars.setSessionValue("#LOGGINGIN", "Y"); + if (user != null) { + String sessionId = createDBSession(req, user.getUsername(), user.getId()); + req.getSession(true).setAttribute("#Authenticated_user", user.getId()); + vars.setSessionValue("#AD_SESSION_ID", sessionId); + vars.setSessionValue("#LOGGINGIN", "Y"); + } resp.sendRedirect(strDireccion + "/security/Menu.html"); diff -r f81066133c89 -r 44b875f62465 modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java --- a/modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java Mon Sep 10 12:49:12 2012 +0200 +++ b/modules/org.openbravo.service.integration.openid/src/org/openbravo/service/integration/openid/OpenIDManager.java Mon Sep 10 13:46:20 2012 +0200 @@ -136,6 +136,11 @@ public User getUser(Identifier oid) throws OBException { User u = null; + if (oid == null) { + log.error("No user has been associated with the Google account"); + return null; + } + OBCriteria<OBSOIDUserIdentifier> userCriteria = OBDal.getInstance().createCriteria( OBSOIDUserIdentifier.class); userCriteria ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
