From b24672d6b4280093a712d67b2f66dd91b0c027c4 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 19 Nov 2020 19:18:34 +0200
Subject: [PATCH] Add force param to logout provisioning API

---
 provisioning.go | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/provisioning.go b/provisioning.go
index 34fffce..d3f5fb1 100644
--- a/provisioning.go
+++ b/provisioning.go
@@ -92,6 +92,7 @@ func (prov *ProvisioningAPI) DeleteSession(w http.ResponseWriter, r *http.Reques
 		_, _ = user.Conn.Disconnect()
 		user.Conn.RemoveHandlers()
 		user.Conn = nil
+		user.bridge.Metrics.TrackConnectionState(user.JID, false)
 	}
 	jsonResponse(w, http.StatusOK, Response{true, "Session information purged"})
 }
@@ -281,22 +282,38 @@ func (prov *ProvisioningAPI) Logout(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err := user.Conn.Logout()
-	if err != nil {
-		user.log.Warnln("Error while logging out:", err)
-		jsonResponse(w, http.StatusInternalServerError, Error{
-			Error:   fmt.Sprintf("Unknown error while logging out: %v", err),
-			ErrCode: err.Error(),
-		})
-		return
+	force := strings.ToLower(r.URL.Query().Get("force")) == "true"
+
+	if user.Conn == nil {
+		if !force {
+			jsonResponse(w, http.StatusNotFound, Error{
+				Error:   "You're not connected",
+				ErrCode: "not connected",
+			})
+		}
+	} else {
+		err := user.Conn.Logout()
+		if err != nil {
+			user.log.Warnln("Error while logging out:", err)
+			if !force {
+				jsonResponse(w, http.StatusInternalServerError, Error{
+					Error:   fmt.Sprintf("Unknown error while logging out: %v", err),
+					ErrCode: err.Error(),
+				})
+				return
+			}
+		}
+		_, err = user.Conn.Disconnect()
+		if err != nil {
+			user.log.Warnln("Error while disconnecting after logout:", err)
+		}
+		user.Conn.RemoveHandlers()
+		user.Conn = nil
 	}
-	_, err = user.Conn.Disconnect()
-	if err != nil {
-		user.log.Warnln("Error while disconnecting after logout:", err)
-	}
-	user.Conn.RemoveHandlers()
-	user.Conn = nil
+
+	user.bridge.Metrics.TrackConnectionState(user.JID, false)
 	user.removeFromJIDMap()
+
 	// TODO this causes a foreign key violation, which should be fixed
 	//ce.User.JID = ""
 	user.SetSession(nil)