From 0147cadc53a43dd3c1940714ee3898cc445cb850 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 20 Nov 2016 11:23:56 +0000
Subject: [PATCH] xmpp password changes

---
 src/freedombone-app-emacs     |  4 ----
 src/freedombone-app-irc       |  4 ----
 src/freedombone-app-syncthing |  4 ----
 src/freedombone-app-tox       |  4 ----
 src/freedombone-app-vim       |  4 ----
 src/freedombone-app-xmpp      | 14 +++++++++++++-
 src/freedombone-tests         |  2 +-
 7 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/freedombone-app-emacs b/src/freedombone-app-emacs
index 6259f7c94..5109876c8 100755
--- a/src/freedombone-app-emacs
+++ b/src/freedombone-app-emacs
@@ -35,10 +35,6 @@ IN_DEFAULT_INSTALL=1
 emacs_variables=(USB_MOUNT
                  MY_USERNAME)
 
-function change_password_emacs {
-    echo -n ''
-}
-
 function reconfigure_emacs {
     echo -n ''
 }
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 9b5033f51..c86cd0131 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -404,10 +404,6 @@ function install_interactive_irc {
     APP_INSTALLED=1
 }
 
-function change_password_irc {
-    ${PROJECT_NAME}-pass -u $1 -a irc -p "$2"
-}
-
 function reconfigure_irc {
     echo -n ''
 }
diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing
index 66db9f1a9..36aad0c07 100755
--- a/src/freedombone-app-syncthing
+++ b/src/freedombone-app-syncthing
@@ -227,10 +227,6 @@ function install_interactive_syncthing {
     APP_INSTALLED=1
 }
 
-function change_password_syncthing {
-    echo -n ''
-}
-
 function reconfigure_syncthing {
     echo -n ''
 }
diff --git a/src/freedombone-app-tox b/src/freedombone-app-tox
index 12b9f1b89..133c4a767 100755
--- a/src/freedombone-app-tox
+++ b/src/freedombone-app-tox
@@ -106,10 +106,6 @@ function install_interactive_tox {
     APP_INSTALLED=1
 }
 
-function change_password_tox {
-    echo -n ''
-}
-
 function mesh_tox_qtox {
     if [ ! ${rootdir}$INSTALL_DIR ]; then
         INSTALL_DIR=${rootdir}/root/build
diff --git a/src/freedombone-app-vim b/src/freedombone-app-vim
index 24c1b5969..7a932b977 100755
--- a/src/freedombone-app-vim
+++ b/src/freedombone-app-vim
@@ -38,10 +38,6 @@ VIM_MUTT_EDITOR='vim \"+set nonumber\" \"+set insertmode\" \"+set spell\" +/^$/
 vim_variables=(MY_USERNAME
                VIM_MUTT_EDITOR)
 
-function change_password_vim {
-    echo -n ''
-}
-
 function reconfigure_vim {
     echo -n ''
 }
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index baa4d39ef..0ca12fc20 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -107,7 +107,19 @@ function install_interactive_xmpp {
 }
 
 function change_password_xmpp {
-    echo -n ''
+    curr_username="$1"
+    new_user_password="$2"
+
+    read_config_param DEFAULT_DOMAIN_NAME
+
+    ${PROJECT_NAME}-pass -u $curr_username -a xmpp -p "$new_user_password"
+
+    # TODO: this is currently interactive. Really there needs to be a
+    # non-interactive password change option for prosodyctl
+    clear
+    echo ''
+    echo $'Currently Prosody requires password changes to be done interactively'
+    prosodyctl passwd ${curr_username}@${DEFAULT_DOMAIN_NAME}
 }
 
 function reconfigure_xmpp {
diff --git a/src/freedombone-tests b/src/freedombone-tests
index 83f07c810..53ae1ffc1 100755
--- a/src/freedombone-tests
+++ b/src/freedombone-tests
@@ -61,7 +61,7 @@ function test_app_functions {
     FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
 
     # check that these functions exist
-    interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade reconfigure change_password )
+    interface_functions=( install remove backup_local backup_remote restore_local restore_remote upgrade reconfigure )
 
     # for all the app scripts
     for filename in $FILES
-- 
GitLab