Remove login information from update request

Removed the username and password in the GET /update request.
The endpoint does not require authentication and it is unsafe to transmit login credentials over GET requests.

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/UpsertSourceActivity.kt

@@ -65,7 +65,6 @@ class UpsertSourceActivity :
     private fun initFields(items: Map<String, SelfossModel.Spout>) {
         binding.nameInput.setText(existingSource!!.title)
         binding.tags.setText(existingSource!!.tags?.joinToString(", "))
-        binding.filter.setText(existingSource!!.filter)
         binding.sourceUri.setText(existingSource!!.params?.url)
         binding.spoutsSpinner.setSelection(items.keys.indexOf(existingSource!!.spout))
         binding.progress.visibility = View.GONE
@@ -170,7 +169,6 @@ class UpsertSourceActivity :
                                 url,
                                 mSpoutsValue!!,
                                 binding.tags.text.toString(),
-                                binding.filter.text.toString(),
                             )
                         } else {
                             repository.createSource(
@@ -178,7 +176,6 @@ class UpsertSourceActivity :
                                 url,
                                 mSpoutsValue!!,
                                 binding.tags.text.toString(),
-                                binding.filter.text.toString(),
                             )
                         }
                     if (successfullyAddedSource) {

androidApp/src/main/res/layout/activity_upsert_source.xml

@@ -64,28 +64,15 @@
                 android:id="@+id/tags"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minHeight="48dp"
                 android:layout_marginTop="16dp"
                 android:autofillHints="false"
                 android:hint="@string/add_source_hint_tags"
                 android:inputType="text"
-                android:minHeight="48dp"
                 android:textColorHint="?android:textColorPrimary"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceUri" />
 
-            <EditText
-                android:id="@+id/filter"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:autofillHints="false"
-                android:hint="@string/add_source_hint_filter"
-                android:inputType="text"
-                android:minHeight="48dp"
-                android:textColorHint="?android:textColorPrimary"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tags" />
-
             <Spinner
                 android:id="@+id/spoutsSpinner"
                 android:layout_width="match_parent"
@@ -93,7 +80,7 @@
                 android:minHeight="48dp"
                 android:layout_marginTop="16dp"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/filter" />
+                app:layout_constraintTop_toBottomOf="@+id/tags" />
 
             <Button
                 android:id="@+id/saveBtn"

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

@@ -17,7 +17,6 @@
     <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
     <string name="add_source_hint_url">"Link"</string>
     <string name="add_source_hint_name">"Name"</string>
-    <string name="add_source_hint_filter">/Filter/</string>
     <string name="add_source">"Add a source"</string>
     <string name="add_source_save">"Save"</string>
     <string name="wrong_infos">"Check your details again."</string>

androidApp/src/test/kotlin/bou/amine/apps/readerforselfossv2/tests/repository/RepositoryTest.kt

@@ -44,8 +44,6 @@ private const val FEED_URL = "https://test.com/feed"
 
 private const val TAGS = "Test, New"
 
-private const val FILTER = "/filter/"
-
 private const val NUMBER_ARTICLES = 100
 private const val NUMBER_UNREAD = 50
 private const val NUMBER_STARRED = 20
@@ -838,7 +836,7 @@ class RepositoryTest {
 
     @Test
     fun create_source() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
             SuccessResponse(true)
 
         initializeRepository()
@@ -850,7 +848,6 @@ class RepositoryTest {
                     FEED_URL,
                     SPOUT,
                     TAGS,
-                    FILTER,
                 )
         }
 
@@ -860,7 +857,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
             )
         }
         assertSame(true, response)
@@ -868,7 +864,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_but_response_fails() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
             SuccessResponse(false)
 
         initializeRepository()
@@ -880,7 +876,6 @@ class RepositoryTest {
                     FEED_URL,
                     SPOUT,
                     TAGS,
-                    FILTER,
                 )
         }
 
@@ -890,7 +885,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
             )
         }
         assertSame(false, response)
