fix backup

configure.d/10-core.sh

@@ -6,6 +6,7 @@ DESCRIPTION="Superpanel, Tailscale, Nextcloud, email, files and Element"
 # What you entered last time, so running this again only does what's missing
 CORE_CONF="$HOME/.config/coredesktop/core.conf"
 GOA_ACCOUNT="$COREDESKTOP/configure.d/lib/goa-account"
+source "$COREDESKTOP/configure.d/lib/nextcloud.sh"
 [ -f "$CORE_CONF" ] && source "$CORE_CONF"
 
 # CORE_DOMAIN, CORE_EMAIL and CORE_NAME come from core.conf; the rest follow
@@ -70,30 +71,6 @@ save_conf() {
   } > "$CORE_CONF"
 }
 
-# Basic auth header for curl, read from stdin (-H @-) so the password isn't
-# in the process list
-auth_header() {
-  printf 'Authorization: Basic %s\n' "$(printf '%s:%s' "$1" "$2" | base64 -w0)"
-}
-
-# Create a Nextcloud app password for the Online Accounts account and the
-# files mount, so they don't keep your Core password. It shows in Nextcloud
-# under Settings > Security as "CoreDesktop on <this computer>", where it can
-# be revoked. Returns 2 if Nextcloud says the password is wrong.
-nextcloud_app_password() {
-  local response code
-  response="$(auth_header "$CORE_USER" "$PASSWORD" | curl -s -w '\n%{http_code}' -H @- \
-    -H 'OCS-APIRequest: true' -A "CoreDesktop on $HOSTNAME" \
-    "$NEXTCLOUD/ocs/v2.php/core/getapppassword?format=json")"
-  code="${response##*$'\n'}"
-  case "$code" in
-    200) APP_PASSWORD="$(jq -r '.ocs.data.apppassword // empty' <<< "${response%$'\n'*}")"
-         [ -n "$APP_PASSWORD" ] ;;
-    401) return 2 ;;
-    *) return 1 ;;
-  esac
-}
-
 desktop_entry() {
   local file="$1" name="$2" comment="$3" url="$4" icon="$5"
   mkdir -p "$(dirname "$file")"
@@ -332,7 +309,7 @@ run_configure() {
     for tries in 1 2 3; do
       read -rsp "Your Core password: " PASSWORD
       echo
-      nextcloud_app_password
+      nextcloud_app_password "CoreDesktop on $HOSTNAME"
       case $? in
         0) break ;;
         2) echo "Nextcloud says that password is wrong."; PASSWORD="" ;;