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

CE-534: updates to support direct carrier tracker

Browse Source
This commit is contained in:
Tim Chamberlain
2023-07-12 21:09:18 -05:00
parent c003d448d6
commit c04ab42bd9
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/queues/QQueueMetaData.java
View File

@ -22,6 +22,8 @@
package com.kingsrook.qqq.backend.core.model.metadata.queues; package com.kingsrook.qqq.backend.core.model.metadata.queues;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.TopLevelMetaDataInterface;
import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaData; import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaData;
@ -34,7 +36,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaDa
** The processName is the code that runs for messages found on the queue. ** The processName is the code that runs for messages found on the queue.
** The schedule may not be used by all provider types, but defines when the queue is polled. ** The schedule may not be used by all provider types, but defines when the queue is polled.
*******************************************************************************/ *******************************************************************************/
public class QQueueMetaData public class QQueueMetaData implements TopLevelMetaDataInterface
{ {
private String name; private String name;
private String providerName; private String providerName;
@ -213,4 +215,15 @@ public class QQueueMetaData
return (this); return (this);
} }
/*******************************************************************************
**
*******************************************************************************/
@Override
public void addSelfToInstance(QInstance qInstance)
{
qInstance.addQueue(this);
}
} }

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

@ -681,23 +681,13 @@ public class BaseAPIActionUtil
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
switch(backendMetaData.getAuthorizationType()) switch(backendMetaData.getAuthorizationType())
{ {
case BASIC_AUTH_API_KEY: case BASIC_AUTH_API_KEY -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey()));
request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getApiKey())); case BASIC_AUTH_USERNAME_PASSWORD -> request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword()));
break; case API_KEY_HEADER -> request.addHeader("API-Key", backendMetaData.getApiKey());
case API_TOKEN -> request.addHeader("Authorization", "Token " + backendMetaData.getApiKey());
case BASIC_AUTH_USERNAME_PASSWORD: case OAUTH2 -> request.setHeader("Authorization", "Bearer " + getOAuth2Token());
request.addHeader("Authorization", getBasicAuthenticationHeader(backendMetaData.getUsername(), backendMetaData.getPassword())); case API_KEY_QUERY_PARAM ->
break; {
case API_KEY_HEADER:
request.addHeader("API-Key", backendMetaData.getApiKey());
break;
case OAUTH2:
request.setHeader("Authorization", "Bearer " + getOAuth2Token());
break;
case API_KEY_QUERY_PARAM:
try try
{ {
String uri = request.getURI().toString(); String uri = request.getURI().toString();
@ -709,10 +699,8 @@ public class BaseAPIActionUtil
{ {
throw (new QException("Error setting authorization query parameter", e)); throw (new QException("Error setting authorization query parameter", e));
} }
break; }
default -> throw new IllegalArgumentException("Unexpected authorization type: " + backendMetaData.getAuthorizationType());
default:
throw new IllegalArgumentException("Unexpected authorization type: " + backendMetaData.getAuthorizationType());
} }
} }

1
qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/model/AuthorizationType.java
View File

@ -28,6 +28,7 @@ package com.kingsrook.qqq.backend.module.api.model;
public enum AuthorizationType public enum AuthorizationType
{ {
API_KEY_HEADER, API_KEY_HEADER,
API_TOKEN,
BASIC_AUTH_API_KEY, BASIC_AUTH_API_KEY,
BASIC_AUTH_USERNAME_PASSWORD, BASIC_AUTH_USERNAME_PASSWORD,
OAUTH2, OAUTH2,