Merge lp:~mardy/account-plugins/nextcloud-1639175 into lp:account-plugins

[Alberto Mardegan]

Add account plugin for Nextcloud

[lp:~mardy/account-plugins/nextcloud-1639175]

183. By Alberto Mardegan on 2016-11-10

Improve nextcloud icon

=== modified file '.bzrignore'
--- .bzrignore	2016-06-16 11:48:50 +0000
+++ .bzrignore	2016-11-10 13:53:58 +0000
@@ -21,6 +21,7 @@
 configure
 compile
 /data/providers/*.provider.in
+/debian/*-stamp
 /debian/account-plugin-facebook/
 /debian/account-plugin-flickr/
 /debian/account-plugin-foursquare/
@@ -28,7 +29,11 @@
 /debian/account-plugin-google/
 /debian/account-plugin-icons/
 /debian/account-plugin-identica/
+/debian/account-plugin-instagram/
+/debian/account-plugin-linkedin/
 /debian/account-plugin-mcloud/
+/debian/account-plugin-microsoft/
+/debian/account-plugin-nextcloud/
 /debian/account-plugin-owncloud/
 /debian/account-plugin-sina/
 /debian/account-plugin-sohu/
@@ -39,6 +44,11 @@
 /debian/autoreconf.after
 /debian/autoreconf.before
 /debian/files
+/debian/libaccount-plugin-facebook/
+/debian/libaccount-plugin-flickr/
+/debian/libaccount-plugin-generic-oauth/
+/debian/libaccount-plugin-google/
+/debian/libaccount-plugin-twitter/
 /debian/tmp/
 depcomp
 install-sh

=== modified file 'Makefile.am'
--- Makefile.am	2016-11-10 13:53:58 +0000
+++ Makefile.am	2016-11-10 13:53:58 +0000
@@ -91,6 +91,7 @@
 	data/providers/instagram.provider.in.in \
 	data/providers/mcloud.provider.in.in \
 	data/providers/microsoft.provider.in.in \
+	data/providers/nextcloud.provider.in.in \
 	data/providers/owncloud.provider.in.in \
 	data/providers/sina.provider.in.in \
 	data/providers/sohu.provider.in.in \
@@ -137,12 +138,12 @@
 
 # Temporary until these bugs are fixed:
 # https://bugs.launchpad.net/bugs/1567908
-# https://bugs.launchpad.net/bugs/1571587
+# https://bugs.launchpad.net/bugs/1640704
 iconsdir = $(datadir)/icons/hicolor/32x32/apps
 dist_icons_DATA = \
 	data/icons/mcloud.png \
 	data/icons/microsoft.png \
-	data/icons/owncloud.png \
+	data/icons/nextcloud.png \
 	data/icons/vk.png
 
 dist_bin_SCRIPTS = \

=== modified file 'configure.ac'
--- configure.ac	2016-11-10 13:53:58 +0000
+++ configure.ac	2016-11-10 13:53:58 +0000
@@ -268,6 +268,7 @@
 	data/providers/instagram.provider.in
 	data/providers/mcloud.provider.in
 	data/providers/microsoft.provider.in
+	data/providers/nextcloud.provider.in
 	data/providers/owncloud.provider.in
 	data/providers/sina.provider.in
 	data/providers/sohu.provider.in

=== added file 'data/icons/nextcloud.png'
Binary files data/icons/nextcloud.png	1970-01-01 00:00:00 +0000 and data/icons/nextcloud.png	2016-11-10 13:53:58 +0000 differ
=== added file 'data/providers/nextcloud.provider.in.in'
--- data/providers/nextcloud.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/nextcloud.provider.in.in	2016-11-10 13:53:58 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="nextcloud">
+  <name>Nextcloud</name>
+  <icon>nextcloud</icon>
+  <translations>account-plugins</translations>
+
+  <template>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</provider>

=== added file 'debian/account-plugin-nextcloud.install'
--- debian/account-plugin-nextcloud.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-nextcloud.install	2016-11-10 13:53:58 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/providers/nextcloud.provider
+usr/share/accounts/qml-plugins/nextcloud/*.qml
+usr/share/icons/hicolor/32x32/apps/nextcloud.png

=== modified file 'debian/account-plugin-owncloud.install'
--- debian/account-plugin-owncloud.install	2016-08-01 15:50:48 +0000
+++ debian/account-plugin-owncloud.install	2016-11-10 13:53:58 +0000
@@ -1,3 +1,2 @@
 usr/share/accounts/providers/owncloud.provider
 usr/share/accounts/qml-plugins/owncloud/*.qml
-usr/share/icons/hicolor/32x32/apps/owncloud.png

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-29 09:23:40 +0000
+++ debian/changelog	2016-11-10 13:53:58 +0000
@@ -1,3 +1,13 @@
+account-plugins (0.13+16.10.20160929.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/account-plugin-owncloud.install:
+    - remove owncloud icon, it's now provided by the theme
+  * debian/control,debian/account-plugin-nextcloud.install:
+    - add Nextcloud account plugin
+  * Add account plugin for Nextcloud (LP: #1639175)
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 10 Nov 2016 11:43:37 +0300
+
 account-plugins (0.13+16.10.20160929.1-0ubuntu1) yakkety; urgency=medium
 
   * Owncloud: properly encode username and password in POST request (LP:

=== modified file 'debian/control'
--- debian/control	2016-11-10 13:53:58 +0000
+++ debian/control	2016-11-10 13:53:58 +0000
@@ -163,6 +163,15 @@
  This plugin adds support for creating microsoft accounts in the Unity Control
  Center
 
+Package: account-plugin-nextcloud
+Architecture: all
+Depends: ${misc:Depends},
+         signon-plugin-password,
+         ubuntu-system-settings-online-accounts,
+Description: Online account plugin for Unity - Nextcloud
+ This plugin adds support for creating Nextcloud accounts in the Unity Control
+ Center
+
 Package: account-plugin-owncloud
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2016-11-10 13:53:58 +0000
+++ qml/Makefile.am	2016-11-10 13:53:58 +0000
@@ -4,6 +4,8 @@
 	google/Main.qml \
 	mcloud/Main.qml \
 	microsoft/Main.qml \
+	nextcloud/Main.qml \
+	nextcloud/NewAccount.qml \
 	owncloud/Main.qml \
 	owncloud/NewAccount.qml \
 	twitter/Main.qml \

=== added directory 'qml/nextcloud'
=== added file 'qml/nextcloud/Main.qml'
--- qml/nextcloud/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/nextcloud/Main.qml	2016-11-10 13:53:58 +0000
@@ -0,0 +1,27 @@
+import QtQuick 2.0
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+Flickable {
+    id: root
+
+    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+    contentHeight: loader.item.height + keyboardSize
+
+    signal finished
+
+    Loader {
+        id: loader
+        anchors.fill: parent
+        sourceComponent: newAccountComponent
+
+        Connections {
+            target: loader.item
+            onFinished: root.finished()
+        }
+    }
+
+    Component {
+        id: newAccountComponent
+        NewAccount {}
+    }
+}

=== added file 'qml/nextcloud/NewAccount.qml'
--- qml/nextcloud/NewAccount.qml	1970-01-01 00:00:00 +0000
+++ qml/nextcloud/NewAccount.qml	2016-11-10 13:53:58 +0000
@@ -0,0 +1,234 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+
+Item {
+    id: root
+
+    signal finished
+
+    height: contents.height
+
+    property var __account: account
+    property string __host: ""
+    property bool __busy: false
+    property string __hostError: i18n.dtr("account-plugins", "Invalid host URL")
+
+    Column {
+        id: contents
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+        }
+        spacing: units.gu(2)
+
+        Label {
+            id: errorLabel
+            anchors { left: parent.left; right: parent.right }
+            font.bold: true
+            color: UbuntuColors.red
+            wrapMode: Text.Wrap
+            visible: !__busy && text != ""
+        }
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.dtr("account-plugins", "URL:")
+        }
+
+        TextField {
+            id: urlField
+            anchors { left: parent.left; right: parent.right }
+            placeholderText: i18n.dtr("account-plugins", "http://myserver.com/nextcloud")
+            focus: true
+            enabled: !__busy
+
+            inputMethodHints: Qt.ImhUrlCharactersOnly
+        }
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.dtr("account-plugins", "Username:")
+        }
+
+        TextField {
+            id: usernameField
+            anchors { left: parent.left; right: parent.right }
+            placeholderText: i18n.dtr("account-plugins", "Your username")
+            enabled: !__busy
+            inputMethodHints: Qt.ImhNoAutoUppercase + Qt.ImhNoPredictiveText + Qt.ImhPreferLowercase
+
+            KeyNavigation.tab: passwordField
+        }
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.dtr("account-plugins", "Password:")
+        }
+
+        TextField {
+            id: passwordField
+            anchors { left: parent.left; right: parent.right }
+            placeholderText: i18n.dtr("account-plugins", "Your password")
+            echoMode: TextInput.Password
+            enabled: !__busy
+
+            inputMethodHints: Qt.ImhSensitiveData
+            Keys.onReturnPressed: login()
+        }
+
+        Row {
+            id: buttons
+            anchors { left: parent.left; right: parent.right }
+            height: units.gu(5)
+            spacing: units.gu(1)
+            Button {
+                id: btnCancel
+                text: i18n.dtr("account-plugins", "Cancel")
+                height: parent.height
+                width: (parent.width / 2) - 0.5 * parent.spacing
+                onClicked: finished()
+            }
+            Button {
+                id: btnContinue
+                text: i18n.dtr("account-plugins", "Continue")
+                color: UbuntuColors.green
+                height: parent.height
+                width: (parent.width / 2) - 0.5 * parent.spacing
+                onClicked: login()
+                enabled: !__busy
+            }
+        }
+    }
+
+    ActivityIndicator {
+        anchors.centerIn: parent
+        running: __busy
+    }
+
+    Credentials {
+        id: creds
+        caption: account.provider.id
+        acl: [ "unconfined" ]
+        storeSecret: true
+        onCredentialsIdChanged: root.credentialsStored()
+    }
+
+    AccountService {
+        id: globalAccountSettings
+        objectHandle: account.accountServiceHandle
+        autoSync: false
+    }
+
+    function login() {
+        __host = cleanUrl(urlField.text)
+        var username = usernameField.text
+        var password = passwordField.text
+
+        errorLabel.text = ""
+        __busy = true
+        var host = __host
+        var tryHttp = false
+        if (__host.indexOf("http") != 0) {
+            host = "https://" + __host
+            tryHttp = true
+        }
+
+        checkAccount(host, username, password, function cb(success) {
+            console.log("callback called: " + success)
+            if (success) {
+                saveData(host, username, password)
+            } else if (tryHttp) {
+                host = "http://" + __host
+                tryHttp = false
+                checkAccount(host, username, password, cb)
+            } else {
+                __busy = false
+            }
+        })
+    }
+
+    function saveData(host, username, password) {
+        __host = host
+        var strippedHost = __host.replace(/^https?:\/\//, '')
+        account.updateDisplayName(username + '@' + strippedHost)
+        creds.userName = username
+        creds.secret = password
+        creds.sync()
+    }
+
+    function findChild(node, tagName) {
+        if (!node) return node;
+        var children = node.childNodes
+        for (var i = 0; i < children.length; i++) {
+            if (children[i].nodeName == tagName) {
+                return children[i]
+            }
+        }
+        return null
+    }
+
+    function checkAccount(host, username, password, callback) {
+        console.log("Trying host " + host + " as " + username + ':' + password)
+        var request = new XMLHttpRequest();
+        request.onreadystatechange = function() {
+            if (request.readyState === XMLHttpRequest.DONE) {
+                console.log("response: " + request.responseText)
+                if (request.status == 200) {
+                    var root = request.responseXML ? request.responseXML.documentElement : null
+                    var metaElement = findChild(root, "meta")
+                    var statusElement = findChild(metaElement, "status")
+                    if (statusElement && statusElement.childNodes.length > 0 &&
+                        statusElement.childNodes[0].nodeValue == "ok") {
+                        callback(true)
+                    } else {
+                        var statusCodeElement = findChild(metaElement, "statuscode")
+                        var statusCode = (statusCodeElement && statusCodeElement.childNodes.length > 0) ?
+                            statusCodeElement.childNodes[0].nodeValue : "999"
+                        if (statusCode == "999") {
+                            showError(__hostError)
+                        } else {
+                            showError(i18n.dtr("account-plugins", "Invalid username or password"))
+                        }
+                        callback(false)
+                    }
+                } else {
+                    showError(__hostError)
+                    callback(false)
+                }
+            }
+        }
+        request.open("POST", host + "/ocs/v1.php/person/check", true);
+        request.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        var body = "login=" + encodeURIComponent(username) + "&password=" + encodeURIComponent(password)
+        request.send(body);
+    }
+
+    function showError(message) {
+        if (!errorLabel.text) errorLabel.text = message
+    }
+
+    function credentialsStored() {
+        console.log("Credentials stored, id: " + creds.credentialsId)
+        if (creds.credentialsId == 0) return
+
+        globalAccountSettings.updateServiceEnabled(true)
+        globalAccountSettings.credentials = creds
+        globalAccountSettings.updateSettings({
+            "host": __host
+        })
+        account.synced.connect(finished)
+        account.sync()
+        __busy = false
+    }
+
+    // check host url for http
+    function cleanUrl(url) {
+        var host = url.trim()
+        // if the user typed trailing '/' or "index.php", strip that
+        return host.replace(/\/(index.php)?\/*$/, '')
+    }
+
+}