Merge lp:~kobe24-lixiang/account-plugins/tencent into lp:account-plugins

[kobe]

Add authentication of Tencent using oAuth2.0 which is popular in China

[Alberto Mardegan (mardy)]

Hi Kobe! This looks good to me, just please change this minor thing: in the Makefile.am, when you add the data/webkit-options/open.t.qq.com.conf file, please add it later so that the files are sorted alphabetically.

review: Needs Fixing

[lp:~kobe24-lixiang/account-plugins/tencent]

124. By kobe on 2013-06-28

chage file's order so that the files are sorted alphabetically

Unmerged revisions

124. By kobe on 2013-06-28

chage file's order so that the files are sorted alphabetically

123. By kobe on 2013-06-27

Add authentication of Tencent using oAuth2.0 which is popular in China

=== modified file 'Makefile.am'
--- Makefile.am	2013-06-27 14:17:22 +0000
+++ Makefile.am	2013-06-28 00:45:34 +0000
@@ -68,6 +68,7 @@
 	data/providers/instagram.provider.in.in \
 	data/providers/sina.provider.in.in \
 	data/providers/sohu.provider.in.in \
+	data/providers/tencent.provider.in.in \
 	data/providers/twitter.provider.in.in \
 	data/providers/windows-live.provider.in.in
 
@@ -95,6 +96,7 @@
 	data/services/picasa.service.in \
 	data/services/sina-microblog.service.in \
 	data/services/sohu-microblog.service.in \
+	data/services/tencent-microblog.service.in \
 	data/services/twitter-microblog.service.in \
 	data/services/wlm.service.in
 
@@ -112,6 +114,7 @@
 	data/webkit-options/identi.ca.conf \
 	data/webkit-options/login.live.com.conf \
 	data/webkit-options/login.yahoo.com.conf \
+	data/webkit-options/open.t.qq.com.conf \
 	data/webkit-options/secure.flickr.com.conf \
 	data/webkit-options/www.facebook.com.conf \
 	data/webkit-options/www.linkedin.com.conf

=== modified file 'configure.ac'
--- configure.ac	2013-06-12 05:49:46 +0000
+++ configure.ac	2013-06-28 00:45:34 +0000
@@ -225,6 +225,20 @@
 AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
 AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
 
