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

[Gary.Wang]

Add mcloud plugin.

Add mcloud plugin

Testing instructions:
1) manually install the account-plugin-mcloud package
2) download and install mcloud scope package from
   https://drive.google.com/open?id=0B2H9ECPSSfqIcGtmUEdZNHpVNVU
3) launch mcloud scope and click "Login to MCloud"

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2016-04-05 10:03:39 +0000
+++ .bzrignore	2016-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +0000
@@ -0,0 +1,29 @@
+<?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">user_agent</setting>
+      <group name="oauth2">
+        <group name="user_agent">
+          <setting name="Host">caiyun.feixin.10086.cn</setting>
+          <setting name="AuthPath">authorize.jsp</setting>
+          <setting name="TokenPath">access_token</setting>
+          <setting name="RedirectUri">http://developer.ubuntu.com/en/</setting>
+          <setting name="ResponseType">code</setting>
+          <setting name="ClientId">@MCLOUD_CLIENT_ID@</setting>
+          <setting type="as" name="Scope">['nd_cloud']</setting>          
+          <setting name="ForceClientAuthViaRequestBody" type="b">true</setting>
+          <setting name="DisableStateParameter" type="b">true</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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +0000
@@ -2,4 +2,7 @@
 	facebook/Main.qml \
 	flickr/Main.qml \
 	google/Main.qml \
-	twitter/Main.qml
+	owncloud/Main.qml \
+	owncloud/NewAccount.qml \
+	twitter/Main.qml \
+	vk/Main.qml

=== added directory 'qml/mcloud'
=== added file 'qml/mcloud/ErrorItem.qml'
--- qml/mcloud/ErrorItem.qml	1970-01-01 00:00:00 +0000
+++ qml/mcloud/ErrorItem.qml	2016-05-31 09:01:17 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Item {
+    id: root
+
+    signal retryRequested()
+
+    Column {
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left; right: parent.right
+        }
+        spacing: units.gu(2)
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.dtr("ubuntu-system-settings-online-accounts", "This service is not available right now. Try again later.")
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: i18n.dtr("ubuntu-system-settings-online-accounts", "Try Again")
+            onClicked: root.retryRequested()
+        }
+    }
+}

=== added file 'qml/mcloud/Main.qml'
--- qml/mcloud/Main.qml	1970-01-01 00:00:00 +0000
+++ qml/mcloud/Main.qml	2016-05-31 09:01:17 +0000
@@ -0,0 +1,7 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+import "." as Local
+
+OAuthMain {
+    creationComponent: Local.OAuth {
+  }
+}

