Use opencloud in webfinger rel

Author: TheOneRing

src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp

@@ -15,6 +15,7 @@
 #include "webfingeruserinfojobfactory.h"
 #include "common/utility.h"
 #include "creds/httpcredentials.h"
+#include "creds/webfinger.h"
 
 #include <QApplication>
 #include <QJsonArray>
@@ -83,7 +84,7 @@ CoreJob *WebFingerInstanceLookupJobFactory::startJob(const QUrl &url, QObject *p
             const QString rel = linkObject.value(QStringLiteral("rel")).toString();
             const QString href = linkObject.value(QStringLiteral("href")).toString();
 
-            if (rel != QStringLiteral("http://webfinger.owncloud/rel/server-instance")) {
+            if (rel != WebFinger::relId()) {
                 qCDebug(lcWebFingerUserInfoJob) << "skipping invalid link" << href << "with rel" << rel;
                 continue;
             }

src/libsync/creds/webfinger.cpp

@@ -27,14 +27,6 @@
 
 Q_LOGGING_CATEGORY(lcWebFinger, "sync.credentials.webfinger", QtInfoMsg)
 
-namespace {
-
-auto relId()
-{
-    return QStringLiteral("http://webfinger.owncloud/rel/server-instance");
-}
-}
-
 using namespace OCC;
 
 WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
@@ -45,7 +37,7 @@ WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
 
 void WebFinger::start(const QUrl &url, const QString &resourceId)
 {
-    //    GET /.well-known/webfinger?rel=http://webfinger.owncloud/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
+    //    GET /.well-known/webfinger?rel=http://webfinger.opencloud.eu/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
     if (OC_ENSURE(url.scheme() == QLatin1String("https"))) {
         QUrlQuery query;
         query.setQueryItems({ { QStringLiteral("resource"), QString::fromUtf8(QUrl::toPercentEncoding(resourceId)) },
@@ -93,3 +85,8 @@ const QUrl &WebFinger::href() const
 {
     return _href;
 }
+
+QString WebFinger::relId()
+{
+    return QStringLiteral("http://webfinger.opencloud.eu/rel/server-instance");
+}

src/libsync/creds/webfinger.h

@@ -35,6 +35,11 @@ class OWNCLOUDSYNC_EXPORT WebFinger : public QObject
 
     const QUrl &href() const;
 
+    /***
+     * ID used to describe our rel attribute
+     */
+    static QString relId();
+
 Q_SIGNALS:
     void finished();