add auth info to feeds

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
index 2c580cadf8d124b6c990da544b7b45dc77168106..9927d6520560d30eba10377400d3d87d4383d860 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/Database.kt
@@ -51,6 +51,9 @@ object Database {
                         feed_id INT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
                         feedcollection_id INT NOT NULL REFERENCES feedcollections(feedcollection_id) ON DELETE CASCADE,
                         url VARCHAR NOT NULL,
+                        user VARCHAR,
+                        password VARCHAR,
+                        certpath VARCHAR,
                         last_update TIMESTAMP
                     )
                 """.trimIndent())

diff --git a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
index dc933d9e9d57b97abd571b549b09560cd7797990..f41f3fee455a0d1be19ab8bf81b07ab4f15c26f9 100644 (file)
--- a/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
+++ b/rss-application/src/main/kotlin/de/unixwork/rssreader/MainWindow.kt
@@ -53,6 +53,9 @@ class MainWindow {
         var groups: UiList<FeedGroup>? = null
         var name: UiString? = null
         var urls: UiText? = null
+        var user: UiString? = null
+        var password: UiString? = null
+        var cert: UiString? = null
 
         val w = dialogWindow(
             parent = window.ui,
@@ -90,17 +93,33 @@ class MainWindow {
             {
                 row {
                     rlabel("Category")
-                    dropdown<FeedGroup>(value = groups, hexpand = true) { elm, column ->
+                    dropdown<FeedGroup>(value = groups, hexpand = true, colspan = 2) { elm, column ->
                         elm.name
                     }
                 }
                 row {
                     rlabel("Name")
-                    textfield(value = name, hexpand = true)
+                    textfield(value = name, hexpand = true, colspan = 2)
                 }
                 row {
                     rlabel("URLs", overrideDefaults = true, hfill = true) // overrideDefaults for disabling default vfill
-                    textarea(value = urls, hexpand = true, vexpand = true, vfill = true)
+                    textarea(value = urls, hexpand = true, vexpand = true, vfill = true, colspan = 2)
+                }
+
+                row {
+                    rlabel("User")
+                    textfield(value = user, hexpand = true, colspan = 2)
+                }
+                row {
+                    rlabel("Password")
+                    passwordField(value = password, hexpand = true, colspan = 2)
+                }
+                row {
+                    rlabel("Client Certificate")
+                    textfield(value = cert, hexpand = true)
+                    button(icon = "document-open") {
+                        // TODO
+                    }
                 }
             }
         }