=== added file 'qml/mcloud/OAuth.qml'
--- qml/mcloud/OAuth.qml	1970-01-01 00:00:00 +0000
+++ qml/mcloud/OAuth.qml	2016-05-31 09:01:17 +0000
@@ -0,0 +1,283 @@
+/*
+ * Copyright (C) 2013-2016 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+Item {
+    id: root
+
+    /* To override the parameters coming from the .provider file: */
+    property variant authenticationParameters: {}
+    /* To override the default access control list: */
+    property variant accessControlList: ["unconfined"]
+
+    property variant authReply
+    property bool isNewAccount: false
+    property variant __account: account
+    property bool __isAuthenticating: false
+    property alias globalAccountService: globalAccountSettings
+    property bool loading: loader.status == Loader.Null || loader.status == Loader.Loading
+
+    signal authenticated(variant reply)
+    signal authenticationError(variant error)
+    signal finished
+
+    anchors.fill: parent
+
+    Component.onCompleted: {
+        isNewAccount = (account.accountId === 0)
+        enableAccount()
+        authenticate()
+    }
+
+    RequestHandler {
+        id: requestHandler
+        onRequestChanged: {
+            if (request) {
+                console.log("RequestHandler captured request!")
+                loader.setSource("WebView.qml", {
+                    "signonRequest": request
+                })
+            } else {
+                console.log("Request destroyed!")
+                loader.source = ""
+            }
+        }
+    }
+
+    Credentials {
+        id: creds
+        caption: account.provider.id
+        acl: accessControlList
+        onCredentialsIdChanged: root.credentialsStored()
+    }
+
+    AccountService {
+        id: globalAccountSettings
+        objectHandle: account.accountServiceHandle
+        credentials: creds
+        autoSync: false
+
+        onAuthenticated: {
+            __isAuthenticating = false
+            authReply = reply
+            root.authenticated(reply)
+        }
+        onAuthenticationError: {
+            __isAuthenticating = false
+            root.authenticationError(error)
+        }
+    }
+
+    AccountServiceModel {
+        id: accountServices
+        includeDisabled: true
+        account: __account.objectHandle
+    }
+
+    ListItem.Base {
+        visible: loading && !errorItem.visible
+        height: units.gu(7)
+        showDivider: false
+        anchors.top: parent.top
+
+        Item {
+            height: units.gu(5)
+            width: units.gu(30)
+            anchors.horizontalCenter: parent.horizontalCenter
+            anchors.top: parent.top
+            anchors.margins: units.gu(1)
+
+            ActivityIndicator {
+                id: loadingIndicator
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: parent.left
+                anchors.leftMargin: units.gu(5)
+                running: loading
+                z: 1
+            }
+            Label {
+                text: i18n.dtr("ubuntu-system-settings-online-accounts", "Loading…")
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.left: loadingIndicator.right
+                anchors.leftMargin: units.gu(3)
+            }
+        }
+    }
+
+    Loader {
+        id: loader
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: Qt.inputMethod.visible ? osk.top : cancelButton.top
+        }
+        focus: true
+        visible: !loading
+    }
+
+    ErrorItem {
+        id: errorItem
+        anchors { fill: parent; margins: units.gu(4) }
+        visible: false
+        onRetryRequested: {
+            root.credentialsStored()
+            visible = false
+        }
+    }
+
+    KeyboardRectangle {
+        id: osk
+    }
+
+    ListItem.SingleControl {
+        id: cancelButton
+        anchors.bottom: parent.bottom
+        showDivider: false
+        control: Button {
+            text: i18n.dtr("ubuntu-system-settings-online-accounts", "Cancel")
+            width: parent.width - units.gu(4)
+            onClicked: root.cancel()
+        }
+    }
+
+    AccountServiceModel {
+        id: possiblyDuplicateAccounts
+        service: "global"
+        provider: __account.provider.id
+    }
+
+    function authenticate() {
+        console.log("Authenticating...")
+        creds.sync()
+    }
+
+    function credentialsStored() {
+        console.log("Credentials stored, id: " + creds.credentialsId)
+        if (creds.credentialsId == 0) return
+        var parameters = {}
+        parameters[requestHandler.matchKey] = requestHandler.matchId
+        parameters["providerId"] = account.provider.id
+        for (var p in authenticationParameters) {
+            parameters[p] = authenticationParameters[p]
+        }
+        __isAuthenticating = true
+        globalAccountSettings.authenticate(parameters)
+    }
+
+    function cancel() {
+        if (__isAuthenticating) {
+            /* This will cause the authentication to fail, and this method will
+             * be invoked again to delete the credentials. */
+            globalAccountSettings.cancelAuthentication()
+            return
+        }
+        if (isNewAccount && creds.credentialsId != 0) {
+            console.log("Removing credentials...")
+            creds.remove()
+            creds.removed.connect(finished)
+        } else {
+            finished()
+        }
+    }
+
+    function enableAccount() {
+        globalAccountSettings.updateServiceEnabled(true)
+    }
+
+    function getUserName(reply, callback) {
+        /* This should work for OAuth 1.0a; for OAuth 2.0 this function needs
+         * to be reimplemented */
+        if ('ScreenName' in reply) return reply.ScreenName
+        else if ('UserId' in reply) return reply.UserId
+        return ''
+    }
+
+    function accountIsDuplicate(userName) {
+        var model = possiblyDuplicateAccounts
+        for (var i = 0; i < model.count; i++) {
+            if (model.get(i, "displayName") == userName)
+                return true
+        }
+        return false
+    }
+
+    function __gotUserName(userName, reply) {
+        console.log("UserName: " + userName)
+        if (userName != '') {
+            if (accountIsDuplicate(userName)) {
+                var dialog = PopupUtils.open(Qt.resolvedUrl("DuplicateAccount.qml"))
+                dialog.closed.connect(cancel)
+                return
+            }
+            account.updateDisplayName(userName)
+        }
+        beforeSaving(reply)
+    }
+
+    function saveAccount() {
+        account.synced.connect(finished)
+        account.sync()
+    }
+
+    /* reimplement this function in plugins in order to perform some actions
+     * before quitting the plugin */
+    function beforeSaving(reply) {
+        saveAccount()
+    }
+
+    function __getUserNameAndSave(reply) {
+        /* If the completeCreation function is defined, run it */
+        if (typeof(completeCreation) == "function") {
+            console.warn("The completeCreation method is deprecated; use getUserName() or beforeSaving() instead")
+            completeCreation(reply)
+            return
+        }
+
+        var userName = getUserName(reply, function(name) {
+            __gotUserName(name, reply)
+        })
+        if (typeof(userName) == "string") {
+            __gotUserName(userName, reply)
+        } else if (userName === false) {
+            cancel()
+            return
+        }
+        // otherwise (userName === true), wait for the callback to be invoked
+    }
+
+    onAuthenticated: __getUserNameAndSave(reply)
+
+    onAuthenticationError: {
+        console.log("Authentication error, code " + error.code)
+        if (error.code == AccountService.NetworkError) {
+            console.log("Network error")
+            errorItem.visible = true
+            return
+        }
+        root.cancel()
+    }
+
+    onFinished: loading = false
+}

