From e5cff004fe44e07afee1e2fc7a30f67eeb07d9f4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 21 Feb 2018 11:15:13 +0000
Subject: [PATCH] Move xmpp user removal into the app script

---
 src/freedombone-app-xmpp | 10 +++---
 src/freedombone-rmxmpp   | 71 ----------------------------------------
 2 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100755 src/freedombone-rmxmpp

diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 8089bcb2..28bd770d 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -202,13 +202,15 @@ function configure_interactive_xmpp {
 
 function remove_user_xmpp {
     remove_username="$1"
-    ${PROJECT_NAME}-pass -u $remove_username --rmapp xmpp
-    XMPP_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
+
+    ${PROJECT_NAME}-pass -u "$remove_username" --rmapp xmpp
     if [[ $ONION_ONLY != "no" ]]; then
-        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${XMPP_ONION_HOSTNAME}"
+        DOMAIN=$(cat /var/lib/tor/hidden_service_xmpp/hostname)
     else
-        ${PROJECT_NAME}-rmxmpp -e "${remove_username}@${HOSTNAME}"
+        DOMAIN=${HOSTNAME}
     fi
+    prosodyctl deluser "${remove_username}@${DOMAIN}"
+
 }
 
 function add_user_xmpp_client {
diff --git a/src/freedombone-rmxmpp b/src/freedombone-rmxmpp
deleted file mode 100755
index 9e519d45..00000000
--- a/src/freedombone-rmxmpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# .---.                  .              .
-# |                      |              |
-# |--- .--. .-.  .-.  .-.|  .-. .--.--. |.-.  .-. .--.  .-.
-# |    |   (.-' (.-' (   | (   )|  |  | |   )(   )|  | (.-'
-# '    '     --'  --'  -' -  -' '  '   -' -'   -' '   -  --'
-#
-#                    Freedom in the Cloud
-#
-
-# Removes an xmpp user
-
-# License
-# =======
-#
-# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-PROJECT_NAME='freedombone'
-
-export TEXTDOMAIN=${PROJECT_NAME}-rmxmpp
-export TEXTDOMAINDIR="/usr/share/locale"
-
-EMAIL_ADDRESS=
-
-function show_help {
-    echo ''
-    echo $"${PROJECT_NAME}-rmxmpp -e [email address]"
-    echo ''
-    exit 0
-}
-
-while [[ $# > 1 ]]
-do
-key="$1"
-
-case $key in
-    -h|--help)
-    show_help
-    ;;
-    -e|--email)
-    shift
-    EMAIL_ADDRESS="$1"
-    ;;
-    *)
-    # unknown option
-    ;;
-esac
-shift
-done
-
-if [ ! $EMAIL_ADDRESS ]; then
-    show_help
-fi
-
-prosodyctl deluser $EMAIL_ADDRESS
-
-exit 0