Merge lp:~mardy/account-plugins/no-hardcoded-data into lp:account-plugins

Proposed by Alberto Mardegan on 2013-02-16
Status: Merged
Approved by: Alberto Mardegan on 2013-03-19
Approved revision: 95
Merged at revision: 92
Proposed branch: lp:~mardy/account-plugins/no-hardcoded-data
Merge into: lp:account-plugins
Diff against target: 483 lines (+151/-109)
20 files modified
configure.ac (+1/-1)
data/providers/facebook.provider.in (+16/-0)
data/providers/flickr.provider.in (+16/-0)
data/providers/foursquare.provider.in (+16/-0)
data/providers/google.provider.in (+20/-0)
data/providers/identica.provider.in (+17/-0)
data/providers/sina.provider.in (+16/-0)
data/providers/sohu.provider.in (+16/-0)
data/providers/twitter.provider.in (+15/-0)
data/providers/windows-live.provider.in (+17/-0)
debian/control (+1/-1)
src/facebook.vala (+0/-14)
src/flickr.vala (+0/-13)
src/foursquare.vala (+0/-5)
src/google.vala (+0/-24)
src/identica.vala (+0/-9)
src/sina.vala (+0/-12)
src/sohu.vala (+0/-12)
src/twitter.vala (+0/-7)
src/windows-live.vala (+0/-11)
To merge this branch: bzr merge lp:~mardy/account-plugins/no-hardcoded-data
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-03-19
David King (community) 2013-02-16 Approve on 2013-02-18
Review via email: mp+148856@code.launchpad.net

Commit message

Move most of the authentication settings to the .provider files.

Description of the change

Move most of the authentication settings to the .provider files.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:92
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mardy/account-plugins/no-hardcoded-data/+merge/148856/+edit-commit-message

http://s-jenkins:8080/job/account-plugins-ci/21/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/21/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/21/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/21//rebuild/?

