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

Proposed by kobe on 2013-06-08
Status: Needs review
Proposed branch: lp:~kobe24-lixiang/account-plugins/13.04
Merge into: lp:account-plugins/13.04
Diff against target: 181 lines (+75/-1)
10 files modified
Makefile.am (+3/-0)
configure.ac (+15/-0)
data/providers/tencent.provider.in.in (+27/-0)
data/services/Makefile.am (+1/-0)
data/services/tencent-microblog.service.in (+8/-0)
data/webkit-options/open.t.qq.com.conf (+4/-0)
debian/account-plugin-tencent.install (+3/-0)
debian/changelog (+4/-1)
debian/control (+8/-0)
src/config.vapi (+2/-0)
To merge this branch: bzr merge lp:~kobe24-lixiang/account-plugins/13.04
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Needs Fixing on 2013-06-10
Ken VanDine 2013-06-08 Disapprove on 2013-06-08
Review via email: mp+168220@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Ken VanDine (ken-vandine) wrote :

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) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
62 data/providers/identica.provider.in.in \62 data/providers/identica.provider.in.in \
63 data/providers/sina.provider.in.in \63 data/providers/sina.provider.in.in \
64 data/providers/sohu.provider.in.in \64 data/providers/sohu.provider.in.in \
65 data/providers/tencent.provider.in.in \
65 data/providers/twitter.provider.in.in \66 data/providers/twitter.provider.in.in \
66 data/providers/windows-live.provider.in.in67 data/providers/windows-live.provider.in.in
6768
@@ -86,6 +87,7 @@
86 data/services/picasa.service.in \87 data/services/picasa.service.in \
87 data/services/sina-microblog.service.in \88 data/services/sina-microblog.service.in \
88 data/services/sohu-microblog.service.in \89 data/services/sohu-microblog.service.in \
90 data/services/tencent-microblog.service.in \
89 data/services/twitter-microblog.service.in \91 data/services/twitter-microblog.service.in \
90 data/services/wlm.service.in92 data/services/wlm.service.in
9193
@@ -97,6 +99,7 @@
97 data/webkit-options/accounts.google.com.conf \99 data/webkit-options/accounts.google.com.conf \
98 data/webkit-options/api.t.sina.com.cn.conf \100 data/webkit-options/api.t.sina.com.cn.conf \
99 data/webkit-options/api.t.sohu.com.conf \101 data/webkit-options/api.t.sohu.com.conf \
102 data/webkit-options/open.t.qq.com.conf \
100 data/webkit-options/api.twitter.com.conf \103 data/webkit-options/api.twitter.com.conf \
101 data/webkit-options/foursquare.com.conf \104 data/webkit-options/foursquare.com.conf \
102 data/webkit-options/identi.ca.conf \105 data/webkit-options/identi.ca.conf \
103106
=== 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 @@
172AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])172AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
173AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])173AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])
174174
175# Set Tencent client id/secret
176AC_ARG_WITH(tencent-client-id,
177 [AS_HELP_STRING([--with-tencent-client-id],
178 [Tencent client id])],
179 [tencent_client_id=$withval],
180 [tencent_client_id="801336640"])
181AC_ARG_WITH(tencent-client-secret,
182 [AS_HELP_STRING([--with-tencent-client-secret],
183 [Tencent client secret])],
184 [tencent_client_secret=$withval],
185 [tencent_client_secret="f00f83cae40b5e65902f7776b052fd76"])
186AC_SUBST(TENCENT_CLIENT_ID, ["$tencent_client_id"])
187AC_SUBST(TENCENT_CLIENT_SECRET, ["$tencent_client_secret"])
188
175# Set Windows Live client id189# Set Windows Live client id
176AC_ARG_WITH(windows-live-client-id,190AC_ARG_WITH(windows-live-client-id,
177 [AS_HELP_STRING([--with-windows-live-client-id],191 [AS_HELP_STRING([--with-windows-live-client-id],
@@ -188,6 +202,7 @@
188 data/providers/identica.provider.in202 data/providers/identica.provider.in
189 data/providers/sina.provider.in203 data/providers/sina.provider.in
190 data/providers/sohu.provider.in204 data/providers/sohu.provider.in
205 data/providers/tencent.provider.in
191 data/providers/twitter.provider.in206 data/providers/twitter.provider.in
192 data/providers/windows-live.provider.in207 data/providers/windows-live.provider.in
193 Makefile208 Makefile
194209
=== 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 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<provider id="tencent">
3 <name>Tencent</name>
4 <icon>tencent</icon>
5 <translations>account-plugins</translations>
6 <domains>.*t\.qq\.com</domains>
7 <plugin>generic-oauth</plugin>
8
9 <template>
10 <group name="auth">
11 <setting name="method">oauth2</setting>
12 <setting name="mechanism">user_agent</setting>
13 <group name="oauth2">
14 <group name="user_agent">
15 <setting name="Host">open.t.qq.com</setting>
16 <setting name="AuthPath">/cgi-bin/oauth2/authorize</setting>
17 <setting name="TokenPath">/cgi-bin/oauth2/access_token</setting>
18 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
19 <setting name="ResponseType">token</setting>
20 <setting type="as" name="Scope">['all']</setting>
21 <setting name="ClientId">@TENCENT_CLIENT_ID@</setting>
22 <setting name="ClientSecret">@TENCENT_CLIENT_SECRET@</setting>
23 </group>
24 </group>
25 </group>
26 </template>
27</provider>
028
=== 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 @@
15 picasa.service.in \15 picasa.service.in \
16 sina-microblog.service.in \16 sina-microblog.service.in \
17 sohu-microblog.service.in \17 sohu-microblog.service.in \
18 tencent-microblog.service.in \
18 twitter-microblog.service.in \19 twitter-microblog.service.in \
19 wlm.service.in20 wlm.service.in
2021
2122
=== 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 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="tencent-microblog">
3 <type>microblogging</type>
4 <name>Tencent</name>
5 <icon>tencent</icon>
6 <provider>tencent</provider>
7 <translations>account-plugins</translations>
8</service>
09
=== 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 @@
1ViewportWidth = 420
2ViewportHeight = 500
3UsernameField = input[name="userId"]
4PasswordField = input[name="passwd"]
05
=== 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 @@
1etc/signon-ui/webkit-options.d/open.t.qq.com.conf
2usr/share/accounts/services/tencent-microblog.service
3usr/share/accounts/providers/tencent.provider
04
=== 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 @@
3 * New upstream snapshot3 * New upstream snapshot
4 - Fix Foursquare authentication (LP: #1159795)4 - Fix Foursquare authentication (LP: #1159795)
55
6 -- Alberto Mardegan <alberto.mardegan@canonical.com> Tue, 26 Mar 2013 15:32:44 +02006 [ Kobe Lee ]
7 * Add authentication of Tencent using oAuth2.0 which is popular in China.
8
9 -- Kobe Lee (kylinkobe) <kobe24_lixiang@126.com> Sat, 08 Jun 2013 09:32:42 +0800
710
8account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low11account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
912
1013
=== 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 @@
85Description: GNOME Control Center account plugin for single signon - windows live85Description: GNOME Control Center account plugin for single signon - windows live
86 GNOME Control Center account plugins for single signon86 GNOME Control Center account plugins for single signon
8787
88Package: account-plugin-tencent
89Architecture: any
90Depends: ${misc:Depends},
91 account-plugin-generic-oauth,
92 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
93Description: GNOME Control Center account plugin for single signon - tencent
94 GNOME Control Center account plugins for single signon
95
88Package: account-plugin-sohu96Package: account-plugin-sohu
89Architecture: any97Architecture: any
90Depends: ${misc:Depends},98Depends: ${misc:Depends},
9199
=== 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 @@
36 public const string SINA_CONSUMER_SECRET;36 public const string SINA_CONSUMER_SECRET;
37 public const string SOHU_CONSUMER_KEY;37 public const string SOHU_CONSUMER_KEY;
38 public const string SOHU_CONSUMER_SECRET;38 public const string SOHU_CONSUMER_SECRET;
39 public const string TENCENT_CONSUMER_KEY;
40 public const string TENCENT_CONSUMER_SECRET;
39 public const string WINDOWS_LIVE_CLIENT_ID;41 public const string WINDOWS_LIVE_CLIENT_ID;
40}42}

Subscribers

People subscribed via source and target branches

to all changes: