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

[Alberto Mardegan]

Add account plugin for MCloud

Add account plugin for MCloud

Testing instructions:

In the testing device, paste the following commands in a terminal:

cat > ~/.local/share/accounts/services/mcloud-test.service <<EOF
<?xml version='1.0' encoding='UTF-8'?>
<service id="mcloud-test">
  <type>test-type</type>
  <name>MCloud test</name>
  <provider>mcloud</provider>
</service>
EOF

cat > ~/.local/share/accounts/applications/mcloud-test.application <<EOF
<?xml version='1.0' encoding='UTF-8'?>
<application id="mcloud-test">
  <description>MCloud test</description>
  <services>
    <service id="mcloud-test">
      <description>Test mcloud account</description>
    </service>
  </services>
</application>
EOF

Then head to the System Settings -> Accounts and create a MCloud account. Ask mardy on IRC for a test account.

To clean up your device after the test, run this command:
    rm ~/.local/share/accounts/*/mcloud-test*

[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

=== modified file '.bzrignore'
--- .bzrignore	2016-06-08 12:08:49 +0000
+++ .bzrignore	2016-06-16 11:50:26 +0000
@@ -28,6 +28,7 @@
 /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/

=== modified file 'Makefile.am'
--- Makefile.am	2016-06-08 12:08:49 +0000
+++ Makefile.am	2016-06-16 11:50:26 +0000
@@ -89,6 +89,7 @@
 	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 \
@@ -139,6 +140,7 @@
 # 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
 

=== modified file 'configure.ac'
--- configure.ac	2016-06-08 12:08:49 +0000
+++ configure.ac	2016-06-16 11:50:26 +0000
@@ -228,6 +228,20 @@
 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],
@@ -252,6 +266,7 @@
 	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

=== 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-16 11:50:26 +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-16 11:50:26 +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 'debian/account-plugin-mcloud.install'
--- debian/account-plugin-mcloud.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-mcloud.install	2016-06-16 11:50:26 +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
+

=== modified file 'debian/control'
--- debian/control	2016-06-14 09:05:51 +0000
+++ debian/control	2016-06-16 11:50:26 +0000
@@ -148,6 +148,14 @@
  This plugin adds support for creating Instagram accounts in the Unity Control
  Center
 
+Package: account-plugin-mcloud
+Architecture: all
+Depends: ${misc:Depends},
+         ubuntu-system-settings-online-accounts,
+Description: Online account plugin for Unity - mCloud
+ This plugin adds support for creating mCloud accounts in the Unity Control
+ Center
+
 Package: account-plugin-owncloud
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2016-04-08 12:09:22 +0000
+++ debian/rules	2016-06-16 11:50:26 +0000
@@ -22,6 +22,8 @@
 		--with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
 		--with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
 		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" \
+		--with-mcloud-client-id="APP1ZtqoN3R0002" \
+		--with-mcloud-client-secret="A70EFCDC91456349E7FDECF0A33574AC" \
 		--with-vk-client-id="5402699"
 
 override_dh_install:

=== modified file 'qml/Makefile.am'
--- qml/Makefile.am	2016-04-18 12:06:17 +0000
+++ qml/Makefile.am	2016-06-16 11:50:26 +0000
@@ -2,6 +2,7 @@
 	facebook/Main.qml \
 	flickr/Main.qml \
 	google/Main.qml \
+	mcloud/Main.qml \
 	owncloud/Main.qml \
 	owncloud/NewAccount.qml \
 	twitter/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-16 11:50:26 +0000
@@ -0,0 +1,6 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+    }
+}