review: Needs Fixing (continuous-integration)
David King (amigadave) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2012-12-06 08:05:41 +0000
+++ configure.ac 2013-03-14 13:07:24 +0000
@@ -37,7 +37,7 @@
37 [have_libaccount_plugin=no])37 [have_libaccount_plugin=no])
3838
39AS_IF([test "x$have_libaccount_plugin" = "xyes"],39AS_IF([test "x$have_libaccount_plugin" = "xyes"],
40 [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin])],40 [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin >= 0.1.3])],
41 [AS_IF([test "x$enable_libaccount_plugin" = "xyes"],41 [AS_IF([test "x$enable_libaccount_plugin" = "xyes"],
42 [AC_MSG_ERROR([libaccount-plugin support enabled but required dependencies were not found])])])42 [AC_MSG_ERROR([libaccount-plugin support enabled but required dependencies were not found])])])
4343
4444
=== modified file 'data/providers/facebook.provider.in'
--- data/providers/facebook.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/facebook.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,20 @@
4 <icon>facebook</icon>4 <icon>facebook</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*facebook\.com</domains>6 <domains>.*facebook\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">user_agent</setting>
12 <group name="oauth2">
13 <group name="user_agent">
14 <setting name="Host">www.facebook.com</setting>
15 <setting name="AuthPath">/dialog/oauth</setting>
16 <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
17 <setting name="Display">popup</setting>
18 <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
19 </group>
20 </group>
21 </group>
22 </template>
7</provider>23</provider>
824
=== modified file 'data/providers/flickr.provider.in'
--- data/providers/flickr.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/flickr.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,20 @@
4 <icon>flickr</icon>4 <icon>flickr</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*flickr\.com</domains>6 <domains>.*flickr\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">HMAC-SHA1</setting>
12 <group name="oauth2">
13 <group name="HMAC-SHA1">
14 <setting name="RequestEndpoint">https://secure.flickr.com/services/oauth/request_token</setting>
15 <setting name="TokenEndpoint">https://secure.flickr.com/services/oauth/access_token</setting>
16 <setting name="AuthorizationEndpoint">https://secure.flickr.com/services/oauth/authorize</setting>
17 <setting name="Callback">https://wiki.ubuntu.com/</setting>
18 <setting name="AllowedSchemes" type="as">['https','http']</setting>
19 </group>
20 </group>
21 </group>
22 </template>
7</provider>23</provider>
824
=== modified file 'data/providers/foursquare.provider.in'
--- data/providers/foursquare.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/foursquare.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,20 @@
4 <icon>foursquare</icon>4 <icon>foursquare</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*foursquare\.com</domains>6 <domains>.*foursquare\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">user_agent</setting>
12 <group name="oauth2">
13 <group name="user_agent">
14 <setting name="Host">foursquare.com</setting>
15 <setting name="AuthPath">/oauth2/authenticate</setting>
16 <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting>
17 <setting name="Display">touch</setting>
18 <setting name="ResponseType">token</setting>
19 </group>
20 </group>
21 </group>
22 </template>
7</provider>23</provider>
824
=== modified file 'data/providers/google.provider.in'
--- data/providers/google.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/google.provider.in 2013-03-14 13:07:24 +0000
@@ -5,4 +5,24 @@
5 <icon>google</icon>5 <icon>google</icon>
6 <translations>account-plugins</translations>6 <translations>account-plugins</translations>
7 <domains>.*google\.com</domains>7 <domains>.*google\.com</domains>
8
9 <template>
10 <group name="auth">
11 <setting name="method">oauth2</setting>
12 <setting name="mechanism">web_server</setting>
13 <group name="oauth2">
14 <group name="web_server">
15 <setting name="Host">accounts.google.com</setting>
16 <setting name="AuthPath">o/oauth2/auth</setting>
17 <setting name="TokenPath">o/oauth2/token</setting>
18 <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
19 <!-- HACK: access_type is non standard, but Google requires it in
20 order to return a refresh token -->
21 <setting name="ResponseType">code&amp;access_type=offline</setting>
22 <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/']</setting>
23 <setting name="AllowedSchemes" type="as">['https','http']</setting>
24 </group>
25 </group>
26 </group>
27 </template>
8</provider>28</provider>
929
=== modified file 'data/providers/identica.provider.in'
--- data/providers/identica.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/identica.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,21 @@
4 <icon>identica</icon>4 <icon>identica</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*identi\.ca</domains>6 <domains>.*identi\.ca</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">HMAC-SHA1</setting>
12 <group name="oauth2">
13 <group name="HMAC-SHA1">
14 <setting name="RequestEndpoint">https://identi.ca/api/oauth/request_token</setting>
15 <setting name="TokenEndpoint">https://identi.ca/api/oauth/access_token</setting>
16 <setting name="AuthorizationEndpoint">https://identi.ca/api/oauth/authorize</setting>
17 <setting name="Callback">https://wiki.ubuntu.com/</setting>
18 <setting name="Source">Ubuntu</setting>
19 <setting name="Mode">desktop</setting>
20 </group>
21 </group>
22 </group>
23 </template>
7</provider>24</provider>
825
=== modified file 'data/providers/sina.provider.in'
--- data/providers/sina.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/sina.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,20 @@
4 <icon>sina</icon>4 <icon>sina</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*t\.sina\.com\.cn</domains>6 <domains>.*t\.sina\.com\.cn</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">HMAC-SHA1</setting>
12 <group name="oauth2">
13 <group name="HMAC-SHA1">
14 <setting name="RequestEndpoint">http://api.t.sina.com.cn/oauth/request_token</setting>
15 <setting name="TokenEndpoint">http://api.t.sina.com.cn/oauth/access_token</setting>
16 <setting name="AuthorizationEndpoint">http://api.t.sina.com.cn/oauth/authorize</setting>
17 <setting name="Callback">http://wiki.ubuntu.com/</setting>
18 <setting name="AllowedSchemes" type="as">['https','http']</setting>
19 </group>
20 </group>
21 </group>
22 </template>
7</provider>23</provider>
824
=== modified file 'data/providers/sohu.provider.in'
--- data/providers/sohu.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/sohu.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,20 @@
4 <icon>sohu</icon>4 <icon>sohu</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*t\.sohu\.com</domains>6 <domains>.*t\.sohu\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">HMAC-SHA1</setting>
12 <group name="oauth2">
13 <group name="HMAC-SHA1">
14 <setting name="RequestEndpoint">http://api.t.sohu.com/oauth/request_token</setting>
15 <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
16 <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
17 <setting name="Callback">https://wiki.ubuntu.com/</setting>
18 <setting name="AllowedSchemes" type="as">['https','http']</setting>
19 </group>
20 </group>
21 </group>
22 </template>
7</provider>23</provider>
824
=== modified file 'data/providers/twitter.provider.in'
--- data/providers/twitter.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/twitter.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,19 @@
4 <icon>twitter</icon>4 <icon>twitter</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*twitter\.com</domains>6 <domains>.*twitter\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">HMAC-SHA1</setting>
12 <group name="oauth2">
13 <group name="HMAC-SHA1">
14 <setting name="RequestEndpoint">https://api.twitter.com/oauth/request_token</setting>
15 <setting name="TokenEndpoint">https://api.twitter.com/oauth/access_token</setting>
16 <setting name="AuthorizationEndpoint">https://api.twitter.com/oauth/authorize</setting>
17 <setting name="Callback">https://wiki.ubuntu.com/</setting>
18 </group>
19 </group>
20 </group>
21 </template>
7</provider>22</provider>
823
=== modified file 'data/providers/windows-live.provider.in'
--- data/providers/windows-live.provider.in 2012-10-04 14:18:34 +0000
+++ data/providers/windows-live.provider.in 2013-03-14 13:07:24 +0000
@@ -4,4 +4,21 @@
4 <icon>live</icon>4 <icon>live</icon>
5 <translations>account-plugins</translations>5 <translations>account-plugins</translations>
6 <domains>.*live\.com</domains>6 <domains>.*live\.com</domains>
7
8 <template>
9 <group name="auth">
10 <setting name="method">oauth2</setting>
11 <setting name="mechanism">web_server</setting>
12 <group name="oauth2">
13 <group name="web_server">
14 <setting name="Host">login.live.com</setting>
15 <setting name="AuthPath">/oauth20_authorize.srf</setting>
16 <setting name="TokenPath">/oauth20_token.srf</setting>
17 <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
18 <setting name="ResponseType">code</setting>
19 <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails']</setting>
20 </group>
21 </group>
22 </group>
23 </template>
7</provider>24</provider>
825
=== modified file 'debian/control'
--- debian/control 2012-12-10 13:47:01 +0000
+++ debian/control 2013-03-14 13:07:24 +0000
@@ -9,7 +9,7 @@
9 pkg-config,9 pkg-config,
10 libaccounts-glib-dev,10 libaccounts-glib-dev,
11 libsignon-glib-dev,11 libsignon-glib-dev,
12 libaccount-plugin-1.0-dev,12 libaccount-plugin-1.0-dev (>= 0.1.3),
13 valac-0.16,13 valac-0.16,
14 gnome-common,14 gnome-common,
15 dh-autoreconf,15 dh-autoreconf,
1616
=== modified file 'src/facebook.vala'
--- src/facebook.vala 2012-11-12 11:24:22 +0000
+++ src/facebook.vala 2013-03-14 13:07:24 +0000
@@ -27,21 +27,7 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("Host", "www.facebook.com");
31 oauth_params.insert ("AuthPath", "/dialog/oauth");
32 oauth_params.insert ("RedirectUri",
33 "https://www.facebook.com/connect/login_success.html");
34 oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID);30 oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID);
35 oauth_params.insert ("Display", "popup");
36 string[] scopes = {
37 "publish_stream",
38 "read_stream",
39 "status_update",
40 "user_photos",
41 "friends_photos",
42 "xmpp_login"
43 };
44 oauth_params.insert ("Scope", scopes);
45 set_oauth_parameters (oauth_params);31 set_oauth_parameters (oauth_params);
46 }32 }
47}33}
4834
=== modified file 'src/flickr.vala'
--- src/flickr.vala 2012-11-12 11:24:22 +0000
+++ src/flickr.vala 2013-03-14 13:07:24 +0000
@@ -27,21 +27,8 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("RequestEndpoint",
31 "https://secure.flickr.com/services/oauth/request_token");
32 oauth_params.insert ("TokenEndpoint",
33 "https://secure.flickr.com/services/oauth/access_token");
34 oauth_params.insert ("AuthorizationEndpoint",
35 "https://secure.flickr.com/services/oauth/authorize");
36 oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY);30 oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY);
37 oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET);31 oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET);
38 /* According to Flickr documentation, the callback is ignored */
39 oauth_params.insert ("Callback", "https://wiki.ubuntu.com/");
40 string[] schemes = {
41 "https",
42 "http"
43 };
44 oauth_params.insert ("AllowedSchemes", schemes);
45 set_oauth_parameters (oauth_params);32 set_oauth_parameters (oauth_params);
4633
47 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);34 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
4835
=== modified file 'src/foursquare.vala'
--- src/foursquare.vala 2012-11-12 11:24:22 +0000
+++ src/foursquare.vala 2013-03-14 13:07:24 +0000
@@ -27,13 +27,8 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("Host", "foursquare.com");
31 oauth_params.insert ("AuthPath", "/oauth2/authenticate");
32 oauth_params.insert ("RedirectUri", "http://gwibber.com/0/auth.html");
33 oauth_params.insert ("ClientId",30 oauth_params.insert ("ClientId",
34 "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW");31 "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW");
35 oauth_params.insert ("ResponseType", "token");
36 oauth_params.insert ("Display", "touch");
37 set_oauth_parameters (oauth_params);32 set_oauth_parameters (oauth_params);
38 }33 }
39}34}
4035
=== modified file 'src/google.vala'
--- src/google.vala 2012-12-10 07:52:17 +0000
+++ src/google.vala 2013-03-14 13:07:24 +0000
@@ -46,11 +46,6 @@
46 private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)46 private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)
47 {47 {
48 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);48 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
49 oauth_params.insert ("Host", "accounts.google.com");
50 oauth_params.insert ("AuthPath", "o/oauth2/auth");
51 oauth_params.insert ("TokenPath", "o/oauth2/token");
52 oauth_params.insert ("RedirectUri",
53 "https://wiki.ubuntu.com/");
54 oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);49 oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);
55 oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);50 oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);
5651
@@ -69,25 +64,6 @@
69 oauth_params.insert ("ResponseType",64 oauth_params.insert ("ResponseType",
70 "code&access_type=offline&approval_prompt=force");65 "code&access_type=offline&approval_prompt=force");
71 }66 }
72 else
73 {
74 oauth_params.insert ("ResponseType",
75 "code&access_type=offline");
76 }
77 string[] scopes = {
78 "https://docs.google.com/feeds/",
79 "https://www.googleapis.com/auth/googletalk",
80 "https://www.googleapis.com/auth/userinfo.email",
81 "https://www.googleapis.com/auth/userinfo.profile",
82 "https://picasaweb.google.com/data/"
83 };
84 oauth_params.insert ("Scope", scopes);
85
86 string[] schemes = {
87 "https",
88 "http"
89 };
90 oauth_params.insert ("AllowedSchemes", schemes);
9167
92 return oauth_params;68 return oauth_params;
93 }69 }
9470
=== modified file 'src/identica.vala'
--- src/identica.vala 2012-11-12 11:24:22 +0000
+++ src/identica.vala 2013-03-14 13:07:24 +0000
@@ -27,18 +27,9 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("RequestEndpoint",
31 "https://identi.ca/api/oauth/request_token");
32 oauth_params.insert ("TokenEndpoint",
33 "https://identi.ca/api/oauth/access_token");
34 oauth_params.insert ("AuthorizationEndpoint",
35 "https://identi.ca/api/oauth/authorize");
36 oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY);30 oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY);
37 oauth_params.insert ("ConsumerSecret",31 oauth_params.insert ("ConsumerSecret",
38 Config.IDENTICA_CONSUMER_SECRET);32 Config.IDENTICA_CONSUMER_SECRET);
39 oauth_params.insert ("Source", "Ubuntu");
40 oauth_params.insert ("Callback", "http://www.ubuntu.com/");
41 oauth_params.insert ("Mode", "desktop");
42 set_oauth_parameters (oauth_params);33 set_oauth_parameters (oauth_params);
4334
44 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);35 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
4536
=== modified file 'src/sina.vala'
--- src/sina.vala 2012-11-12 11:24:22 +0000
+++ src/sina.vala 2013-03-14 13:07:24 +0000
@@ -27,20 +27,8 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("RequestEndpoint",
31 "http://api.t.sina.com.cn/oauth/request_token");
32 oauth_params.insert ("TokenEndpoint",
33 "http://api.t.sina.com.cn/oauth/access_token");
34 oauth_params.insert ("AuthorizationEndpoint",
35 "http://api.t.sina.com.cn/oauth/authorize");
36 oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY);30 oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY);
37 oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET);31 oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET);
38 oauth_params.insert ("Callback", "http://www.ubuntu.com/");
39 string[] schemes = {
40 "https",
41 "http"
42 };
43 oauth_params.insert ("AllowedSchemes", schemes);
44 set_oauth_parameters (oauth_params);32 set_oauth_parameters (oauth_params);
4533
46 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);34 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
4735
=== modified file 'src/sohu.vala'
--- src/sohu.vala 2012-11-12 11:24:22 +0000
+++ src/sohu.vala 2013-03-14 13:07:24 +0000
@@ -27,20 +27,8 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("RequestEndpoint",
31 "http://api.t.sohu.com/oauth/request_token");
32 oauth_params.insert ("TokenEndpoint",
33 "http://api.t.sohu.com/oauth/access_token");
34 oauth_params.insert ("AuthorizationEndpoint",
35 "http://api.t.sohu.com/oauth/authorize");
36 oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY);30 oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY);
37 oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET);31 oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET);
38 oauth_params.insert ("Callback", "http://www.ubuntu.com/");
39 string[] schemes = {
40 "https",
41 "http"
42 };
43 oauth_params.insert ("AllowedSchemes", schemes);
44 set_oauth_parameters (oauth_params);32 set_oauth_parameters (oauth_params);
4533
46 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);34 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
4735
=== modified file 'src/twitter.vala'
--- src/twitter.vala 2012-11-12 11:24:22 +0000
+++ src/twitter.vala 2013-03-14 13:07:24 +0000
@@ -27,15 +27,8 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("RequestEndpoint",
31 "https://api.twitter.com/oauth/request_token");
32 oauth_params.insert ("TokenEndpoint",
33 "https://api.twitter.com/oauth/access_token");
34 oauth_params.insert ("AuthorizationEndpoint",
35 "https://api.twitter.com/oauth/authorize");
36 oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY);30 oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY);
37 oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET);31 oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET);
38 oauth_params.insert ("Callback", "https://wiki.ubuntu.com/");
39 set_oauth_parameters (oauth_params);32 set_oauth_parameters (oauth_params);
4033
41 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);34 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
4235
=== modified file 'src/windows-live.vala'
--- src/windows-live.vala 2012-11-12 11:24:22 +0000
+++ src/windows-live.vala 2013-03-14 13:07:24 +0000
@@ -27,18 +27,7 @@
27 construct27 construct
28 {28 {
29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);29 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
30 oauth_params.insert ("Host", "login.live.com");
31 oauth_params.insert ("AuthPath", "/oauth20_authorize.srf");
32 oauth_params.insert ("TokenPath", "/oauth20_token.srf");
33 oauth_params.insert ("RedirectUri", "https://login.live.com/oauth20_desktop.srf");
34 oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID);30 oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID);
35 oauth_params.insert ("ResponseType", "code");
36 string[] scopes = {
37 "wl.messenger",
38 "wl.offline_access",
39 "wl.emails"
40 };
41 oauth_params.insert ("Scope", scopes);
42 set_oauth_parameters (oauth_params);31 set_oauth_parameters (oauth_params);
43 set_mechanism(Ap.OAuthMechanism.WEB_SERVER);32 set_mechanism(Ap.OAuthMechanism.WEB_SERVER);
44 }33 }

Subscribers

People subscribed via source and target branches

to all changes: