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

IDEMPIERE-5169 OAuth2: add same email account on other client will break it on old client (#1146) 

* IDEMPIERE-5169 OAuth2: add same email account on other client will break it on old client

* Fix wrong SQL - thanks to HiepLq

* Fix wrong parameters - thanks to HiepLq
This commit is contained in:
Carlos Ruiz 2022-02-04 11:28:18 +01:00 committed by GitHub
parent 496fce5434
commit 824e1bb2da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
org.adempiere.base/src/org/compiere/model/MAuthorizationAccount.java
View File

@ -100,24 +100,44 @@ public class MAuthorizationAccount extends X_AD_AuthorizationAccount {
* Synchronize information on other accounts with same email in the same credential * Synchronize information on other accounts with same email in the same credential
*/ */
public void syncOthers() { public void syncOthers() {
final String script = "UPDATE AD_AuthorizationAccount " final String clientSql =
+ "SET AccessToken=?, AccessTokenTimestamp=?, ExpireInSeconds=? " "SELECT DISTINCT AD_Client_ID "
+ "FROM AD_AuthorizationAccount "
+ "WHERE AD_AuthorizationAccount_ID!=? " + "WHERE AD_AuthorizationAccount_ID!=? "
+ "AND EMail=? " + "AND EMail=? "
+ "AND AD_AuthorizationCredential_ID=? " + "AND AD_AuthorizationCredential_ID=? "
+ "AND IsAuthorized='Y' " + "AND IsAuthorized='Y' "
+ "AND RefreshToken IS NOT NULL"; + "AND RefreshToken IS NOT NULL";
String accessToken = getAccessToken(); int[] clientIds = DB.getIDsEx(get_TrxName(), clientSql,
accessToken = SecureEngine.encrypt(accessToken, getAD_Client_ID());
DB.executeUpdateEx(script.toString(), new Object[] {
accessToken,
getAccessTokenTimestamp(),
getExpireInSeconds(),
getAD_AuthorizationAccount_ID(), getAD_AuthorizationAccount_ID(),
getEMail(), getEMail(),
getAD_AuthorizationCredential_ID() getAD_AuthorizationCredential_ID());
}, if (clientIds.length > 0) {
get_TrxName()); final String script = "UPDATE AD_AuthorizationAccount "
+ "SET AccessToken=?, AccessTokenTimestamp=?, ExpireInSeconds=? "
+ "WHERE AD_AuthorizationAccount_ID!=? "
+ "AND EMail=? "
+ "AND AD_AuthorizationCredential_ID=? "
+ "AND IsAuthorized='Y' "
+ "AND RefreshToken IS NOT NULL "
+ "AND AD_Client_ID=?";
MColumn column = MColumn.get(getCtx(), Table_Name, COLUMNNAME_AccessToken);
for (int clientId : clientIds) {
String accessToken = getAccessToken();
if (column.isEncrypted())
accessToken = SecureEngine.encrypt(accessToken, clientId);
DB.executeUpdateEx(script.toString(), new Object[] {
accessToken,
getAccessTokenTimestamp(),
getExpireInSeconds(),
getAD_AuthorizationAccount_ID(),
getEMail(),
getAD_AuthorizationCredential_ID(),
clientId
},
get_TrxName());
}
}
} }
/** /**