#1625 add an authorization header field

Author: sds100

app/src/main/java/io/github/sds100/keymapper/actions/ActionData.kt

@@ -836,6 +836,7 @@ sealed class ActionData : Comparable<ActionData> {
         val method: HttpMethod,
         val url: String,
         val body: String,
+        val authorizationHeader: String,
     ) : ActionData() {
         override val id: ActionId = ActionId.HTTP_REQUEST
     }

app/src/main/java/io/github/sds100/keymapper/actions/ActionDataEntityMapper.kt

@@ -510,11 +510,16 @@ object ActionDataEntityMapper {
 
                 val body = entity.extras.getData(ActionEntity.EXTRA_HTTP_BODY).valueOrNull() ?: ""
 
+                val authorizationHeader =
+                    entity.extras.getData(ActionEntity.EXTRA_HTTP_AUTHORIZATION_HEADER)
+                        .valueOrNull() ?: ""
+
                 ActionData.HttpRequest(
                     description = description,
                     method = method,
                     url = url,
                     body = body,
+                    authorizationHeader = authorizationHeader,
                 )
             }
         }
@@ -739,6 +744,10 @@ object ActionDataEntityMapper {
             EntityExtra(ActionEntity.EXTRA_HTTP_METHOD, HTTP_METHOD_MAP[data.method]!!),
             EntityExtra(ActionEntity.EXTRA_HTTP_URL, data.url),
             EntityExtra(ActionEntity.EXTRA_HTTP_BODY, data.body),
+            EntityExtra(
+                ActionEntity.EXTRA_HTTP_AUTHORIZATION_HEADER,
+                data.authorizationHeader,
+            ),
         )
 
         else -> emptyList()

app/src/main/java/io/github/sds100/keymapper/actions/CreateActionDelegate.kt

@@ -779,6 +779,7 @@ class CreateActionDelegate(
                         method = HttpMethod.GET,
                         url = "",
                         body = "",
+                        authorizationHeader = "",
                     )
                 } else {
                     httpRequestBottomSheetState = oldData as? ActionData.HttpRequest

app/src/main/java/io/github/sds100/keymapper/actions/HttpRequestBottomSheet.kt

@@ -214,6 +214,22 @@ private fun HttpRequestBottomSheet(
 
             Spacer(modifier = Modifier.height(16.dp))
 
+            OutlinedTextField(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                value = state.authorizationHeader,
+                label = { Text(stringResource(R.string.action_http_request_authorization_label)) },
+                onValueChange = {
+                    onBodyChanged(it)
+                },
+                supportingText = {
+                    Text(stringResource(R.string.action_http_request_authorization_supporting_text))
+                },
+            )
+
+            Spacer(modifier = Modifier.height(16.dp))
+
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -278,6 +294,7 @@ private fun PreviewEmpty() {
                 method = HttpMethod.GET,
                 url = "",
                 body = "",
+                authorizationHeader = "",
             ),
         )
     }
@@ -301,6 +318,7 @@ private fun PreviewFilled() {
                 method = HttpMethod.GET,
                 url = "https://example.com",
                 body = "Hello, world!",
+                authorizationHeader = "Bearer token",
             ),
         )
     }

app/src/main/java/io/github/sds100/keymapper/actions/PerformActionsUseCase.kt

@@ -820,6 +820,7 @@ class PerformActionsUseCaseImpl(
                         method = action.method,
                         url = action.url,
                         body = action.body,
+                        authorizationHeader = action.authorizationHeader,
                     ).showErrorMessageOnFail()
                 }
 

app/src/main/java/io/github/sds100/keymapper/data/entities/ActionEntity.kt

@@ -88,6 +88,7 @@ data class ActionEntity(
         const val EXTRA_HTTP_URL = "extra_http_url"
         const val EXTRA_HTTP_BODY = "extra_http_body"
         const val EXTRA_HTTP_DESCRIPTION = "extra_http_description"
+        const val EXTRA_HTTP_AUTHORIZATION_HEADER = "extra_http_authorization_header"
 
         // DON'T CHANGE THESE. Used for JSON serialization and parsing.
         const val NAME_ACTION_TYPE = "type"

app/src/main/java/io/github/sds100/keymapper/system/network/AndroidNetworkAdapter.kt

@@ -18,6 +18,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
+import okhttp3.Headers
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
@@ -128,7 +129,12 @@ class AndroidNetworkAdapter(
         }
     }
 
-    override suspend fun sendHttpRequest(method: HttpMethod, url: String, body: String): Result<*> {
+    override suspend fun sendHttpRequest(
+        method: HttpMethod,
+        url: String,
+        body: String,
+        authorizationHeader: String,
+    ): Result<*> {
         try {
             val requestBody = when (method) {
                 HttpMethod.HEAD -> Request.Builder().head()
@@ -139,8 +145,15 @@ class AndroidNetworkAdapter(
                 HttpMethod.PATCH -> Request.Builder().patch(body.toRequestBody())
             }
 
+            val headers = Headers.Builder()
+
+            if (authorizationHeader.isNotBlank()) {
+                headers.add("Authorization", authorizationHeader)
+            }
+
             val request = requestBody
                 .url("https://posttestserver.dev/p/kmr33yjcz5h38hkq/post")
+                .headers(headers.build())
                 .build()
 
             withContext(Dispatchers.IO) { httpClient.newCall(request).execute() }

app/src/main/java/io/github/sds100/keymapper/system/network/NetworkAdapter.kt

@@ -27,5 +27,6 @@ interface NetworkAdapter {
         method: HttpMethod,
         url: String,
         body: String,
+        authorizationHeader: String,
     ): Result<*>
 }

app/src/main/res/values/strings.xml

@@ -1084,6 +1084,8 @@
     <string name="action_http_request_url_label">URL</string>
     <string name="action_http_request_url_empty_error">Can not be empty!</string>
     <string name="action_http_request_body_label">Request body (optional)</string>
+    <string name="action_http_request_authorization_label">Authorization header (optional)</string>
+    <string name="action_http_request_authorization_supporting_text">You must prepend \'Bearer\' if necessary</string>
     <!-- action labels -->
 
     <!-- action category labels -->