From 4137770412578386b35c30e06bc56ed29d792cdd Mon Sep 17 00:00:00 2001 From: Fred Deniger Date: Mon, 20 Jan 2025 11:01:39 +0100 Subject: [PATCH] #136 add ; at the end to have a valid cookie --- .../fhir/data/remote/interceptor/AddCookiesInterceptor.kt | 4 +++- .../data/remote/interceptor/ReceivedCookiesInterceptor.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/AddCookiesInterceptor.kt b/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/AddCookiesInterceptor.kt index db92495..a2b3abf 100644 --- a/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/AddCookiesInterceptor.kt +++ b/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/AddCookiesInterceptor.kt @@ -49,7 +49,9 @@ class AddCookiesInterceptor(private val context: Context) : Interceptor { val prefCookies: Set = context.dataStore.data.first()[PreferenceKeys.PREF_COOKIES]?.toMutableSet() ?: mutableSetOf() - builder.addHeader("Cookie", prefCookies.joinToString("; ")) + for (cookie in prefCookies) { + builder.addHeader("Cookie", cookie) + } } } return chain.proceed(builder.build()) diff --git a/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/ReceivedCookiesInterceptor.kt b/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/ReceivedCookiesInterceptor.kt index 5b6fe36..72f086c 100644 --- a/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/ReceivedCookiesInterceptor.kt +++ b/core/src/main/java/org/openmrs/android/fhir/data/remote/interceptor/ReceivedCookiesInterceptor.kt @@ -41,7 +41,7 @@ class ReceivedCookiesInterceptor(private val context: Context) : Interceptor { @Throws(IOException::class) override fun intercept(chain: Interceptor.Chain): Response { val originalResponse: Response = chain.proceed(chain.request()) - //only add the jsession cookie from session request. + // only add the jsession cookie from session request. if ( chain.request().url.encodedPath.contains("session") and originalResponse.headers("Set-Cookie").isNotEmpty() @@ -50,7 +50,7 @@ class ReceivedCookiesInterceptor(private val context: Context) : Interceptor { for (header in originalResponse.headers("Set-Cookie")) { val jsessionId = Regex("JSESSIONID=([^;]+)").find(header)?.value if (jsessionId != null) { - cookies.add(jsessionId) + cookies.add("$jsessionId;") } } runBlocking {