@@ -898,7 +892,7 @@ class RepositoryTest {
 
     @Test
     fun create_source_without_connection() {
-        coEvery { api.createSourceForVersion(any(), any(), any(), any(), any()) } returns
+        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
             SuccessResponse(true)
 
         initializeRepository(false)
@@ -910,7 +904,6 @@ class RepositoryTest {
                     FEED_URL,
                     SPOUT,
                     TAGS,
-                    FILTER,
                 )
         }
 
@@ -920,7 +913,6 @@ class RepositoryTest {
                 any(),
                 any(),
                 any(),
-                any(),
             )
         }
         assertSame(false, response)

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -102,7 +102,6 @@ class SelfossModel {
         override var error: String? = null,
         override var icon: String? = null,
         var params: SourceParams? = null,
-        var filter: String? = null,
     ) : Source
 
     @Serializable

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/Repository.kt

@@ -368,7 +368,6 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): Boolean {
         var response = false
         if (connectivityService.isNetworkAvailable()) {
@@ -378,7 +377,6 @@ class Repository(
                     url,
                     spout,
                     tags,
-                    filter,
                 ).isSuccess == true
         }
 
@@ -391,11 +389,10 @@ class Repository(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): Boolean {
         var response = false
         if (connectivityService.isNetworkAvailable()) {
-            response = api.updateSourceForVersion(id, title, url, spout, tags, filter).isSuccess == true
+            response = api.updateSourceForVersion(id, title, url, spout, tags).isSuccess == true
         }
 
         return response

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -19,6 +19,7 @@ import io.ktor.client.plugins.cookies.HttpCookies
 import io.ktor.client.plugins.logging.LogLevel
 import io.ktor.client.plugins.logging.Logger
 import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.sse.SSE
 import io.ktor.client.request.get
 import io.ktor.client.request.headers
 import io.ktor.client.request.parameter
@@ -89,6 +90,7 @@ class SelfossApi(
                     }
                 }
             }
+            install(SSE)
             expectSuccess = false
         }
 
@@ -363,26 +365,11 @@ class SelfossApi(
     suspend fun update(): StatusAndData<String> =
         bodyOrFailure(
             client.tryToGet(url("/update")) {
-                if (!shouldHavePostLogin()) {
+                headers {
-                    parameter("username", appSettingsService.getUserName())
+                    append(
-                    parameter("password", appSettingsService.getPassword())
+                        HttpHeaders.Accept,
-                }
+                        "text/event-stream",
-                if (appSettingsService
+                    )
-                        .getBasicUserName()
-                        .isNotEmpty() &&
-                    appSettingsService.getBasicPassword().isNotEmpty()
-                ) {
-                    headers {
-                        append(
-                            HttpHeaders.Authorization,
-                            constructBasicAuthValue(
-                                BasicAuthCredentials(
-                                    username = appSettingsService.getBasicUserName(),
-                                    password = appSettingsService.getBasicPassword(),
-                                ),
-                            ),
-                        )
-                    }
                 }
             },
         )
@@ -638,13 +625,12 @@ class SelfossApi(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                createSource("tags[]", title, url, spout, tags, filter)
+                createSource("tags[]", title, url, spout, tags)
             } else {
-                createSource("tags", title, url, spout, tags, filter)
+                createSource("tags", title, url, spout, tags)
             },
         )
 
@@ -654,7 +640,6 @@ class SelfossApi(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source"),
@@ -667,7 +652,6 @@ class SelfossApi(
                     append("title", title)
                     append("url", url)
                     append("spout", spout)
-                    append("filter", filter)
                     append(tagsParamName, tags)
                 },
             block = {
@@ -697,13 +681,12 @@ class SelfossApi(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): SuccessResponse =
         maybeResponse(
             if (appSettingsService.getApiVersion() > 1) {
-                updateSource(id, "tags[]", title, url, spout, tags, filter)
+                updateSource(id, "tags[]", title, url, spout, tags)
             } else {
-                updateSource(id, "tags", title, url, spout, tags, filter)
+                updateSource(id, "tags", title, url, spout, tags)
             },
         )
 
@@ -714,7 +697,6 @@ class SelfossApi(
         url: String,
         spout: String,
         tags: String,
-        filter: String,
     ): HttpResponse? =
         client.tryToSubmitForm(
             url = url("/source/$id"),
@@ -728,7 +710,6 @@ class SelfossApi(
                     append("url", url)
                     append("spout", spout)
                     append(tagsParamName, tags)
-                    append("filter", filter)
                 },
             block = {
                 if (appSettingsService