From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 22 Sep 2017 16:59:48 +0000 (+0200)
Subject: Httpcreds: Fix double slash in the Request App Password url
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~701^2~54
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2b12990f19949fe5dcbb24b556a65629d70ee51c;p=nextcloud-desktop.git

Httpcreds: Fix double slash in the Request App Password url

Issue #6044
---

diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp
index bc533db86..366cbe161 100644
--- a/src/gui/creds/httpcredentialsgui.cpp
+++ b/src/gui/creds/httpcredentialsgui.cpp
@@ -148,7 +148,10 @@ QString HttpCredentialsGui::requestAppPasswordText(const Account *account)
         return QString();
     }
 
+    auto baseUrl = account->url().toString();
+    if (baseUrl.endsWith('/'))
+        baseUrl.chop(1);
     return tr("<a href=\"%1\">Click here</a> to request an app password from the web interface.")
-        .arg(account->url().toString() + path);
+        .arg(baseUrl + path);
 }
 } // namespace OCC