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

[kobe]

Authentication of Sohu using oAuth2.0.

Authentication of Sohu using oAuth2.0.

[Alberto Mardegan (mardy)]

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

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

Thanks Kobe! I tested it and it works fine!

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

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

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.

=== modified file 'configure.ac'
--- configure.ac	2013-03-21 08:24:18 +0000
+++ configure.ac	2013-04-09 08:52:24 +0000
@@ -172,19 +172,19 @@
 AC_SUBST(SINA_CONSUMER_KEY, ["$sina_consumer_key"])
 AC_SUBST(SINA_CONSUMER_SECRET, ["$sina_consumer_secret"])
 
-# Set Sohu consumer key/secret
-AC_ARG_WITH(sohu-consumer-key,
-            [AS_HELP_STRING([--with-sohu-consumer-key],
-                            [Sohu consumer key])],
-                            [sohu_consumer_key=$withval],
-                            [sohu_consumer_key="YcRgcVD31M241lWRJuU0"])
-AC_ARG_WITH(sohu-consumer-secret,
-            [AS_HELP_STRING([--with-sohu-consumer-secret],
-                            [Sohu consumer secret])],
-                            [sohu_consumer_secret=$withval],
-                            [sohu_consumer_secret="!2(z%LRmy7xTN(x3cm$)2m*domKNT(s00=qN4Vxh"])
-AC_SUBST(SOHU_CONSUMER_KEY, ["$sohu_consumer_key"])
-AC_SUBST(SOHU_CONSUMER_SECRET, ["$sohu_consumer_secret"])
+# Set Sohu client id/secret
+AC_ARG_WITH(sohu-client-id,
+            [AS_HELP_STRING([--with-sohu-client-id],
+                            [Sohu client id])],
+                            [sohu_client_id=$withval],
+                            [sohu_client_id="dXucVvzJseF3wFfeDBqE"])
+AC_ARG_WITH(sohu-client-secret,
+            [AS_HELP_STRING([--with-sohu-client-secret],
+                            [Sohu client secret])],
+                            [sohu_client_secret=$withval],
+                            [sohu_client_secret="XuOg9=djoUMA%BRRPO)X=(8FExQz8T$9DahIj=9u"])
+AC_SUBST(SOHU_CLIENT_ID, ["$sohu_client_id"])
+AC_SUBST(SOHU_CLIENT_SECRET, ["$sohu_client_secret"])
 
 # Set Windows Live client id
 AC_ARG_WITH(windows-live-client-id,
 
=== modified file 'data/providers/sohu.provider.in.in'
--- data/providers/sohu.provider.in.in	2013-02-25 06:25:34 +0000
+++ data/providers/sohu.provider.in.in	2013-04-09 08:52:24 +0000
@@ -9,16 +9,17 @@
   <template>
     <group name="auth">
       <setting name="method">oauth2</setting>
-      <setting name="mechanism">HMAC-SHA1</setting>
+      <setting name="mechanism">user_agent</setting>
       <group name="oauth2">
-        <group name="HMAC-SHA1">
-          <setting name="RequestEndpoint">http://api.t.sohu.com/oauth/request_token</setting>
-          <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
-          <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
-          <setting name="Callback">https://wiki.ubuntu.com/</setting>
-          <setting name="ConsumerKey">@SOHU_CONSUMER_KEY@</setting>
-          <setting name="ConsumerSecret">@SOHU_CONSUMER_SECRET@</setting>
-          <setting name="AllowedSchemes" type="as">['https','http']</setting>
+        <group name="user_agent">
+          <setting name="Host">api.t.sohu.com</setting>
+          <setting name="AuthPath">/oauth2/authorize</setting>
+          <setting name="TokenPath">/oauth2/access_token</setting>
+          <setting name="RedirectUri">http://www.ubuntukylin.com/</setting>
+          <setting name="ResponseType">token</setting>
+          <setting type="as" name="Scope">['basic']</setting>
+          <setting name="ClientId">@SOHU_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@SOHU_CLIENT_SECRET@</setting>
         </group>
       </group>
     </group>
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-20 15:24:49 +0000
+++ debian/changelog	2013-04-09 08:52:24 +0000
@@ -3,7 +3,10 @@
   [ Jonathan Davies ]
   * Added account-plugin-linkedin.
 
- -- Jonathan Davies <[e-mail]>  Wed, 20 Mar 2013 10:17:55 +0000
+  [ Kobe Lee ]
+  * authentication of Sohu using oAuth2.0 (LP: #1166089).
+
+ -- Kobe Lee (kylinkobe) <[e-mail]>  Tue, 09 Apr 2013 16:18:53 +0800
 
 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
 
 
=== modified file 'src/config.vapi'
--- src/config.vapi	2012-11-12 11:24:22 +0000
+++ src/config.vapi	2013-04-09 08:52:24 +0000
@@ -34,7 +34,7 @@
   public const string IDENTICA_CONSUMER_SECRET;
   public const string SINA_CONSUMER_KEY;
   public const string SINA_CONSUMER_SECRET;
-  public const string SOHU_CONSUMER_KEY;
-  public const string SOHU_CONSUMER_SECRET;
+  public const string SOHU_CLIENT_ID;
+  public const string SOHU_CLIENT_SECRET;
   public const string WINDOWS_LIVE_CLIENT_ID;
 }