Merge lp:~xavi-garcia-mena/storage-provider-webdav/base-url-host-fix into lp:storage-provider-webdav/devel

Proposed by Xavi Garcia
Status: Merged
Approved by: James Henstridge
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~xavi-garcia-mena/storage-provider-webdav/base-url-host-fix
Merge into: lp:storage-provider-webdav/devel
Diff against target: 14 lines (+3/-1)
1 file modified
src/OwncloudProvider.cpp (+3/-1)
To merge this branch: bzr merge lp:~xavi-garcia-mena/storage-provider-webdav/base-url-host-fix
Reviewer Review Type Date Requested Status
James Henstridge Approve
Michi Henning (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+315139@code.launchpad.net

Commit message

Fix to use the host included in credentials when building the base_url.

Description of the change

Fix to use the host included in credentials when building the base_url.

This should fix the issue we have using any owncloud server located at any url different from localhost:8888/owncloud.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:23
https://jenkins.canonical.com/unity-api-1/job/lp-storage-provider-webdav-ci/36/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1480
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1487
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1265/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1265/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1265/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1265/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1265/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1265
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1265/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-provider-webdav-ci/36/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good to me. I'll leave top-approval to James.

review: Approve
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/OwncloudProvider.cpp'
2--- src/OwncloudProvider.cpp 2016-11-18 04:34:55 +0000
3+++ src/OwncloudProvider.cpp 2017-01-19 15:08:12 +0000
4@@ -34,7 +34,9 @@
5 QUrl OwncloudProvider::base_url(Context const& ctx) const
6 {
7 const auto& creds = boost::get<PasswordCredentials>(ctx.credentials);
8- return QUrl(QStringLiteral("http://localhost:8888/owncloud/remote.php/dav/files/%1/").arg(QString::fromStdString(creds.username)));
9+ // get the host, removing any '/' at the end
10+ auto host = QString::fromStdString(creds.host).remove(QRegExp("/*$"));
11+ return QUrl(QStringLiteral("%1/remote.php/dav/files/%2/").arg(host).arg(QString::fromStdString(creds.username)));
12 }
13
14 QNetworkReply *OwncloudProvider::send_request(

Subscribers

People subscribed via source and target branches

to all changes: