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

[kobe]

Tencent-Microblog is very popular like Sina-Microblog in China. I had completed the authentication using oAuth2.0.
Then I'm going to do this work about friends-tencent like friends-sina and friends-sohu.

[Ken VanDine (ken-vandine)]

Great to see tencent support, but the 13.04 is a maintenance branch, bug fixes only. New features should be targeted to trunk. Please resubmit the proposal against lp:account-plugins

Thanks

review: Disapprove

[kobe (kobe24-lixiang)]

At first, I add code to trunk, but it depends on libaccounts-glib. In the source list, I can't get the package with the requested version.
So I get the libaccounts-glib code from launchpad to build package. There is still a problem about the build-depends requestment "automake (>=1:1.13)". Maybe there is other problem in my progress.
My system is UbuntuKylin 13.04, and I can't solve the question. So I had to use libaccounts-glib-13.04 and account-plugins-13.04.Then, there is no any problem.
I need your help to tell me what I shoud do if i use the trunk code.
Regards,
Kobe Lee.

At 2013-06-08 11:57:27,"Ken VanDine" <email address hidden> wrote:
>Review: Disapproveroatures should be targeted to trunk. Please resubmit the proposal against lp:account-plugins
>
>Thanks
>--
>https://code.launchpad.net/~kobe24-lixiang/account-plugins/13.04/+merge/168220
>You are the owner of lp:~kobe24-lixiang/account-plugins/13.04.

[Alberto Mardegan (mardy)]

Thanks Kobe for this plugin! Please, first check the indentation: in the Makefile.am files and in configure.ac, we use tabs, not spaces (you'll notice that in the diff below your lines are not correctly aligned with the others).

About targeting "trunk", you need to upgrade your system to use "saucy"; you can do this by replacing the lines in your /etc/apt/sources.list file from "raring" to "saucy". However, be warned that "saucy" is a development release and, as such, might be less stable than 13.04.
If you don't want to upgrade, feel free to continue using 13.04, but please set the target branch for this merge proposal to be "trunk". Even if you cannot build it: I'll try your patch and see if it builds and works (I think it will, because so far there are no changes in how the account plugins work from "raring" to "saucy").

review: Needs Fixing

Unmerged revisions

98. By kobe on 2013-06-08

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

=== modified file 'Makefile.am'
--- Makefile.am	2013-03-19 14:47:46 +0000
+++ Makefile.am	2013-06-08 02:54:28 +0000
@@ -62,6 +62,7 @@
 	data/providers/identica.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
 
@@ -86,6 +87,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
 
@@ -97,6 +99,7 @@
 	data/webkit-options/accounts.google.com.conf \
 	data/webkit-options/api.t.sina.com.cn.conf \
 	data/webkit-options/api.t.sohu.com.conf \
+    data/webkit-options/open.t.qq.com.conf \
 	data/webkit-options/api.twitter.com.conf \
 	data/webkit-options/foursquare.com.conf \
 	data/webkit-options/identi.ca.conf \

=== modified file 'configure.ac'
--- configure.ac	2013-03-26 13:34:19 +0000
+++ configure.ac	2013-06-08 02:54:28 +0000
@@ -172,6 +172,20 @@
 AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
 AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_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],
@@ -188,6 +202,7 @@
 	data/providers/identica.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-08 02:54:28 +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	2012-10-04 14:18:34 +0000
+++ data/services/Makefile.am	2013-06-08 02:54:28 +0000
@@ -15,6 +15,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-08 02:54:28 +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-08 02:54:28 +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-08 02:54:28 +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-03-26 13:34:19 +0000
+++ debian/changelog	2013-06-08 02:54:28 +0000
@@ -3,7 +3,10 @@
   * New upstream snapshot
     - Fix Foursquare authentication (LP: #1159795)
 
- -- Alberto Mardegan <[e-mail]>  Tue, 26 Mar 2013 15:32:44 +0200
+  [ Kobe Lee ]
+  * Add authentication of Tencent using oAuth2.0 which is popular in China.
+
+ --  Kobe Lee (kylinkobe) <[e-mail]>  Sat, 08 Jun 2013 09:32:42 +0800
 
 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-03-19 18:41:45 +0000
+++ debian/control	2013-06-08 02:54:28 +0000
@@ -85,6 +85,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: any
 Depends: ${misc:Depends},

=== modified file 'src/config.vapi'
--- src/config.vapi	2012-11-12 11:24:22 +0000
+++ src/config.vapi	2013-06-08 02:54:28 +0000
@@ -36,5 +36,7 @@
   public const string SINA_CONSUMER_SECRET;
   public const string SOHU_CONSUMER_KEY;
   public const string SOHU_CONSUMER_SECRET;
+  public const string TENCENT_CONSUMER_KEY;
+  public const string TENCENT_CONSUMER_SECRET;
   public const string WINDOWS_LIVE_CLIENT_ID;
 }