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

Proposed by kobe on 2013-04-09
Status: Merged
Approved by: Alberto Mardegan on 2013-04-12
Approved revision: no longer in the source branch.
Merged at revision: 99
Proposed branch: lp:~kobe24-lixiang/account-plugins/account-plugins
Merge into: lp:account-plugins
Diff against target: 97 lines (+29/-25)
4 files modified
configure.ac (+13/-13)
data/providers/sohu.provider.in.in (+10/-9)
debian/changelog (+4/-1)
src/config.vapi (+2/-2)
To merge this branch: bzr merge lp:~kobe24-lixiang/account-plugins/account-plugins
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-04-12
Alberto Mardegan (community) 2013-04-09 Approve on 2013-04-12
Review via email: mp+157818@code.launchpad.net

Commit message

Authentication of Sohu using oAuth2.0.

Description of the change

Authentication of Sohu using oAuth2.0.

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

Hi Kobe, thank you very much for your contribution. We'd love to see it incorporate in to Ubuntu, but first I need to ask you to sign the contributor agreement. It's a straight forward process, and you can find full details here:

http://www.canonical.com/contributors

Please let me know once you've completed the form.

Thanks again.

kobe (kobe24-lixiang) wrote :

Hi,
I had signed the contributor agreement.
Regards,
Kobe Lee

At 2013-04-10 21:41:20,"Alberto Mardegan" <email address hidden> wrote:
>Hi Kobe, thank you very much for your contribution. We'd love to see it incorporate in to Ubuntu, but first I need to ask you to sign the contributor agreement. It's a straight forward process, and you can find full details here:
>
>http://www.canonical.com/contributors
>
>Please let me know once you've completed the form.
>
>Thanks again.
>--
>https://code.launchpad.net/~kobe24-lixiang/account-plugins/account-plugins/+merge/157818
>You are the owner of lp:~kobe24-lixiang/account-plugins/account-plugins.

Alberto Mardegan (mardy) wrote :

Thanks Kobe! I tested it and it works fine!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~kobe24-lixiang/account-plugins/account-plugins/+merge/157818/+edit-commit-message

review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)
99. By kobe on 2013-04-12

Authentication of Sohu using oAuth2.0. Fixes: https://bugs.launchpad.net/bugs/1166089.

Approved by PS Jenkins bot, Alberto Mardegan.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-03-21 08:24:18 +0000
3+++ configure.ac 2013-04-09 08:52:24 +0000
4@@ -172,19 +172,19 @@
5 AC_SUBST(SINA_CONSUMER_KEY, ["$sina_consumer_key"])
6 AC_SUBST(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"])
7
8-# Set Sohu consumer key/secret
9-AC_ARG_WITH(sohu-consumer-key,
10- [AS_HELP_STRING([--with-sohu-consumer-key],
11- [Sohu consumer key])],
12- [sohu_consumer_key=$withval],
13- [sohu_consumer_key="YcRgcVD31M241lWRJuU0"])
14-AC_ARG_WITH(sohu-consumer-secret,
15- [AS_HELP_STRING([--with-sohu-consumer-secret],
16- [Sohu consumer secret])],
17- [sohu_consumer_secret=$withval],
18- [sohu_consumer_secret="!2(z%LRmy7xTN(x3cm$)2m*domKNT(s00=qN4Vxh"])
19-AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
20-AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])
21+# Set Sohu client id/secret
22+AC_ARG_WITH(sohu-client-id,
23+ [AS_HELP_STRING([--with-sohu-client-id],
24+ [Sohu client id])],
25+ [sohu_client_id=$withval],
26+ [sohu_client_id="dXucVvzJseF3wFfeDBqE"])
27+AC_ARG_WITH(sohu-client-secret,
28+ [AS_HELP_STRING([--with-sohu-client-secret],
29+ [Sohu client secret])],
30+ [sohu_client_secret=$withval],
31+ [sohu_client_secret="XuOg9=djoUMA%BRRPO)X=(8FExQz8T$9DahIj=9u"])
32+AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
33+AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
34
35 # Set Windows Live client id
36 AC_ARG_WITH(windows-live-client-id,
37
38=== modified file 'data/providers/sohu.provider.in.in'
39--- data/providers/sohu.provider.in.in 2013-02-25 06:25:34 +0000
40+++ data/providers/sohu.provider.in.in 2013-04-09 08:52:24 +0000
41@@ -9,16 +9,17 @@
42 <template>
43 <group name="auth">
44 <setting name="method">oauth2</setting>
45- <setting name="mechanism">HMAC-SHA1</setting>
46+ <setting name="mechanism">user_agent</setting>
47 <group name="oauth2">
48- <group name="HMAC-SHA1">
49- <setting name="RequestEndpoint">http://api.t.sohu.com/oauth/request_token</setting>
50- <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
51- <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
52- <setting name="Callback">https://wiki.ubuntu.com/</setting>
53- <setting name="ConsumerKey">@SOHU_CONSUMER_KEY@</setting>
54- <setting name="ConsumerSecret">@SOHU_CONSUMER_SECRET@</setting>
55- <setting name="AllowedSchemes" type="as">['https','http']</setting>
56+ <group name="user_agent">
57+ <setting name="Host">api.t.sohu.com</setting>
58+ <setting name="AuthPath">/oauth2/authorize</setting>
59+ <setting name="TokenPath">/oauth2/access_token</setting>
60+ <setting name="RedirectUri">http://www.ubuntukylin.com/</setting>
61+ <setting name="ResponseType">token</setting>
62+ <setting type="as" name="Scope">['basic']</setting>
63+ <setting name="ClientId">@SOHU_CLIENT_ID@</setting>
64+ <setting name="ClientSecret">@SOHU_CLIENT_SECRET@</setting>
65 </group>
66 </group>
67 </group>
68
69=== modified file 'debian/changelog'
70--- debian/changelog 2013-03-20 15:24:49 +0000
71+++ debian/changelog 2013-04-09 08:52:24 +0000
72@@ -3,7 +3,10 @@
73 [ Jonathan Davies ]
74 * Added account-plugin-linkedin.
75
76- -- Jonathan Davies <jpds@ubuntu.com> Wed, 20 Mar 2013 10:17:55 +0000
77+ [ Kobe Lee ]
78+ * authentication of Sohu using oAuth2.0 (LP: #1166089).
79+
80+ -- Kobe Lee (kylinkobe) <kobe24_lixiang@126.com> Tue, 09 Apr 2013 16:18:53 +0800
81
82 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
83
84
85=== modified file 'src/config.vapi'
86--- src/config.vapi 2012-11-12 11:24:22 +0000
87+++ src/config.vapi 2013-04-09 08:52:24 +0000
88@@ -34,7 +34,7 @@
89 public const string IDENTICA_CONSUMER_SECRET;
90 public const string SINA_CONSUMER_KEY;
91 public const string SINA_CONSUMER_SECRET;
92- public const string SOHU_CONSUMER_KEY;
93- public const string SOHU_CONSUMER_SECRET;
94+ public const string SOHU_CLIENT_ID;
95+ public const string SOHU_CLIENT_SECRET;
96 public const string WINDOWS_LIVE_CLIENT_ID;
97 }

Subscribers

People subscribed via source and target branches

to all changes: