From c03fefea798e90e3c30fce755be6d9a6ca18eb23 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 6 Mar 2021 16:22:31 +0100 Subject: [PATCH] IDEMPIERE-3101 implement OAuth2 for mail (gmail, outlook and other mail system) (#613) * Avoid NPE when calling the servlet without parameters --- .../org/idempiere/web/OAuthCodeCallbackHandlerServlet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.server/src/main/servlet/org/idempiere/web/OAuthCodeCallbackHandlerServlet.java b/org.adempiere.server/src/main/servlet/org/idempiere/web/OAuthCodeCallbackHandlerServlet.java index 71ec679971..a377247957 100644 --- a/org.adempiere.server/src/main/servlet/org/idempiere/web/OAuthCodeCallbackHandlerServlet.java +++ b/org.adempiere.server/src/main/servlet/org/idempiere/web/OAuthCodeCallbackHandlerServlet.java @@ -105,11 +105,11 @@ public class OAuthCodeCallbackHandlerServlet extends HttpServlet { } } - Env.getCtx().setProperty(Env.AD_CLIENT_ID, String.valueOf(pinstance.getAD_Client_ID())); // To avoid Context Lost exception - Env.getCtx().setProperty(Env.AD_USER_ID, String.valueOf(pinstance.getCreatedBy())); // To set as CreatedBy of the account MAuthorizationCredential credential = null; MPInstancePara paramAnswer = null; if (errmsg == null) { + Env.getCtx().setProperty(Env.AD_CLIENT_ID, String.valueOf(pinstance.getAD_Client_ID())); // To avoid Context Lost exception + Env.getCtx().setProperty(Env.AD_USER_ID, String.valueOf(pinstance.getCreatedBy())); // To set as CreatedBy of the account for (MPInstancePara param : pinstance.getParameters()) { if (MAuthorizationCredential.COLUMNNAME_AD_AuthorizationCredential_ID.equals(param.getParameterName())) credential = new MAuthorizationCredential(Env.getCtx(), param.getP_Number().intValue(), null);