QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/CE-2260-add-ability-to-send-to-fe-and-extensive' into integration/sprint-61

Browse Source
This commit is contained in:
Tim Chamberlain
2025-02-21 12:09:47 -06:00
parent c9ccdf58cd b2c8c075fd
commit ad0a3dcdc7
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java
View File

@ -822,7 +822,7 @@ public class BaseAPIActionUtil
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
public String getOAuth2Token() throws OAuthCredentialsException, QException String getOAuth2AccessTokenKey() throws QException
{ {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// define the key that will be used in the backend's customValues map, to stash the access token. // // define the key that will be used in the backend's customValues map, to stash the access token. //
@ -834,6 +834,17 @@ public class BaseAPIActionUtil
Serializable variantId = BackendVariantsUtil.getVariantId(backendMetaData); Serializable variantId = BackendVariantsUtil.getVariantId(backendMetaData);
accessTokenKey = accessTokenKey + ":" + variantId; accessTokenKey = accessTokenKey + ":" + variantId;
} }
return (accessTokenKey);
}
/*******************************************************************************
**
*******************************************************************************/
public String getOAuth2Token() throws QException
{
String accessTokenKey = getOAuth2AccessTokenKey();
//////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// check for the access token in the backend meta data. if it's not there, then issue a request for a token. // // check for the access token in the backend meta data. if it's not there, then issue a request for a token. //
@ -1225,6 +1236,8 @@ public class BaseAPIActionUtil
if(!caughtAnOAuthExpiredToken) if(!caughtAnOAuthExpiredToken)
{ {
LOG.info("OAuth Expired token for [" + table.getName() + "] - retrying"); LOG.info("OAuth Expired token for [" + table.getName() + "] - retrying");
// String accessTokenKey = getOAuth2AccessTokenKey();
// backendMetaData.withCustomValue(accessTokenKey, null);
backendMetaData.withCustomValue("accessToken", null); backendMetaData.withCustomValue("accessToken", null);
caughtAnOAuthExpiredToken = true; caughtAnOAuthExpiredToken = true;
} }