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

Proposed by kobe on 2013-06-27
Status: Needs review
Proposed branch: lp:~kobe24-lixiang/account-plugins/tencent
Merge into: lp:account-plugins
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/tencent
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2013-06-27 Needs Fixing on 2013-06-27
Review via email: mp+171794@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

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
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
68 data/providers/instagram.provider.in.in \68 data/providers/instagram.provider.in.in \
69 data/providers/sina.provider.in.in \69 data/providers/sina.provider.in.in \
70 data/providers/sohu.provider.in.in \70 data/providers/sohu.provider.in.in \
71 data/providers/tencent.provider.in.in \
71 data/providers/twitter.provider.in.in \72 data/providers/twitter.provider.in.in \
72 data/providers/windows-live.provider.in.in73 data/providers/windows-live.provider.in.in
7374
@@ -95,6 +96,7 @@
95 data/services/picasa.service.in \96 data/services/picasa.service.in \
96 data/services/sina-microblog.service.in \97 data/services/sina-microblog.service.in \
97 data/services/sohu-microblog.service.in \98 data/services/sohu-microblog.service.in \
99 data/services/tencent-microblog.service.in \
98 data/services/twitter-microblog.service.in \100 data/services/twitter-microblog.service.in \
99 data/services/wlm.service.in101 data/services/wlm.service.in
100102
@@ -112,6 +114,7 @@
112 data/webkit-options/identi.ca.conf \114 data/webkit-options/identi.ca.conf \
113 data/webkit-options/login.live.com.conf \115 data/webkit-options/login.live.com.conf \
114 data/webkit-options/login.yahoo.com.conf \116 data/webkit-options/login.yahoo.com.conf \
117 data/webkit-options/open.t.qq.com.conf \
115 data/webkit-options/secure.flickr.com.conf \118 data/webkit-options/secure.flickr.com.conf \
116 data/webkit-options/www.facebook.com.conf \119 data/webkit-options/www.facebook.com.conf \
117 data/webkit-options/www.linkedin.com.conf120 data/webkit-options/www.linkedin.com.conf
118121
=== 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 @@
225AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])225AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
226AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])226AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
227227
228# Set Tencent client id/secret
229AC_ARG_WITH(tencent-client-id,
230 [AS_HELP_STRING([--with-tencent-client-id],
231 [Tencent client id])],
232 [tencent_client_id=$withval],
233 [tencent_client_id="801336640"])
234AC_ARG_WITH(tencent-client-secret,
235 [AS_HELP_STRING([--with-tencent-client-secret],
236 [Tencent client secret])],
237 [tencent_client_secret=$withval],
238 [tencent_client_secret="f00f83cae40b5e65902f7776b052fd76"])
239AC_SUBST(TENCENT_CLIENT_ID, ["$tencent_client_id"])
240AC_SUBST(TENCENT_CLIENT_SECRET, ["$tencent_client_secret"])
241
228# Set Windows Live client id242# Set Windows Live client id
229AC_ARG_WITH(windows-live-client-id,243AC_ARG_WITH(windows-live-client-id,
230 [AS_HELP_STRING([--with-windows-live-client-id],244 [AS_HELP_STRING([--with-windows-live-client-id],
@@ -243,6 +257,7 @@
243 data/providers/instagram.provider.in257 data/providers/instagram.provider.in
244 data/providers/sina.provider.in258 data/providers/sina.provider.in
245 data/providers/sohu.provider.in259 data/providers/sohu.provider.in
260 data/providers/tencent.provider.in
246 data/providers/twitter.provider.in261 data/providers/twitter.provider.in
247 data/providers/windows-live.provider.in262 data/providers/windows-live.provider.in
248 Makefile263 Makefile
249264
=== 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 @@
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 2013-06-27 14:17:22 +0000
+++ data/services/Makefile.am 2013-06-28 00:45:34 +0000
@@ -16,6 +16,7 @@
16 picasa.service.in \16 picasa.service.in \
17 sina-microblog.service.in \17 sina-microblog.service.in \
18 sohu-microblog.service.in \18 sohu-microblog.service.in \
19 tencent-microblog.service.in \
19 twitter-microblog.service.in \20 twitter-microblog.service.in \
20 wlm.service.in21 wlm.service.in
2122
2223
=== 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 @@
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-28 00:45:34 +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-28 00:45:34 +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-06-27 04:31:04 +0000
+++ debian/changelog 2013-06-28 00:45:34 +0000
@@ -6,7 +6,10 @@
6 [ Ubuntu daily release ]6 [ Ubuntu daily release ]
7 * Automatic snapshot from revision 1217 * Automatic snapshot from revision 121
88
9 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 27 Jun 2013 04:31:03 +00009 [ Kobe Lee ]
10 * Add authentication of Tencent using oAuth2.0 which is popular in China.
11
12 -- Kobe Lee (kylinkobe) <kobe24_lixiang@126.com> Thu, 27 Jun 2013 20:14:11 +0800
1013
11account-plugins (0.11daily13.06.25-0ubuntu1) saucy; urgency=low14account-plugins (0.11daily13.06.25-0ubuntu1) saucy; urgency=low
1215
1316
=== 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 @@
98Description: GNOME Control Center account plugin for single signon - windows live98Description: GNOME Control Center account plugin for single signon - windows live
99 GNOME Control Center account plugins for single signon99 GNOME Control Center account plugins for single signon
100100
101Package: account-plugin-tencent
102Architecture: any
103Depends: ${misc:Depends},
104 account-plugin-generic-oauth,
105 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1),
106Description: GNOME Control Center account plugin for single signon - tencent
107 GNOME Control Center account plugins for single signon
108
101Package: account-plugin-sohu109Package: account-plugin-sohu
102Architecture: all110Architecture: all
103Depends: ${misc:Depends},111Depends: ${misc:Depends},
104112
=== 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 @@
36 public const string SINA_CONSUMER_SECRET;36 public const string SINA_CONSUMER_SECRET;
37 public const string SOHU_CLIENT_ID;37 public const string SOHU_CLIENT_ID;
38 public const string SOHU_CLIENT_SECRET;38 public const string SOHU_CLIENT_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: