-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #325 from gini/PIA-4412-use-Bearer-instead-of-BEARER
Pia 4412 use capital case "Bearer" instead of all caps "BEARER"
- Loading branch information
Showing
12 changed files
with
971 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
187 changes: 187 additions & 0 deletions
187
...ibrary/library/src/test/java/net/gini/android/bank/api/BankApiDocumentRemoteSourceTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,187 @@ | ||
| package net.gini.android.bank.api | ||
|
|
||
| import android.net.Uri | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import com.google.common.truth.Truth | ||
| import kotlinx.coroutines.ExperimentalCoroutinesApi | ||
| import kotlinx.coroutines.test.StandardTestDispatcher | ||
| import kotlinx.coroutines.test.TestScope | ||
| import kotlinx.coroutines.test.advanceUntilIdle | ||
| import kotlinx.coroutines.test.runTest | ||
| import net.gini.android.bank.api.models.ResolvePaymentInput | ||
| import net.gini.android.bank.api.requests.ErrorEvent | ||
| import net.gini.android.bank.api.requests.ResolvePaymentBody | ||
| import net.gini.android.bank.api.response.PaymentResponse | ||
| import net.gini.android.bank.api.response.ResolvePaymentResponse | ||
| import net.gini.android.core.api.response.PaymentRequestResponse | ||
| import okhttp3.RequestBody | ||
| import okhttp3.ResponseBody | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import retrofit2.Response | ||
| import java.util.UUID | ||
|
|
||
| /** | ||
| * Created by Alpár Szotyori on 21.07.23. | ||
| * | ||
| * Copyright (c) 2023 Gini GmbH. | ||
| */ | ||
|
|
||
| @OptIn(ExperimentalCoroutinesApi::class) | ||
| @RunWith(AndroidJUnit4::class) | ||
| class BankApiDocumentRemoteSourceTest { | ||
|
|
||
| @Test | ||
| fun `sets bearer authorization header with capital case 'Bearer' in resolvePaymentRequests`() = runTest { | ||
| val accessToken = UUID.randomUUID().toString() | ||
| val expectedAuthorizationHeader = "Bearer $accessToken" | ||
| verifyAuthorizationHeader(expectedAuthorizationHeader, this) { | ||
| resolvePaymentRequests(accessToken, "", ResolvePaymentInput("", "", "", "")) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `sets bearer authorization header with capital case 'Bearer' in getPayment`() = runTest { | ||
| val accessToken = UUID.randomUUID().toString() | ||
| val expectedAuthorizationHeader = "Bearer $accessToken" | ||
| verifyAuthorizationHeader(expectedAuthorizationHeader, this) { | ||
| getPayment(accessToken, "") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `sets bearer authorization header with capital case 'Bearer' in logErrorEvent`() = runTest { | ||
| val accessToken = UUID.randomUUID().toString() | ||
| val expectedAuthorizationHeader = "Bearer $accessToken" | ||
| verifyAuthorizationHeader(expectedAuthorizationHeader, this) { | ||
| logErrorEvent(accessToken, ErrorEvent("", "", "", "", "", "", "")) | ||
| } | ||
| } | ||
|
|
||
| private inline fun verifyAuthorizationHeader( | ||
| expectedAuthorizationHeader: String, | ||
| testScope: TestScope, | ||
| testBlock: BankApiDocumentRemoteSource.() -> Unit | ||
| ) { | ||
| // Given | ||
| val documentServiceAuthInterceptor = DocumentServiceAuthInterceptor() | ||
| val testSubject = | ||
| BankApiDocumentRemoteSource( | ||
| StandardTestDispatcher(testScope.testScheduler), | ||
| documentServiceAuthInterceptor, | ||
| GiniBankApiType(1), | ||
| "" | ||
| ) | ||
|
|
||
| // When | ||
| with(testSubject) { | ||
| testBlock() | ||
| } | ||
| testScope.advanceUntilIdle() | ||
|
|
||
| // Then | ||
| Truth.assertThat(documentServiceAuthInterceptor.bearerAuthHeader).isNotNull() | ||
| Truth.assertThat(documentServiceAuthInterceptor.bearerAuthHeader).isEqualTo(expectedAuthorizationHeader) | ||
| } | ||
|
|
||
| private class DocumentServiceAuthInterceptor : BankApiDocumentService { | ||
|
|
||
| var bearerAuthHeader: String? = null | ||
|
|
||
| override suspend fun resolvePaymentRequests( | ||
| bearer: Map<String, String>, | ||
| id: String, | ||
| input: ResolvePaymentBody | ||
| ): Response<ResolvePaymentResponse> { | ||
| bearerAuthHeader = bearer["Authorization"] | ||
| return Response.success(ResolvePaymentResponse("", "", "", null, "", "", "")) | ||
| } | ||
|
|
||
| override suspend fun getPayment(bearer: Map<String, String>, id: String): Response<PaymentResponse> { | ||
| bearerAuthHeader = bearer["Authorization"] | ||
| return Response.success(PaymentResponse("", "", "", null, "", "")) | ||
| } | ||
|
|
||
| override suspend fun logErrorEvent( | ||
| bearer: Map<String, String>, | ||
| errorEvent: ErrorEvent | ||
| ): Response<ResponseBody> { | ||
| bearerAuthHeader = bearer["Authorization"] | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun uploadDocument( | ||
| bearer: Map<String, String>, | ||
| bytes: RequestBody, | ||
| fileName: String?, | ||
| docType: String? | ||
| ): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getDocument(bearer: Map<String, String>, documentId: String): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getDocumentFromUri(bearer: Map<String, String>, uri: String): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getExtractions(bearer: Map<String, String>, documentId: String): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun deleteDocument(bearer: Map<String, String>, documentId: String): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun deleteDocumentFromUri( | ||
| bearer: Map<String, String>, | ||
| documentUri: Uri | ||
| ): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getLayoutForDocument( | ||
| bearer: Map<String, String>, | ||
| documentId: String | ||
| ): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getPaymentRequest( | ||
| bearer: Map<String, String>, | ||
| id: String | ||
| ): Response<PaymentRequestResponse> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getPaymentRequests(bearer: Map<String, String>): Response<List<PaymentRequestResponse>> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun getFile(bearer: Map<String, String>, location: String): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| override suspend fun sendFeedback( | ||
| bearer: Map<String, String>, | ||
| id: String, | ||
| params: RequestBody | ||
| ): Response<ResponseBody> { | ||
| // Is tested in core api library | ||
| return Response.success(null) | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
core-api-library/library/src/main/java/net/gini/android/core/api/requests/HttpHeaders.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package net.gini.android.core.api.requests | ||
|
|
||
| import net.gini.android.core.api.MediaTypes | ||
|
|
||
| /** | ||
| * Created by Alpár Szotyori on 21.07.23. | ||
| * | ||
| * Copyright (c) 2023 Gini GmbH. | ||
| */ | ||
|
|
||
| sealed class HttpHeader(val name: String, val value: String) { | ||
|
|
||
| fun addToMap(mutableMap: MutableMap<String, String>) { | ||
| mutableMap[name] = value | ||
| } | ||
|
|
||
| fun toPair(): Pair<String, String> = name to value | ||
| } | ||
|
|
||
| class BearerAuthorizatonHeader(token: String): HttpHeader("Authorization", "Bearer $token") | ||
| class BasicAuthorizatonHeader(credentials: String): HttpHeader("Authorization", "Basic $credentials") | ||
| class JsonAcceptHeader(): HttpHeader("Accept", MediaTypes.APPLICATION_JSON) |
Oops, something went wrong.