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 pull request #64 from Kingsrook/feature/CE-779-order-level-ship-date

Browse Source 
Feature/ce 779 order level ship date
This commit is contained in:
tim-chamberlain
2024-02-01 12:07:29 -06:00
committed by GitHub
parent 612370fc13 052cb9fab9
commit bb69dddb81
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/StringUtils.java
View File

@ -176,6 +176,19 @@ public class StringUtils
/*******************************************************************************
** safely appends a string to another, changing empty string if either value is null
**
*******************************************************************************/
public static String safeAppend(String input, String contentToAppend)
{
input = input != null ? input : "";
contentToAppend = contentToAppend != null ? contentToAppend : "";
return input + contentToAppend;
}
/******************************************************************************* /*******************************************************************************
** returns input if not null, or nullOutput if input == null (as in SQL NVL) ** returns input if not null, or nullOutput if input == null (as in SQL NVL)
** **

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

@ -709,11 +709,11 @@ public class BaseAPIActionUtil
if(backendMetaData.getAuthorizationType().equals(AuthorizationType.BASIC_AUTH_USERNAME_PASSWORD)) if(backendMetaData.getAuthorizationType().equals(AuthorizationType.BASIC_AUTH_USERNAME_PASSWORD))
{ {
request.addHeader("Authorization", getBasicAuthenticationHeader(record.getValueString(backendMetaData.getVariantOptionsTableUsernameField()), record.getValueString(backendMetaData.getVariantOptionsTablePasswordField()))); request.setHeader("Authorization", getBasicAuthenticationHeader(record.getValueString(backendMetaData.getVariantOptionsTableUsernameField()), record.getValueString(backendMetaData.getVariantOptionsTablePasswordField())));
} }
else if(backendMetaData.getAuthorizationType().equals(AuthorizationType.API_KEY_HEADER)) else if(backendMetaData.getAuthorizationType().equals(AuthorizationType.API_KEY_HEADER))
{ {
request.addHeader("API-Key", record.getValueString(backendMetaData.getVariantOptionsTableApiKeyField())); request.setHeader("API-Key", record.getValueString(backendMetaData.getVariantOptionsTableApiKeyField()));
} }
else else
{ {
@ -727,10 +727,10 @@ public class BaseAPIActionUtil
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
switch(backendMetaData.getAuthorizationType()) switch(backendMetaData.getAuthorizationType())
{ {
case BASIC_AUTH_API_KEY -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey())); case BASIC_AUTH_API_KEY -> request.setHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey()));
case BASIC_AUTH_USERNAME_PASSWORD -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword())); case BASIC_AUTH_USERNAME_PASSWORD -> request.setHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword()));
case API_KEY_HEADER -> request.addHeader("API-Key", backendMetaData.getApiKey()); case API_KEY_HEADER -> request.setHeader("API-Key", backendMetaData.getApiKey());
case API_TOKEN -> request.addHeader("Authorization", "Token " + backendMetaData.getApiKey()); case API_TOKEN -> request.setHeader("Authorization", "Token " + backendMetaData.getApiKey());
case OAUTH2 -> request.setHeader("Authorization", "Bearer " + getOAuth2Token()); case OAUTH2 -> request.setHeader("Authorization", "Bearer " + getOAuth2Token());
case API_KEY_QUERY_PARAM -> case API_KEY_QUERY_PARAM ->
{ {
@ -786,9 +786,9 @@ public class BaseAPIActionUtil
if(setCredentialsInHeader) if(setCredentialsInHeader)
{ {
request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getClientId(), backendMetaData.getClientSecret())); request.setHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getClientId(), backendMetaData.getClientSecret()));
} }
request.addHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8"); request.setHeader("Content-Type", "application/x-www-form-urlencoded; charset=utf-8");
HttpResponse response = executeOAuthTokenRequest(client, request); HttpResponse response = executeOAuthTokenRequest(client, request);
int statusCode = response.getStatusLine().getStatusCode(); int statusCode = response.getStatusLine().getStatusCode();
@ -850,7 +850,7 @@ public class BaseAPIActionUtil
*******************************************************************************/ *******************************************************************************/
protected void setupContentTypeInRequest(HttpRequestBase request) protected void setupContentTypeInRequest(HttpRequestBase request)
{ {
request.addHeader("Content-Type", backendMetaData.getContentType()); request.setHeader("Content-Type", backendMetaData.getContentType());
} }
@ -872,7 +872,7 @@ public class BaseAPIActionUtil
*******************************************************************************/ *******************************************************************************/
public void setupAdditionalHeaders(HttpRequestBase request) public void setupAdditionalHeaders(HttpRequestBase request)
{ {
request.addHeader("Accept", "application/json"); request.setHeader("Accept", "application/json");
} }