Merge lp:~mardy/account-plugins/mcloud-plugin-lp1587282 into lp:account-plugins

[Alberto Mardegan]

Add account plugin for MCloud

Add account plugin for MCloud

[lp:~mardy/account-plugins/mcloud-plugin-lp1587282]

166. By Alberto Mardegan on 2016-06-16

Merge from trunk

* debian/control:
  Update package descriptions for all account plugins (LP: #1590786)
[ Alberto Mardegan ]
* Add account plugin for vk.com (LP: #1564883)
* Add ownCloud plugin (LP: #1570986)
[ Alberto Mardegan ]
* After the authentication, retrieve the username in Google, Facebook,
  Flickr and Twitter plugins (LP: #1565772)
* debian/control, debian/libaccount-plugin-facebook.install,
  debian/libaccount-plugin-flickr.install,
  debian/libaccount-plugin-twitter.install:
  add packages containing plugin modules.
* debian/account-plugin-facebook.install,
  debian/account-plugin-flickr.install,
  debian/account-plugin-twitter.install:
  remove unneeded webkit-options files.
[ CI Train Bot ]
* No-change rebuild.

167. By Alberto Mardegan on 2016-06-16

Update description

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2016-04-05 10:03:39 +0000
+++ .bzrignore	2016-06-02 12:13:37 +0000
@@ -28,10 +28,13 @@
 /debian/account-plugin-google/
 /debian/account-plugin-icons/
 /debian/account-plugin-identica/
+/debian/account-plugin-mcloud/
+/debian/account-plugin-owncloud/
 /debian/account-plugin-sina/
 /debian/account-plugin-sohu/
 /debian/account-plugin-tools/
 /debian/account-plugin-twitter/
+/debian/account-plugin-vk/
 /debian/account-plugin-windows-live/
 /debian/autoreconf.after
 /debian/autoreconf.before

=== modified file 'Makefile.am'
--- Makefile.am	2016-04-05 10:46:13 +0000
+++ Makefile.am	2016-06-02 12:13:37 +0000
@@ -89,9 +89,12 @@
 	data/providers/identica.provider.in.in \
 	data/providers/linkedin.provider.in.in \
 	data/providers/instagram.provider.in.in \
+	data/providers/mcloud.provider.in.in \
+	data/providers/owncloud.provider.in.in \
 	data/providers/sina.provider.in.in \
 	data/providers/sohu.provider.in.in \
 	data/providers/twitter.provider.in.in \
+	data/providers/vk.provider.in.in \
 	data/providers/windows-live.provider.in.in
 
 providers_DATA = \
@@ -132,6 +135,15 @@
 	data/webkit-options/login.live.com.conf \
 	data/webkit-options/www.linkedin.com.conf
 
+# Temporary until these bugs are fixed:
+# https://bugs.launchpad.net/bugs/1567908
+# https://bugs.launchpad.net/bugs/1571587
+iconsdir = $(datadir)/icons/hicolor/32x32/apps
+dist_icons_DATA = \
+	data/icons/mcloud.png \
+	data/icons/owncloud.png \
+	data/icons/vk.png
+
 dist_bin_SCRIPTS = \
 	tools/account-console
 

=== modified file 'configure.ac'
--- configure.ac	2016-04-05 10:03:39 +0000
+++ configure.ac	2016-06-02 12:13:37 +0000
@@ -228,6 +228,28 @@
 AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
 AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
 
+# Set Mcloud client id/secret
+AC_ARG_WITH(mcloud-client-id,
+            [AS_HELP_STRING([--with-mcloud-client-id],
+                            [Mcloud client id])],
+                            [mcloud_client_id=$withval],
+                            [mcloud_client_id="APP1ZtqoN3R0002"])
+AC_ARG_WITH(mcloud-client-secret,
+            [AS_HELP_STRING([--with-mcloud-client-secret],
+                            [Mcloud client secret])],
+                            [mcloud_client_secret=$withval],
+                            [mcloud_client_secret="A70EFCDC91456349E7FDECF0A33574AC"])
+AC_SUBST(MCLOUD_CLIENT_ID, ["$mcloud_client_id"])
+AC_SUBST(MCLOUD_CLIENT_SECRET, ["$mcloud_client_secret"])
+
+# Set VK client id
+AC_ARG_WITH(vk-client-id,
+            [AS_HELP_STRING([--with-vk-client-id],
+                            [VK client ID])],
+                            [vk_client_id=$withval],
+                            [vk_client_id="5404010"])
+AC_SUBST(VK_CLIENT_ID, ["$vk_client_id"])
+
 # Set Windows Live client id
 AC_ARG_WITH(windows-live-client-id,
             [AS_HELP_STRING([--with-windows-live-client-id],
@@ -244,9 +266,12 @@
 	data/providers/identica.provider.in
 	data/providers/linkedin.provider.in
 	data/providers/instagram.provider.in
+	data/providers/mcloud.provider.in
+	data/providers/owncloud.provider.in
 	data/providers/sina.provider.in
 	data/providers/sohu.provider.in
 	data/providers/twitter.provider.in
+	data/providers/vk.provider.in
 	data/providers/windows-live.provider.in
 	Makefile
 	po/Makefile.in

=== added directory 'data/icons'
=== added file 'data/icons/mcloud.png'
Binary files data/icons/mcloud.png	1970-01-01 00:00:00 +0000 and data/icons/mcloud.png	2016-06-02 12:13:37 +0000 differ
=== added file 'data/icons/owncloud.png'
Binary files data/icons/owncloud.png	1970-01-01 00:00:00 +0000 and data/icons/owncloud.png	2016-06-02 12:13:37 +0000 differ
=== added file 'data/icons/vk.png'
Binary files data/icons/vk.png	1970-01-01 00:00:00 +0000 and data/icons/vk.png	2016-06-02 12:13:37 +0000 differ
=== added file 'data/providers/mcloud.provider.in.in'
--- data/providers/mcloud.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/mcloud.provider.in.in	2016-06-02 12:13:37 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="mcloud">
+  <name>MCloud</name>
+  <icon>mcloud</icon>
+  <translations>MCloud</translations>
+  <domains>.*10086\.cn</domains>
+  <plugin>generic-oauth</plugin>
+  <single-account>true</single-account>
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">web_server</setting>
+      <group name="oauth2">
+        <group name="web_server">
+          <setting name="Host">caiyun.feixin.10086.cn</setting>
+          <setting name="AuthPath">authorize.jsp</setting>
+          <setting name="TokenPath">https://ose.caiyun.feixin.10086.cn/oauthApp/OAuth2/getToken</setting>
+          <setting name="RedirectUri">http://developer.ubuntu.com/en/</setting>
+          <setting name="ResponseType">code</setting>
+          <setting name="ClientId">@MCLOUD_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@MCLOUD_CLIENT_SECRET@</setting>
+          <setting type="as" name="Scope">['nd_cloud']</setting>          
+          <setting type="as" name="AllowedSchemes">['https', 'http']</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added file 'data/providers/owncloud.provider.in.in'
--- data/providers/owncloud.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/owncloud.provider.in.in	2016-06-02 12:13:37 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="owncloud">
+  <name>ownCloud</name>
+  <icon>owncloud.png</icon>
+  <translations>account-plugins</translations>
+
+  <template>
+    <group name="auth">
+      <setting name="method">password</setting>
+      <setting name="mechanism">password</setting>
+    </group>
+  </template>
+</provider>

=== added file 'data/providers/vk.provider.in.in'
--- data/providers/vk.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/vk.provider.in.in	2016-06-02 12:13:37 +0000
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="vk">
+  <name>VKontakte</name>
+  <icon>vk</icon>
+  <translations>account-plugins</translations>
+  <domains>.*vk\.com</domains>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">user_agent</setting>
+      <group name="oauth2">
+        <group name="user_agent">
+          <setting name="Host">oauth.vk.com</setting>
+          <setting name="AuthPath">authorize</setting>
+          <setting name="TokenPath">access_token</setting>
+          <setting name="RedirectUri">https://oauth.vk.com/blank.html</setting>
+          <setting name="ResponseType">token</setting>
+          <setting name="ClientId">@VK_CLIENT_ID@</setting>
+          <setting type="as" name="Scope">['offline']</setting>
+          <setting type="s" name="v">5.50</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added file 'debian/account-plugin-mcloud.install'
--- debian/account-plugin-mcloud.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-mcloud.install	2016-06-02 12:13:37 +0000
@@ -0,0 +1,4 @@
+usr/share/accounts/providers/mcloud.provider
+usr/share/accounts/qml-plugins/mcloud/*.qml
+usr/share/icons/hicolor/32x32/apps/mcloud.png
+

=== added file 'debian/account-plugin-owncloud.install'
--- debian/account-plugin-owncloud.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-owncloud.install	2016-06-02 12:13:37 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/providers/owncloud.provider
+usr/share/accounts/qml-plugins/owncloud/*.qml
+usr/share/icons/hicolor/32x32/apps/owncloud.png

=== added file 'debian/account-plugin-vk.install'
--- debian/account-plugin-vk.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-vk.install	2016-06-02 12:13:37 +0000
@@ -0,0 +1,3 @@
+usr/share/accounts/providers/vk.provider
+usr/share/accounts/qml-plugins/vk/Main.qml
+usr/share/icons/hicolor/32x32/apps/vk.png

=== modified file 'debian/control'
--- debian/control	2016-04-05 10:52:46 +0000
+++ debian/control	2016-06-02 12:13:37 +0000
@@ -144,6 +144,29 @@
 Description: GNOME Control Center account plugin for single signon - Instagram
  GNOME Control Center account plugins for single signon
 
+Package: account-plugin-mcloud
+Architecture: all
+Depends: ${misc:Depends},
+         ubuntu-system-settings-online-accounts,
+Description: Account plugin for online accounts - mCloud
+ Online Accounts plugin provide the user interface to create accounts for
+ third party services.
+
+Package: account-plugin-owncloud
+Architecture: all
+Depends: ${misc:Depends},
+         ubuntu-system-settings-online-accounts,
+Description: Account plugin for online accounts - ownCloud
+ Online Accounts plugin provide the user interface to create accounts for
+ third party services.
+
+Package: account-plugin-vk
+Architecture: all
+Depends: ${misc:Depends},
+         libaccount-plugin-generic-oauth | ubuntu-system-settings-online-accounts,
+Description: GNOME Control Center account plugin for single signon - VKontakte
+ GNOME Control Center account plugins for single signon
+
 Package: account-plugin-tools
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2015-07-23 14:10:26 +0000
+++ debian/rules	2016-06-02 12:13:37 +0000
@@ -21,7 +21,10 @@
 		--with-linkedin-consumer-key="34gnzrg96iq5" \
 		--with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
 		--with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
-		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" 
+		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" \
+		--with-mcloud-client-id="APP1ZtqoN3R0002" \
+		--with-mcloud-client-secret="A70EFCDC91456349E7FDECF0A33574AC" \
+		--with-vk-client-id="5402699"
 
 override_dh_install:
 	rm -f debian/*/usr/lib/*/*/*.la

=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2013-06-07 11:56:25 +0000
+++ qml/Makefile.am	2016-06-02 12:13:37 +0000
@@ -2,4 +2,8 @@
 	facebook/Main.qml \
 	flickr/Main.qml \
 	google/Main.qml \
-	twitter/Main.qml
+	mcloud/Main.qml \
+	owncloud/Main.qml \
+	owncloud/NewAccount.qml \
+	twitter/Main.qml \
+	vk/Main.qml

=== added directory 'qml/mcloud'
=== added file 'qml/mcloud/Main.qml'
--- qml/mcloud/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/mcloud/Main.qml	2016-06-02 12:13:37 +0000
@@ -0,0 +1,6 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+    }
+}

=== added directory 'qml/owncloud'
=== added file 'qml/owncloud/Main.qml'
--- qml/owncloud/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/owncloud/Main.qml	2016-06-02 12:13:37 +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/owncloud/NewAccount.qml'
--- qml/owncloud/NewAccount.qml	1970-01-01 00:00:00 +0000
+++ qml/owncloud/NewAccount.qml	2016-06-02 12:13:37 +0000
@@ -0,0 +1,230 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+
+Item {
+    id: root
+
+    signal finished
+
+    anchors.margins: units.gu(1)
+    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 { left: parent.left; right: parent.right }
+        spacing: units.gu(1)
+
+        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://example.org")
+            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=" + username + "&password=" + 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)?\/*$/, '')
+    }
+
+}

=== added directory 'qml/vk'
=== added file 'qml/vk/Main.qml'
--- qml/vk/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/vk/Main.qml	2016-06-02 12:13:37 +0000
@@ -0,0 +1,36 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+        function completeCreation(reply) {
+            console.log("Access token: " + reply.AccessToken)
+            var http = new XMLHttpRequest()
+            var url = "https://api.vk.com/method/users.get?access_token=" + reply.AccessToken + "&fields=nickname,first_name,last_name";
+            http.open("GET", url, true);
+            http.onreadystatechange = function() {
+                if (http.readyState === 4){
+                    if (http.status == 200) {
+                        console.log("ok")
+                        console.log("response text: " + http.responseText)
+                        var response = JSON.parse(http.responseText)
+                        if (response.response && response.response.length > 0) {
+                            var data = response.response[0]
+                            var name = data.first_name + " " + data.last_name
+                            if (data.nickname) {
+                                name += " (" + data.nickname + ")"
+                            }
+                            account.updateDisplayName(name)
+                        }
+                        account.synced.connect(finished)
+                        account.sync()
+                    } else {
+                        console.log("error: " + http.status)
+                        cancel()
+                    }
+                }
+            };
+
+            http.send(null);
+        }
+    }
+}