Add credentials to options flow so CalDAV can be configured on first setup

custom_components/room_cal_ha/config_flow.py

@@ -114,29 +114,41 @@ class RoomCalOptionsFlow(OptionsFlow):
 
     if user_input is not None:
       if user_input.get(CONF_CALDAV_ENABLED) and user_input.get(CONF_CALDAV_URL):
+        username = user_input.pop(CONF_USERNAME, "") or self.config_entry.data.get(CONF_USERNAME, "")
+        password = user_input.pop(CONF_PASSWORD, "") or self.config_entry.data.get(CONF_PASSWORD, "")
         try:
           await self.hass.async_add_executor_job(
             _test_caldav_auth,
             user_input[CONF_CALDAV_URL],
-            self.config_entry.data.get(CONF_USERNAME, ""),
-            self.config_entry.data.get(CONF_PASSWORD, ""),
+            username,
+            password,
           )
         except caldav_error.AuthorizationError:
           errors["base"] = "invalid_auth"
         except Exception:
           errors["base"] = "cannot_connect"
+        else:
+          await self.hass.config_entries.async_update_entry(
+            self.config_entry,
+            data={**self.config_entry.data, CONF_USERNAME: username, CONF_PASSWORD: password},
+          )
 
       if not errors:
         merged = {**self.config_entry.options, **user_input}
         return self.async_create_entry(data=merged)
 
     opts = self.config_entry.options
+    data = self.config_entry.data
     return self.async_show_form(
       step_id="caldav",
       data_schema=vol.Schema({
         vol.Required(CONF_CALDAV_ENABLED, default=opts.get(CONF_CALDAV_ENABLED, False)): BooleanSelector(),
         vol.Optional(CONF_CALDAV_URL, default=opts.get(CONF_CALDAV_URL, "")): str,
         vol.Optional(CONF_CALENDAR_NAME, default=opts.get(CONF_CALENDAR_NAME, "")): str,
+        vol.Optional(CONF_USERNAME, default=data.get(CONF_USERNAME, "")): str,
+        vol.Optional(CONF_PASSWORD, default=""): TextSelector(
+          TextSelectorConfig(type=TextSelectorType.PASSWORD)
+        ),
       }),
       errors=errors,
     )

custom_components/room_cal_ha/strings.json

@@ -34,7 +34,9 @@
         "data": {
           "caldav_enabled": "Enable CalDAV",
           "caldav_url": "CalDAV URL",
-          "calendar_name": "Calendar name"
+          "calendar_name": "Calendar name",
+          "username": "Username",
+          "password": "Password"
         }
       }
     },

custom_components/room_cal_ha/translations/en.json

@@ -34,7 +34,9 @@
         "data": {
           "caldav_enabled": "Enable CalDAV",
           "caldav_url": "CalDAV URL",
-          "calendar_name": "Calendar name"
+          "calendar_name": "Calendar name",
+          "username": "Username",
+          "password": "Password"
         }
       }
     },