midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3101 implement OAuth2 for mail (gmail, outlook and other mail system) (#630) 

* Fix hardcoded reference to EMail scope in the processToken method
This commit is contained in:
Carlos Ruiz 2021-03-12 18:11:22 +01:00 committed by GitHub
parent 1ffe76b595
commit bef5e5ed3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.adempiere.base/src/org/compiere/model/MAuthorizationCredential.java
View File

@ -88,6 +88,24 @@ public class MAuthorizationCredential extends X_AD_AuthorizationCredential {
public String processToken(String code, MPInstance pinstance) { public String processToken(String code, MPInstance pinstance) {
String msg = null; String msg = null;
try { try {
if (pinstance == null) {
// this is not expected, just added here for safety
msg = "Process instance is required";
return msg;
}
// get the scope parameter
MPInstancePara paramScope = null;
for (MPInstancePara param : pinstance.getParameters()) {
if ("AD_AuthorizationScope".equals(param.getParameterName())) {
paramScope = param;
break;
}
}
if (paramScope == null) {
// this is not expected, just added here for safety
msg = "Process instance parameter for Scope not found";
return msg;
}
String clientId = getAuthorizationClientId(); String clientId = getAuthorizationClientId();
String clientSecret = getAuthorizationClientSecret(); String clientSecret = getAuthorizationClientSecret();
Timestamp ts = new Timestamp(System.currentTimeMillis()); Timestamp ts = new Timestamp(System.currentTimeMillis());
@ -111,21 +129,21 @@ public class MAuthorizationCredential extends X_AD_AuthorizationCredential {
boolean newAccount = false; boolean newAccount = false;
MAuthorizationAccount account = null; MAuthorizationAccount account = null;
Query query = new Query(Env.getCtx(), MAuthorizationAccount.Table_Name, "AD_Client_ID=? AND AD_User_ID=? AND EMail=? AND AD_AuthorizationCredential_ID=?", get_TrxName()); Query query = new Query(Env.getCtx(), MAuthorizationAccount.Table_Name, "AD_Client_ID=? AND AD_User_ID=? AND EMail=? AND AD_AuthorizationCredential_ID=? AND AD_AuthorizationScope=?", get_TrxName());
query.setParameters(Env.getAD_Client_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()), email, getAD_AuthorizationCredential_ID()); query.setParameters(Env.getAD_Client_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()), email, getAD_AuthorizationCredential_ID(), paramScope.getP_String());
account = query.first(); account = query.first();
if (account == null) { if (account == null) {
account = new MAuthorizationAccount(Env.getCtx(), 0, get_TrxName()); account = new MAuthorizationAccount(Env.getCtx(), 0, get_TrxName());
account.setEMail(email); account.setEMail(email);
account.setAD_AuthorizationCredential_ID(getAD_AuthorizationCredential_ID()); account.setAD_AuthorizationCredential_ID(getAD_AuthorizationCredential_ID());
account.setAD_User_ID(Env.getAD_User_ID(Env.getCtx())); account.setAD_User_ID(Env.getAD_User_ID(Env.getCtx()));
account.setAD_AuthorizationScope(paramScope.getP_String());
newAccount = true; newAccount = true;
} }
account.setAccessToken(tokenResponse.getAccessToken()); account.setAccessToken(tokenResponse.getAccessToken());
account.setAccessTokenTimestamp(ts); account.setAccessTokenTimestamp(ts);
account.setExpireInSeconds(BigDecimal.valueOf(tokenResponse.getExpiresInSeconds())); account.setExpireInSeconds(BigDecimal.valueOf(tokenResponse.getExpiresInSeconds()));
account.setAD_AuthorizationScope(MAuthorizationAccount.AD_AUTHORIZATIONSCOPE_EMail);
account.setIsAuthorized(true); account.setIsAuthorized(true);
account.setIsActive(true); account.setIsActive(true);
@ -154,11 +172,9 @@ public class MAuthorizationCredential extends X_AD_AuthorizationCredential {
account.setRefreshToken(tokenResponse.getRefreshToken()); account.setRefreshToken(tokenResponse.getRefreshToken());
} }
account.saveEx(); account.saveEx();
if (pinstance != null) { String logmsg = Msg.parseTranslation(getCtx(), (newAccount ? "@Created@" : "@Updated@") + " @AD_AuthorizationAccount_ID@ for ") + account.getEMail();
String logmsg = Msg.parseTranslation(getCtx(), (newAccount ? "@Created@" : "@Updated@") + " @AD_AuthorizationAccount_ID@ for ") + account.getEMail(); MPInstanceLog pilog = pinstance.addLog(null, 0, null, logmsg, MAuthorizationAccount.Table_ID, account.getAD_AuthorizationAccount_ID());
MPInstanceLog pilog = pinstance.addLog(null, 0, null, logmsg, MAuthorizationAccount.Table_ID, account.getAD_AuthorizationAccount_ID()); pilog.saveEx();
pilog.saveEx();
}
account.syncOthers(); account.syncOthers();
if (newAccount) if (newAccount)
msg = Msg.getMsg(getCtx(), "Authorization_Access_OK", new Object[] {account.getEMail()}); msg = Msg.getMsg(getCtx(), "Authorization_Access_OK", new Object[] {account.getEMail()});