Online Accounts: Account plugins

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

  1. no-hardcoded-data
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
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
David King (community) Approve
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.
Revision history for this message
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)
Revision history for this message
David King (amigadave) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/account-plugins-autolanding/15/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/15/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=i386/15/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:94
http://s-jenkins:8080/job/account-plugins-ci/22/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/22/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/22/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/account-plugins-autolanding/16/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/16/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=i386/16/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/account-plugins-autolanding/18/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/18/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=i386/18/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:95
http://s-jenkins:8080/job/account-plugins-ci/25/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/25/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/25/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/account-plugins-autolanding/19/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/19/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-autolanding/./build=pbuilder,distribution=raring,flavor=i386/19/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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 2012-12-06 08:05:41 +0000
3+++ configure.ac 2013-03-14 13:07:24 +0000
4@@ -37,7 +37,7 @@
5 [have_libaccount_plugin=no])
6
7 AS_IF([test "x$have_libaccount_plugin" = "xyes"],
8- [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin])],
9+ [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin >= 0.1.3])],
10 [AS_IF([test "x$enable_libaccount_plugin" = "xyes"],
11 [AC_MSG_ERROR([libaccount-plugin support enabled but required dependencies were not found])])])
12
13
14=== modified file 'data/providers/facebook.provider.in'
15--- data/providers/facebook.provider.in 2012-10-04 14:18:34 +0000
16+++ data/providers/facebook.provider.in 2013-03-14 13:07:24 +0000
17@@ -4,4 +4,20 @@
18 <icon>facebook</icon>
19 <translations>account-plugins</translations>
20 <domains>.*facebook\.com</domains>
21+
22+ <template>
23+ <group name="auth">
24+ <setting name="method">oauth2</setting>
25+ <setting name="mechanism">user_agent</setting>
26+ <group name="oauth2">
27+ <group name="user_agent">
28+ <setting name="Host">www.facebook.com</setting>
29+ <setting name="AuthPath">/dialog/oauth</setting>
30+ <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting>
31+ <setting name="Display">popup</setting>
32+ <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
33+ </group>
34+ </group>
35+ </group>
36+ </template>
37 </provider>
38
39=== modified file 'data/providers/flickr.provider.in'
40--- data/providers/flickr.provider.in 2012-10-04 14:18:34 +0000
41+++ data/providers/flickr.provider.in 2013-03-14 13:07:24 +0000
42@@ -4,4 +4,20 @@
43 <icon>flickr</icon>
44 <translations>account-plugins</translations>
45 <domains>.*flickr\.com</domains>
46+
47+ <template>
48+ <group name="auth">
49+ <setting name="method">oauth2</setting>
50+ <setting name="mechanism">HMAC-SHA1</setting>
51+ <group name="oauth2">
52+ <group name="HMAC-SHA1">
53+ <setting name="RequestEndpoint">https://secure.flickr.com/services/oauth/request_token</setting>
54+ <setting name="TokenEndpoint">https://secure.flickr.com/services/oauth/access_token</setting>
55+ <setting name="AuthorizationEndpoint">https://secure.flickr.com/services/oauth/authorize</setting>
56+ <setting name="Callback">https://wiki.ubuntu.com/</setting>
57+ <setting name="AllowedSchemes" type="as">['https','http']</setting>
58+ </group>
59+ </group>
60+ </group>
61+ </template>
62 </provider>
63
64=== modified file 'data/providers/foursquare.provider.in'
65--- data/providers/foursquare.provider.in 2012-10-04 14:18:34 +0000
66+++ data/providers/foursquare.provider.in 2013-03-14 13:07:24 +0000
67@@ -4,4 +4,20 @@
68 <icon>foursquare</icon>
69 <translations>account-plugins</translations>
70 <domains>.*foursquare\.com</domains>
71+
72+ <template>
73+ <group name="auth">
74+ <setting name="method">oauth2</setting>
75+ <setting name="mechanism">user_agent</setting>
76+ <group name="oauth2">
77+ <group name="user_agent">
78+ <setting name="Host">foursquare.com</setting>
79+ <setting name="AuthPath">/oauth2/authenticate</setting>
80+ <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting>
81+ <setting name="Display">touch</setting>
82+ <setting name="ResponseType">token</setting>
83+ </group>
84+ </group>
85+ </group>
86+ </template>
87 </provider>
88
89=== modified file 'data/providers/google.provider.in'
90--- data/providers/google.provider.in 2012-10-04 14:18:34 +0000
91+++ data/providers/google.provider.in 2013-03-14 13:07:24 +0000
92@@ -5,4 +5,24 @@
93 <icon>google</icon>
94 <translations>account-plugins</translations>
95 <domains>.*google\.com</domains>
96+
97+ <template>
98+ <group name="auth">
99+ <setting name="method">oauth2</setting>
100+ <setting name="mechanism">web_server</setting>
101+ <group name="oauth2">
102+ <group name="web_server">
103+ <setting name="Host">accounts.google.com</setting>
104+ <setting name="AuthPath">o/oauth2/auth</setting>
105+ <setting name="TokenPath">o/oauth2/token</setting>
106+ <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
107+ <!-- HACK: access_type is non standard, but Google requires it in
108+ order to return a refresh token -->
109+ <setting name="ResponseType">code&amp;access_type=offline</setting>
110+ <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>
111+ <setting name="AllowedSchemes" type="as">['https','http']</setting>
112+ </group>
113+ </group>
114+ </group>
115+ </template>
116 </provider>
117
118=== modified file 'data/providers/identica.provider.in'
119--- data/providers/identica.provider.in 2012-10-04 14:18:34 +0000
120+++ data/providers/identica.provider.in 2013-03-14 13:07:24 +0000
121@@ -4,4 +4,21 @@
122 <icon>identica</icon>
123 <translations>account-plugins</translations>
124 <domains>.*identi\.ca</domains>
125+
126+ <template>
127+ <group name="auth">
128+ <setting name="method">oauth2</setting>
129+ <setting name="mechanism">HMAC-SHA1</setting>
130+ <group name="oauth2">
131+ <group name="HMAC-SHA1">
132+ <setting name="RequestEndpoint">https://identi.ca/api/oauth/request_token</setting>
133+ <setting name="TokenEndpoint">https://identi.ca/api/oauth/access_token</setting>
134+ <setting name="AuthorizationEndpoint">https://identi.ca/api/oauth/authorize</setting>
135+ <setting name="Callback">https://wiki.ubuntu.com/</setting>
136+ <setting name="Source">Ubuntu</setting>
137+ <setting name="Mode">desktop</setting>
138+ </group>
139+ </group>
140+ </group>
141+ </template>
142 </provider>
143
144=== modified file 'data/providers/sina.provider.in'
145--- data/providers/sina.provider.in 2012-10-04 14:18:34 +0000
146+++ data/providers/sina.provider.in 2013-03-14 13:07:24 +0000
147@@ -4,4 +4,20 @@
148 <icon>sina</icon>
149 <translations>account-plugins</translations>
150 <domains>.*t\.sina\.com\.cn</domains>
151+
152+ <template>
153+ <group name="auth">
154+ <setting name="method">oauth2</setting>
155+ <setting name="mechanism">HMAC-SHA1</setting>
156+ <group name="oauth2">
157+ <group name="HMAC-SHA1">
158+ <setting name="RequestEndpoint">http://api.t.sina.com.cn/oauth/request_token</setting>
159+ <setting name="TokenEndpoint">http://api.t.sina.com.cn/oauth/access_token</setting>
160+ <setting name="AuthorizationEndpoint">http://api.t.sina.com.cn/oauth/authorize</setting>
161+ <setting name="Callback">http://wiki.ubuntu.com/</setting>
162+ <setting name="AllowedSchemes" type="as">['https','http']</setting>
163+ </group>
164+ </group>
165+ </group>
166+ </template>
167 </provider>
168
169=== modified file 'data/providers/sohu.provider.in'
170--- data/providers/sohu.provider.in 2012-10-04 14:18:34 +0000
171+++ data/providers/sohu.provider.in 2013-03-14 13:07:24 +0000
172@@ -4,4 +4,20 @@
173 <icon>sohu</icon>
174 <translations>account-plugins</translations>
175 <domains>.*t\.sohu\.com</domains>
176+
177+ <template>
178+ <group name="auth">
179+ <setting name="method">oauth2</setting>
180+ <setting name="mechanism">HMAC-SHA1</setting>
181+ <group name="oauth2">
182+ <group name="HMAC-SHA1">
183+ <setting name="RequestEndpoint">http://api.t.sohu.com/oauth/request_token</setting>
184+ <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting>
185+ <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting>
186+ <setting name="Callback">https://wiki.ubuntu.com/</setting>
187+ <setting name="AllowedSchemes" type="as">['https','http']</setting>
188+ </group>
189+ </group>
190+ </group>
191+ </template>
192 </provider>
193
194=== modified file 'data/providers/twitter.provider.in'
195--- data/providers/twitter.provider.in 2012-10-04 14:18:34 +0000
196+++ data/providers/twitter.provider.in 2013-03-14 13:07:24 +0000
197@@ -4,4 +4,19 @@
198 <icon>twitter</icon>
199 <translations>account-plugins</translations>
200 <domains>.*twitter\.com</domains>
201+
202+ <template>
203+ <group name="auth">
204+ <setting name="method">oauth2</setting>
205+ <setting name="mechanism">HMAC-SHA1</setting>
206+ <group name="oauth2">
207+ <group name="HMAC-SHA1">
208+ <setting name="RequestEndpoint">https://api.twitter.com/oauth/request_token</setting>
209+ <setting name="TokenEndpoint">https://api.twitter.com/oauth/access_token</setting>
210+ <setting name="AuthorizationEndpoint">https://api.twitter.com/oauth/authorize</setting>
211+ <setting name="Callback">https://wiki.ubuntu.com/</setting>
212+ </group>
213+ </group>
214+ </group>
215+ </template>
216 </provider>
217
218=== modified file 'data/providers/windows-live.provider.in'
219--- data/providers/windows-live.provider.in 2012-10-04 14:18:34 +0000
220+++ data/providers/windows-live.provider.in 2013-03-14 13:07:24 +0000
221@@ -4,4 +4,21 @@
222 <icon>live</icon>
223 <translations>account-plugins</translations>
224 <domains>.*live\.com</domains>
225+
226+ <template>
227+ <group name="auth">
228+ <setting name="method">oauth2</setting>
229+ <setting name="mechanism">web_server</setting>
230+ <group name="oauth2">
231+ <group name="web_server">
232+ <setting name="Host">login.live.com</setting>
233+ <setting name="AuthPath">/oauth20_authorize.srf</setting>
234+ <setting name="TokenPath">/oauth20_token.srf</setting>
235+ <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting>
236+ <setting name="ResponseType">code</setting>
237+ <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails']</setting>
238+ </group>
239+ </group>
240+ </group>
241+ </template>
242 </provider>
243
244=== modified file 'debian/control'
245--- debian/control 2012-12-10 13:47:01 +0000
246+++ debian/control 2013-03-14 13:07:24 +0000
247@@ -9,7 +9,7 @@
248 pkg-config,
249 libaccounts-glib-dev,
250 libsignon-glib-dev,
251- libaccount-plugin-1.0-dev,
252+ libaccount-plugin-1.0-dev (>= 0.1.3),
253 valac-0.16,
254 gnome-common,
255 dh-autoreconf,
256
257=== modified file 'src/facebook.vala'
258--- src/facebook.vala 2012-11-12 11:24:22 +0000
259+++ src/facebook.vala 2013-03-14 13:07:24 +0000
260@@ -27,21 +27,7 @@
261 construct
262 {
263 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
264- oauth_params.insert ("Host", "www.facebook.com");
265- oauth_params.insert ("AuthPath", "/dialog/oauth");
266- oauth_params.insert ("RedirectUri",
267- "https://www.facebook.com/connect/login_success.html");
268 oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID);
269- oauth_params.insert ("Display", "popup");
270- string[] scopes = {
271- "publish_stream",
272- "read_stream",
273- "status_update",
274- "user_photos",
275- "friends_photos",
276- "xmpp_login"
277- };
278- oauth_params.insert ("Scope", scopes);
279 set_oauth_parameters (oauth_params);
280 }
281 }
282
283=== modified file 'src/flickr.vala'
284--- src/flickr.vala 2012-11-12 11:24:22 +0000
285+++ src/flickr.vala 2013-03-14 13:07:24 +0000
286@@ -27,21 +27,8 @@
287 construct
288 {
289 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
290- oauth_params.insert ("RequestEndpoint",
291- "https://secure.flickr.com/services/oauth/request_token");
292- oauth_params.insert ("TokenEndpoint",
293- "https://secure.flickr.com/services/oauth/access_token");
294- oauth_params.insert ("AuthorizationEndpoint",
295- "https://secure.flickr.com/services/oauth/authorize");
296 oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY);
297 oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET);
298- /* According to Flickr documentation, the callback is ignored */
299- oauth_params.insert ("Callback", "https://wiki.ubuntu.com/");
300- string[] schemes = {
301- "https",
302- "http"
303- };
304- oauth_params.insert ("AllowedSchemes", schemes);
305 set_oauth_parameters (oauth_params);
306
307 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
308
309=== modified file 'src/foursquare.vala'
310--- src/foursquare.vala 2012-11-12 11:24:22 +0000
311+++ src/foursquare.vala 2013-03-14 13:07:24 +0000
312@@ -27,13 +27,8 @@
313 construct
314 {
315 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
316- oauth_params.insert ("Host", "foursquare.com");
317- oauth_params.insert ("AuthPath", "/oauth2/authenticate");
318- oauth_params.insert ("RedirectUri", "http://gwibber.com/0/auth.html");
319 oauth_params.insert ("ClientId",
320 "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW");
321- oauth_params.insert ("ResponseType", "token");
322- oauth_params.insert ("Display", "touch");
323 set_oauth_parameters (oauth_params);
324 }
325 }
326
327=== modified file 'src/google.vala'
328--- src/google.vala 2012-12-10 07:52:17 +0000
329+++ src/google.vala 2013-03-14 13:07:24 +0000
330@@ -46,11 +46,6 @@
331 private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)
332 {
333 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
334- oauth_params.insert ("Host", "accounts.google.com");
335- oauth_params.insert ("AuthPath", "o/oauth2/auth");
336- oauth_params.insert ("TokenPath", "o/oauth2/token");
337- oauth_params.insert ("RedirectUri",
338- "https://wiki.ubuntu.com/");
339 oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);
340 oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);
341
342@@ -69,25 +64,6 @@
343 oauth_params.insert ("ResponseType",
344 "code&access_type=offline&approval_prompt=force");
345 }
346- else
347- {
348- oauth_params.insert ("ResponseType",
349- "code&access_type=offline");
350- }
351- string[] scopes = {
352- "https://docs.google.com/feeds/",
353- "https://www.googleapis.com/auth/googletalk",
354- "https://www.googleapis.com/auth/userinfo.email",
355- "https://www.googleapis.com/auth/userinfo.profile",
356- "https://picasaweb.google.com/data/"
357- };
358- oauth_params.insert ("Scope", scopes);
359-
360- string[] schemes = {
361- "https",
362- "http"
363- };
364- oauth_params.insert ("AllowedSchemes", schemes);
365
366 return oauth_params;
367 }
368
369=== modified file 'src/identica.vala'
370--- src/identica.vala 2012-11-12 11:24:22 +0000
371+++ src/identica.vala 2013-03-14 13:07:24 +0000
372@@ -27,18 +27,9 @@
373 construct
374 {
375 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
376- oauth_params.insert ("RequestEndpoint",
377- "https://identi.ca/api/oauth/request_token");
378- oauth_params.insert ("TokenEndpoint",
379- "https://identi.ca/api/oauth/access_token");
380- oauth_params.insert ("AuthorizationEndpoint",
381- "https://identi.ca/api/oauth/authorize");
382 oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY);
383 oauth_params.insert ("ConsumerSecret",
384 Config.IDENTICA_CONSUMER_SECRET);
385- oauth_params.insert ("Source", "Ubuntu");
386- oauth_params.insert ("Callback", "http://www.ubuntu.com/");
387- oauth_params.insert ("Mode", "desktop");
388 set_oauth_parameters (oauth_params);
389
390 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
391
392=== modified file 'src/sina.vala'
393--- src/sina.vala 2012-11-12 11:24:22 +0000
394+++ src/sina.vala 2013-03-14 13:07:24 +0000
395@@ -27,20 +27,8 @@
396 construct
397 {
398 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
399- oauth_params.insert ("RequestEndpoint",
400- "http://api.t.sina.com.cn/oauth/request_token");
401- oauth_params.insert ("TokenEndpoint",
402- "http://api.t.sina.com.cn/oauth/access_token");
403- oauth_params.insert ("AuthorizationEndpoint",
404- "http://api.t.sina.com.cn/oauth/authorize");
405 oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY);
406 oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET);
407- oauth_params.insert ("Callback", "http://www.ubuntu.com/");
408- string[] schemes = {
409- "https",
410- "http"
411- };
412- oauth_params.insert ("AllowedSchemes", schemes);
413 set_oauth_parameters (oauth_params);
414
415 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
416
417=== modified file 'src/sohu.vala'
418--- src/sohu.vala 2012-11-12 11:24:22 +0000
419+++ src/sohu.vala 2013-03-14 13:07:24 +0000
420@@ -27,20 +27,8 @@
421 construct
422 {
423 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
424- oauth_params.insert ("RequestEndpoint",
425- "http://api.t.sohu.com/oauth/request_token");
426- oauth_params.insert ("TokenEndpoint",
427- "http://api.t.sohu.com/oauth/access_token");
428- oauth_params.insert ("AuthorizationEndpoint",
429- "http://api.t.sohu.com/oauth/authorize");
430 oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY);
431 oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET);
432- oauth_params.insert ("Callback", "http://www.ubuntu.com/");
433- string[] schemes = {
434- "https",
435- "http"
436- };
437- oauth_params.insert ("AllowedSchemes", schemes);
438 set_oauth_parameters (oauth_params);
439
440 set_mechanism (Ap.OAuthMechanism.HMAC_SHA1);
441
442=== modified file 'src/twitter.vala'
443--- src/twitter.vala 2012-11-12 11:24:22 +0000
444+++ src/twitter.vala 2013-03-14 13:07:24 +0000
445@@ -27,15 +27,8 @@
446 construct
447 {
448 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
449- oauth_params.insert ("RequestEndpoint",
450- "https://api.twitter.com/oauth/request_token");
451- oauth_params.insert ("TokenEndpoint",
452- "https://api.twitter.com/oauth/access_token");
453- oauth_params.insert ("AuthorizationEndpoint",
454- "https://api.twitter.com/oauth/authorize");
455 oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY);
456 oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET);
457- oauth_params.insert ("Callback", "https://wiki.ubuntu.com/");
458 set_oauth_parameters (oauth_params);
459
460 set_mechanism(Ap.OAuthMechanism.HMAC_SHA1);
461
462=== modified file 'src/windows-live.vala'
463--- src/windows-live.vala 2012-11-12 11:24:22 +0000
464+++ src/windows-live.vala 2013-03-14 13:07:24 +0000
465@@ -27,18 +27,7 @@
466 construct
467 {
468 var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
469- oauth_params.insert ("Host", "login.live.com");
470- oauth_params.insert ("AuthPath", "/oauth20_authorize.srf");
471- oauth_params.insert ("TokenPath", "/oauth20_token.srf");
472- oauth_params.insert ("RedirectUri", "https://login.live.com/oauth20_desktop.srf");
473 oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID);
474- oauth_params.insert ("ResponseType", "code");
475- string[] scopes = {
476- "wl.messenger",
477- "wl.offline_access",
478- "wl.emails"
479- };
480- oauth_params.insert ("Scope", scopes);
481 set_oauth_parameters (oauth_params);
482 set_mechanism(Ap.OAuthMechanism.WEB_SERVER);
483 }

Subscribers

People subscribed via source and target branches