+# Set Tencent client id/secret
+AC_ARG_WITH(tencent-client-id,
+            [AS_HELP_STRING([--with-tencent-client-id],
+                            [Tencent client id])],
+                            [tencent_client_id=$withval],
+                            [tencent_client_id="801336640"])
+AC_ARG_WITH(tencent-client-secret,
+            [AS_HELP_STRING([--with-tencent-client-secret],
+                            [Tencent client secret])],
+                            [tencent_client_secret=$withval],
+                            [tencent_client_secret="f00f83cae40b5e65902f7776b052fd76"])
+AC_SUBST(TENCENT_CLIENT_ID, ["$tencent_client_id"])
+AC_SUBST(TENCENT_CLIENT_SECRET, ["$tencent_client_secret"])
+
 # Set Windows Live client id
 AC_ARG_WITH(windows-live-client-id,
             [AS_HELP_STRING([--with-windows-live-client-id],
@@ -243,6 +257,7 @@
 	data/providers/instagram.provider.in
 	data/providers/sina.provider.in
 	data/providers/sohu.provider.in
+	data/providers/tencent.provider.in
 	data/providers/twitter.provider.in
 	data/providers/windows-live.provider.in
 	Makefile

=== added file 'data/providers/tencent.provider.in.in'
--- data/providers/tencent.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/tencent.provider.in.in	2013-06-28 00:45:34 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="tencent">
+  <name>Tencent</name>
+  <icon>tencent</icon>
+  <translations>account-plugins</translations>
+  <domains>.*t\.qq\.com</domains>
+  <plugin>generic-oauth</plugin>
+
+  <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">open.t.qq.com</setting>
+          <setting name="AuthPath">/cgi-bin/oauth2/authorize</setting>
+          <setting name="TokenPath">/cgi-bin/oauth2/access_token</setting>
+          <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
+          <setting name="ResponseType">token</setting>
+          <setting type="as" name="Scope">['all']</setting>
+          <setting name="ClientId">@TENCENT_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@TENCENT_CLIENT_SECRET@</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== modified file 'data/services/Makefile.am'
--- data/services/Makefile.am	2013-06-27 14:17:22 +0000
+++ data/services/Makefile.am	2013-06-28 00:45:34 +0000
@@ -16,6 +16,7 @@
 	picasa.service.in \
 	sina-microblog.service.in \
 	sohu-microblog.service.in \
+	tencent-microblog.service.in \
 	twitter-microblog.service.in \
 	wlm.service.in
 

=== added file 'data/services/tencent-microblog.service.in'
--- data/services/tencent-microblog.service.in	1970-01-01 00:00:00 +0000
+++ data/services/tencent-microblog.service.in	2013-06-28 00:45:34 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="tencent-microblog">
+  <type>microblogging</type>
+  <name>Tencent</name>
+  <icon>tencent</icon>
+  <provider>tencent</provider>
+  <translations>account-plugins</translations>
+</service>

=== added file 'data/webkit-options/open.t.qq.com.conf'
--- data/webkit-options/open.t.qq.com.conf	1970-01-01 00:00:00 +0000
+++ data/webkit-options/open.t.qq.com.conf	2013-06-28 00:45:34 +0000
@@ -0,0 +1,4 @@
+ViewportWidth = 420
+ViewportHeight = 500
+UsernameField = input[name="userId"]
+PasswordField = input[name="passwd"]

=== added file 'debian/account-plugin-tencent.install'
--- debian/account-plugin-tencent.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-tencent.install	2013-06-28 00:45:34 +0000
@@ -0,0 +1,3 @@
+etc/signon-ui/webkit-options.d/open.t.qq.com.conf
+usr/share/accounts/services/tencent-microblog.service
+usr/share/accounts/providers/tencent.provider

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-27 04:31:04 +0000
+++ debian/changelog	2013-06-28 00:45:34 +0000
@@ -6,7 +6,10 @@
   [ Ubuntu daily release ]
   * Automatic snapshot from revision 121
 
- -- Ubuntu daily release <[e-mail]>  Thu, 27 Jun 2013 04:31:03 +0000
+  [ Kobe Lee ]
+  * Add authentication of Tencent using oAuth2.0 which is popular in China.
+
+ -- Kobe Lee (kylinkobe) <[e-mail]>  Thu, 27 Jun 2013 20:14:11 +0800
 
 account-plugins (0.11daily13.06.25-0ubuntu1) saucy; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-06-19 09:23:40 +0000
+++ debian/control	2013-06-28 00:45:34 +0000
@@ -98,6 +98,14 @@
 Description: GNOME Control Center account plugin for single signon - windows live
  GNOME Control Center account plugins for single signon
 
+Package: account-plugin-tencent
+Architecture: any
+Depends: ${misc:Depends},
+         account-plugin-generic-oauth,
+         unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
+Description: GNOME Control Center account plugin for single signon - tencent
+ GNOME Control Center account plugins for single signon
+
 Package: account-plugin-sohu
 Architecture: all
 Depends: ${misc:Depends},

=== modified file 'src/config.vapi'
--- src/config.vapi	2013-04-09 08:45:38 +0000
+++ src/config.vapi	2013-06-28 00:45:34 +0000
@@ -36,5 +36,7 @@
   public const string SINA_CONSUMER_SECRET;
   public const string SOHU_CLIENT_ID;
   public const string SOHU_CLIENT_SECRET;
+  public const string TENCENT_CONSUMER_KEY;
+  public const string TENCENT_CONSUMER_SECRET;
   public const string WINDOWS_LIVE_CLIENT_ID;
 }