=== added file 'qml/mcloud/WebView.qml'
--- qml/mcloud/WebView.qml	1970-01-01 00:00:00 +0000
+++ qml/mcloud/WebView.qml	2016-05-31 09:01:17 +0000
@@ -0,0 +1,94 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Web 0.2
+
+WebView {
+    id: root
+
+    property QtObject signonRequest
+    readonly property string token_url: "https://ose.caiyun.feixin.10086.cn/oauthApp/OAuth2/getToken"
+    readonly property string redirect_url: "http://developer.ubuntu.com/en/"
+    readonly property string client_id: "APP1ZtqoN3R0002"
+    readonly property string client_pass: "A70EFCDC91456349E7FDECF0A33574AC"
+
+    Component.onCompleted: {
+        signonRequest.authenticated.connect(onAuthenticated)
+        url = signonRequest.startUrl
+    }
+
+    //1.WORKAROUND: we need to retrieve refresh token instead of access token.
+    function fetchRefreshToken(code) {
+        var http = new XMLHttpRequest()
+        var body = "grant_type=authorization_code&code="+code+"&redirect_uri="+redirect_url
+
+        http.open("POST", token_url, true);
+        http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+        http.setRequestHeader("Authorization", "Basic " + Qt.btoa(client_id + ":" + client_pass));
+        http.onreadystatechange = function() {
+            if (http.readyState === 4 && http.status == 200) {
+                var response = JSON.parse(http.responseText)
+                //create a fake access_token with refresh token. 
+                var urlStr = redirect_url+"#access_token="+response.refresh_token
+                var authUrl = Qt.resolvedUrl(urlStr);
+                signonRequest.currentUrl = authUrl
+            } else {
+                console.log("error: " + http.status)
+            }   
+        };  
+
+        http.send(body);
+    } 
+
+    onLoadingStateChanged: {
+        if (loading) {
+            signonRequest.onLoadStarted()
+        } else if (lastLoadSucceeded) {
+            signonRequest.onLoadFinished(true)
+        } else {
+            signonRequest.onLoadFinished(false)
+        }
+    }
+
+    onUrlChanged: {
+        //2.WORKAROUND: retrieve refresh token if code is fetched
+        var code_pattern= new RegExp("\\?code=.*&");
+        var urlStr = url.toString()
+        if (code_pattern.test(urlStr)){
+            var code = urlStr.match(/\?code=(.*)&/)[1];
+            console.log("code::", code)
+            fetchRefreshToken(code)
+        } else {
+            signonRequest.currentUrl = url
+        }
+    }
+
+    //3.WORKAROUND: Apply desktop useragent to prevent server from detecting android client,
+    //which causes authentication failure.
+    context: WebContext {
+        dataPath: signonRequest ? signonRequest.rootDir : ""
+        userAgent: "Mozilla/5.0 (Linux; Ubuntu 14.04) AppleWebKit/537.36 Chromium/35.0.1870.2 Safari/537.36"
+    }
+
+    function onAuthenticated() {
+        /* Get the cookies and set them on the request */
+        console.log("Authenticated; getting cookies")
+        context.cookieManager.getCookiesResponse.connect(onGotCookies)
+        context.cookieManager.getAllCookies()
+        visible = false
+    }
+
+    function onGotCookies(requestId, cookies) {
+        signonRequest.setCookies(cookies)
+    }
+
+    /* Taken from webbrowser-app */
+    ProgressBar {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: units.dp(3)
+        showProgressPercentage: false
+        visible: root.loading
+        value: root.loadProgress / 100
+    }
+}

=== 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-05-31 09:01:17 +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-05-31 09:01:17 +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-05-31 09:01:17 +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);
+        }
+    }
+}