Merge lp:~mardy/account-plugins/no-hardcoded-data into lp:account-plugins
- no-hardcoded-data
- Merge into trunk
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 |
Related bugs: |
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.
PS Jenkins bot (ps-jenkins) wrote : | # |
David King (amigadave) : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:94
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:95
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
PS Jenkins bot (ps-jenkins) : | # |
Preview Diff
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 | 37 | [have_libaccount_plugin=no]) | 37 | [have_libaccount_plugin=no]) |
6 | 38 | 38 | ||
7 | 39 | AS_IF([test "x$have_libaccount_plugin" = "xyes"], | 39 | AS_IF([test "x$have_libaccount_plugin" = "xyes"], |
9 | 40 | [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin])], | 40 | [PKG_CHECK_MODULES([ACCOUNT_PLUGINS], [account-plugin >= 0.1.3])], |
10 | 41 | [AS_IF([test "x$enable_libaccount_plugin" = "xyes"], | 41 | [AS_IF([test "x$enable_libaccount_plugin" = "xyes"], |
11 | 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])])]) |
12 | 43 | 43 | ||
13 | 44 | 44 | ||
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 | 4 | <icon>facebook</icon> | 4 | <icon>facebook</icon> |
19 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
20 | 6 | <domains>.*facebook\.com</domains> | 6 | <domains>.*facebook\.com</domains> |
21 | 7 | |||
22 | 8 | <template> | ||
23 | 9 | <group name="auth"> | ||
24 | 10 | <setting name="method">oauth2</setting> | ||
25 | 11 | <setting name="mechanism">user_agent</setting> | ||
26 | 12 | <group name="oauth2"> | ||
27 | 13 | <group name="user_agent"> | ||
28 | 14 | <setting name="Host">www.facebook.com</setting> | ||
29 | 15 | <setting name="AuthPath">/dialog/oauth</setting> | ||
30 | 16 | <setting name="RedirectUri">https://www.facebook.com/connect/login_success.html</setting> | ||
31 | 17 | <setting name="Display">popup</setting> | ||
32 | 18 | <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting> | ||
33 | 19 | </group> | ||
34 | 20 | </group> | ||
35 | 21 | </group> | ||
36 | 22 | </template> | ||
37 | 7 | </provider> | 23 | </provider> |
38 | 8 | 24 | ||
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 | 4 | <icon>flickr</icon> | 4 | <icon>flickr</icon> |
44 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
45 | 6 | <domains>.*flickr\.com</domains> | 6 | <domains>.*flickr\.com</domains> |
46 | 7 | |||
47 | 8 | <template> | ||
48 | 9 | <group name="auth"> | ||
49 | 10 | <setting name="method">oauth2</setting> | ||
50 | 11 | <setting name="mechanism">HMAC-SHA1</setting> | ||
51 | 12 | <group name="oauth2"> | ||
52 | 13 | <group name="HMAC-SHA1"> | ||
53 | 14 | <setting name="RequestEndpoint">https://secure.flickr.com/services/oauth/request_token</setting> | ||
54 | 15 | <setting name="TokenEndpoint">https://secure.flickr.com/services/oauth/access_token</setting> | ||
55 | 16 | <setting name="AuthorizationEndpoint">https://secure.flickr.com/services/oauth/authorize</setting> | ||
56 | 17 | <setting name="Callback">https://wiki.ubuntu.com/</setting> | ||
57 | 18 | <setting name="AllowedSchemes" type="as">['https','http']</setting> | ||
58 | 19 | </group> | ||
59 | 20 | </group> | ||
60 | 21 | </group> | ||
61 | 22 | </template> | ||
62 | 7 | </provider> | 23 | </provider> |
63 | 8 | 24 | ||
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 | 4 | <icon>foursquare</icon> | 4 | <icon>foursquare</icon> |
69 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
70 | 6 | <domains>.*foursquare\.com</domains> | 6 | <domains>.*foursquare\.com</domains> |
71 | 7 | |||
72 | 8 | <template> | ||
73 | 9 | <group name="auth"> | ||
74 | 10 | <setting name="method">oauth2</setting> | ||
75 | 11 | <setting name="mechanism">user_agent</setting> | ||
76 | 12 | <group name="oauth2"> | ||
77 | 13 | <group name="user_agent"> | ||
78 | 14 | <setting name="Host">foursquare.com</setting> | ||
79 | 15 | <setting name="AuthPath">/oauth2/authenticate</setting> | ||
80 | 16 | <setting name="RedirectUri">http://gwibber.com/0/auth.html</setting> | ||
81 | 17 | <setting name="Display">touch</setting> | ||
82 | 18 | <setting name="ResponseType">token</setting> | ||
83 | 19 | </group> | ||
84 | 20 | </group> | ||
85 | 21 | </group> | ||
86 | 22 | </template> | ||
87 | 7 | </provider> | 23 | </provider> |
88 | 8 | 24 | ||
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 | 5 | <icon>google</icon> | 5 | <icon>google</icon> |
94 | 6 | <translations>account-plugins</translations> | 6 | <translations>account-plugins</translations> |
95 | 7 | <domains>.*google\.com</domains> | 7 | <domains>.*google\.com</domains> |
96 | 8 | |||
97 | 9 | <template> | ||
98 | 10 | <group name="auth"> | ||
99 | 11 | <setting name="method">oauth2</setting> | ||
100 | 12 | <setting name="mechanism">web_server</setting> | ||
101 | 13 | <group name="oauth2"> | ||
102 | 14 | <group name="web_server"> | ||
103 | 15 | <setting name="Host">accounts.google.com</setting> | ||
104 | 16 | <setting name="AuthPath">o/oauth2/auth</setting> | ||
105 | 17 | <setting name="TokenPath">o/oauth2/token</setting> | ||
106 | 18 | <setting name="RedirectUri">https://wiki.ubuntu.com/</setting> | ||
107 | 19 | <!-- HACK: access_type is non standard, but Google requires it in | ||
108 | 20 | order to return a refresh token --> | ||
109 | 21 | <setting name="ResponseType">code&access_type=offline</setting> | ||
110 | 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> | ||
111 | 23 | <setting name="AllowedSchemes" type="as">['https','http']</setting> | ||
112 | 24 | </group> | ||
113 | 25 | </group> | ||
114 | 26 | </group> | ||
115 | 27 | </template> | ||
116 | 8 | </provider> | 28 | </provider> |
117 | 9 | 29 | ||
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 | 4 | <icon>identica</icon> | 4 | <icon>identica</icon> |
123 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
124 | 6 | <domains>.*identi\.ca</domains> | 6 | <domains>.*identi\.ca</domains> |
125 | 7 | |||
126 | 8 | <template> | ||
127 | 9 | <group name="auth"> | ||
128 | 10 | <setting name="method">oauth2</setting> | ||
129 | 11 | <setting name="mechanism">HMAC-SHA1</setting> | ||
130 | 12 | <group name="oauth2"> | ||
131 | 13 | <group name="HMAC-SHA1"> | ||
132 | 14 | <setting name="RequestEndpoint">https://identi.ca/api/oauth/request_token</setting> | ||
133 | 15 | <setting name="TokenEndpoint">https://identi.ca/api/oauth/access_token</setting> | ||
134 | 16 | <setting name="AuthorizationEndpoint">https://identi.ca/api/oauth/authorize</setting> | ||
135 | 17 | <setting name="Callback">https://wiki.ubuntu.com/</setting> | ||
136 | 18 | <setting name="Source">Ubuntu</setting> | ||
137 | 19 | <setting name="Mode">desktop</setting> | ||
138 | 20 | </group> | ||
139 | 21 | </group> | ||
140 | 22 | </group> | ||
141 | 23 | </template> | ||
142 | 7 | </provider> | 24 | </provider> |
143 | 8 | 25 | ||
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 | 4 | <icon>sina</icon> | 4 | <icon>sina</icon> |
149 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
150 | 6 | <domains>.*t\.sina\.com\.cn</domains> | 6 | <domains>.*t\.sina\.com\.cn</domains> |
151 | 7 | |||
152 | 8 | <template> | ||
153 | 9 | <group name="auth"> | ||
154 | 10 | <setting name="method">oauth2</setting> | ||
155 | 11 | <setting name="mechanism">HMAC-SHA1</setting> | ||
156 | 12 | <group name="oauth2"> | ||
157 | 13 | <group name="HMAC-SHA1"> | ||
158 | 14 | <setting name="RequestEndpoint">http://api.t.sina.com.cn/oauth/request_token</setting> | ||
159 | 15 | <setting name="TokenEndpoint">http://api.t.sina.com.cn/oauth/access_token</setting> | ||
160 | 16 | <setting name="AuthorizationEndpoint">http://api.t.sina.com.cn/oauth/authorize</setting> | ||
161 | 17 | <setting name="Callback">http://wiki.ubuntu.com/</setting> | ||
162 | 18 | <setting name="AllowedSchemes" type="as">['https','http']</setting> | ||
163 | 19 | </group> | ||
164 | 20 | </group> | ||
165 | 21 | </group> | ||
166 | 22 | </template> | ||
167 | 7 | </provider> | 23 | </provider> |
168 | 8 | 24 | ||
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 | 4 | <icon>sohu</icon> | 4 | <icon>sohu</icon> |
174 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
175 | 6 | <domains>.*t\.sohu\.com</domains> | 6 | <domains>.*t\.sohu\.com</domains> |
176 | 7 | |||
177 | 8 | <template> | ||
178 | 9 | <group name="auth"> | ||
179 | 10 | <setting name="method">oauth2</setting> | ||
180 | 11 | <setting name="mechanism">HMAC-SHA1</setting> | ||
181 | 12 | <group name="oauth2"> | ||
182 | 13 | <group name="HMAC-SHA1"> | ||
183 | 14 | <setting name="RequestEndpoint">http://api.t.sohu.com/oauth/request_token</setting> | ||
184 | 15 | <setting name="TokenEndpoint">http://api.t.sohu.com/oauth/access_token</setting> | ||
185 | 16 | <setting name="AuthorizationEndpoint">http://api.t.sohu.com/oauth/authorize</setting> | ||
186 | 17 | <setting name="Callback">https://wiki.ubuntu.com/</setting> | ||
187 | 18 | <setting name="AllowedSchemes" type="as">['https','http']</setting> | ||
188 | 19 | </group> | ||
189 | 20 | </group> | ||
190 | 21 | </group> | ||
191 | 22 | </template> | ||
192 | 7 | </provider> | 23 | </provider> |
193 | 8 | 24 | ||
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 | 4 | <icon>twitter</icon> | 4 | <icon>twitter</icon> |
199 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
200 | 6 | <domains>.*twitter\.com</domains> | 6 | <domains>.*twitter\.com</domains> |
201 | 7 | |||
202 | 8 | <template> | ||
203 | 9 | <group name="auth"> | ||
204 | 10 | <setting name="method">oauth2</setting> | ||
205 | 11 | <setting name="mechanism">HMAC-SHA1</setting> | ||
206 | 12 | <group name="oauth2"> | ||
207 | 13 | <group name="HMAC-SHA1"> | ||
208 | 14 | <setting name="RequestEndpoint">https://api.twitter.com/oauth/request_token</setting> | ||
209 | 15 | <setting name="TokenEndpoint">https://api.twitter.com/oauth/access_token</setting> | ||
210 | 16 | <setting name="AuthorizationEndpoint">https://api.twitter.com/oauth/authorize</setting> | ||
211 | 17 | <setting name="Callback">https://wiki.ubuntu.com/</setting> | ||
212 | 18 | </group> | ||
213 | 19 | </group> | ||
214 | 20 | </group> | ||
215 | 21 | </template> | ||
216 | 7 | </provider> | 22 | </provider> |
217 | 8 | 23 | ||
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 | 4 | <icon>live</icon> | 4 | <icon>live</icon> |
223 | 5 | <translations>account-plugins</translations> | 5 | <translations>account-plugins</translations> |
224 | 6 | <domains>.*live\.com</domains> | 6 | <domains>.*live\.com</domains> |
225 | 7 | |||
226 | 8 | <template> | ||
227 | 9 | <group name="auth"> | ||
228 | 10 | <setting name="method">oauth2</setting> | ||
229 | 11 | <setting name="mechanism">web_server</setting> | ||
230 | 12 | <group name="oauth2"> | ||
231 | 13 | <group name="web_server"> | ||
232 | 14 | <setting name="Host">login.live.com</setting> | ||
233 | 15 | <setting name="AuthPath">/oauth20_authorize.srf</setting> | ||
234 | 16 | <setting name="TokenPath">/oauth20_token.srf</setting> | ||
235 | 17 | <setting name="RedirectUri">https://login.live.com/oauth20_desktop.srf</setting> | ||
236 | 18 | <setting name="ResponseType">code</setting> | ||
237 | 19 | <setting name="Scope" type="as">['wl.messenger','wl.offline_access','wl.emails']</setting> | ||
238 | 20 | </group> | ||
239 | 21 | </group> | ||
240 | 22 | </group> | ||
241 | 23 | </template> | ||
242 | 7 | </provider> | 24 | </provider> |
243 | 8 | 25 | ||
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 | 9 | pkg-config, | 9 | pkg-config, |
249 | 10 | libaccounts-glib-dev, | 10 | libaccounts-glib-dev, |
250 | 11 | libsignon-glib-dev, | 11 | libsignon-glib-dev, |
252 | 12 | libaccount-plugin-1.0-dev, | 12 | libaccount-plugin-1.0-dev (>= 0.1.3), |
253 | 13 | valac-0.16, | 13 | valac-0.16, |
254 | 14 | gnome-common, | 14 | gnome-common, |
255 | 15 | dh-autoreconf, | 15 | dh-autoreconf, |
256 | 16 | 16 | ||
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 | 27 | construct | 27 | construct |
262 | 28 | { | 28 | { |
263 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
264 | 30 | oauth_params.insert ("Host", "www.facebook.com"); | ||
265 | 31 | oauth_params.insert ("AuthPath", "/dialog/oauth"); | ||
266 | 32 | oauth_params.insert ("RedirectUri", | ||
267 | 33 | "https://www.facebook.com/connect/login_success.html"); | ||
268 | 34 | oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID); | 30 | oauth_params.insert ("ClientId", Config.FACEBOOK_CLIENT_ID); |
269 | 35 | oauth_params.insert ("Display", "popup"); | ||
270 | 36 | string[] scopes = { | ||
271 | 37 | "publish_stream", | ||
272 | 38 | "read_stream", | ||
273 | 39 | "status_update", | ||
274 | 40 | "user_photos", | ||
275 | 41 | "friends_photos", | ||
276 | 42 | "xmpp_login" | ||
277 | 43 | }; | ||
278 | 44 | oauth_params.insert ("Scope", scopes); | ||
279 | 45 | set_oauth_parameters (oauth_params); | 31 | set_oauth_parameters (oauth_params); |
280 | 46 | } | 32 | } |
281 | 47 | } | 33 | } |
282 | 48 | 34 | ||
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 | 27 | construct | 27 | construct |
288 | 28 | { | 28 | { |
289 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
290 | 30 | oauth_params.insert ("RequestEndpoint", | ||
291 | 31 | "https://secure.flickr.com/services/oauth/request_token"); | ||
292 | 32 | oauth_params.insert ("TokenEndpoint", | ||
293 | 33 | "https://secure.flickr.com/services/oauth/access_token"); | ||
294 | 34 | oauth_params.insert ("AuthorizationEndpoint", | ||
295 | 35 | "https://secure.flickr.com/services/oauth/authorize"); | ||
296 | 36 | oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY); | 30 | oauth_params.insert ("ConsumerKey", Config.FLICKR_CONSUMER_KEY); |
297 | 37 | oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET); | 31 | oauth_params.insert ("ConsumerSecret", Config.FLICKR_CONSUMER_SECRET); |
298 | 38 | /* According to Flickr documentation, the callback is ignored */ | ||
299 | 39 | oauth_params.insert ("Callback", "https://wiki.ubuntu.com/"); | ||
300 | 40 | string[] schemes = { | ||
301 | 41 | "https", | ||
302 | 42 | "http" | ||
303 | 43 | }; | ||
304 | 44 | oauth_params.insert ("AllowedSchemes", schemes); | ||
305 | 45 | set_oauth_parameters (oauth_params); | 32 | set_oauth_parameters (oauth_params); |
306 | 46 | 33 | ||
307 | 47 | set_mechanism(Ap.OAuthMechanism.HMAC_SHA1); | 34 | set_mechanism(Ap.OAuthMechanism.HMAC_SHA1); |
308 | 48 | 35 | ||
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 | 27 | construct | 27 | construct |
314 | 28 | { | 28 | { |
315 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
316 | 30 | oauth_params.insert ("Host", "foursquare.com"); | ||
317 | 31 | oauth_params.insert ("AuthPath", "/oauth2/authenticate"); | ||
318 | 32 | oauth_params.insert ("RedirectUri", "http://gwibber.com/0/auth.html"); | ||
319 | 33 | oauth_params.insert ("ClientId", | 30 | oauth_params.insert ("ClientId", |
320 | 34 | "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW"); | 31 | "BA0GOA0K3PTRS1KUJ5TTZ1P3GDRH3VJEEXY4N44ROPUJYKPW"); |
321 | 35 | oauth_params.insert ("ResponseType", "token"); | ||
322 | 36 | oauth_params.insert ("Display", "touch"); | ||
323 | 37 | set_oauth_parameters (oauth_params); | 32 | set_oauth_parameters (oauth_params); |
324 | 38 | } | 33 | } |
325 | 39 | } | 34 | } |
326 | 40 | 35 | ||
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 | 46 | private HashTable<string, GLib.Value?> get_parameters (ParametersUser user) | 46 | private HashTable<string, GLib.Value?> get_parameters (ParametersUser user) |
332 | 47 | { | 47 | { |
333 | 48 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 48 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
334 | 49 | oauth_params.insert ("Host", "accounts.google.com"); | ||
335 | 50 | oauth_params.insert ("AuthPath", "o/oauth2/auth"); | ||
336 | 51 | oauth_params.insert ("TokenPath", "o/oauth2/token"); | ||
337 | 52 | oauth_params.insert ("RedirectUri", | ||
338 | 53 | "https://wiki.ubuntu.com/"); | ||
339 | 54 | oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID); | 49 | oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID); |
340 | 55 | oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET); | 50 | oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET); |
341 | 56 | 51 | ||
342 | @@ -69,25 +64,6 @@ | |||
343 | 69 | oauth_params.insert ("ResponseType", | 64 | oauth_params.insert ("ResponseType", |
344 | 70 | "code&access_type=offline&approval_prompt=force"); | 65 | "code&access_type=offline&approval_prompt=force"); |
345 | 71 | } | 66 | } |
346 | 72 | else | ||
347 | 73 | { | ||
348 | 74 | oauth_params.insert ("ResponseType", | ||
349 | 75 | "code&access_type=offline"); | ||
350 | 76 | } | ||
351 | 77 | string[] scopes = { | ||
352 | 78 | "https://docs.google.com/feeds/", | ||
353 | 79 | "https://www.googleapis.com/auth/googletalk", | ||
354 | 80 | "https://www.googleapis.com/auth/userinfo.email", | ||
355 | 81 | "https://www.googleapis.com/auth/userinfo.profile", | ||
356 | 82 | "https://picasaweb.google.com/data/" | ||
357 | 83 | }; | ||
358 | 84 | oauth_params.insert ("Scope", scopes); | ||
359 | 85 | |||
360 | 86 | string[] schemes = { | ||
361 | 87 | "https", | ||
362 | 88 | "http" | ||
363 | 89 | }; | ||
364 | 90 | oauth_params.insert ("AllowedSchemes", schemes); | ||
365 | 91 | 67 | ||
366 | 92 | return oauth_params; | 68 | return oauth_params; |
367 | 93 | } | 69 | } |
368 | 94 | 70 | ||
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 | 27 | construct | 27 | construct |
374 | 28 | { | 28 | { |
375 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
376 | 30 | oauth_params.insert ("RequestEndpoint", | ||
377 | 31 | "https://identi.ca/api/oauth/request_token"); | ||
378 | 32 | oauth_params.insert ("TokenEndpoint", | ||
379 | 33 | "https://identi.ca/api/oauth/access_token"); | ||
380 | 34 | oauth_params.insert ("AuthorizationEndpoint", | ||
381 | 35 | "https://identi.ca/api/oauth/authorize"); | ||
382 | 36 | oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY); | 30 | oauth_params.insert ("ConsumerKey", Config.IDENTICA_CONSUMER_KEY); |
383 | 37 | oauth_params.insert ("ConsumerSecret", | 31 | oauth_params.insert ("ConsumerSecret", |
384 | 38 | Config.IDENTICA_CONSUMER_SECRET); | 32 | Config.IDENTICA_CONSUMER_SECRET); |
385 | 39 | oauth_params.insert ("Source", "Ubuntu"); | ||
386 | 40 | oauth_params.insert ("Callback", "http://www.ubuntu.com/"); | ||
387 | 41 | oauth_params.insert ("Mode", "desktop"); | ||
388 | 42 | set_oauth_parameters (oauth_params); | 33 | set_oauth_parameters (oauth_params); |
389 | 43 | 34 | ||
390 | 44 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); | 35 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); |
391 | 45 | 36 | ||
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 | 27 | construct | 27 | construct |
397 | 28 | { | 28 | { |
398 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
399 | 30 | oauth_params.insert ("RequestEndpoint", | ||
400 | 31 | "http://api.t.sina.com.cn/oauth/request_token"); | ||
401 | 32 | oauth_params.insert ("TokenEndpoint", | ||
402 | 33 | "http://api.t.sina.com.cn/oauth/access_token"); | ||
403 | 34 | oauth_params.insert ("AuthorizationEndpoint", | ||
404 | 35 | "http://api.t.sina.com.cn/oauth/authorize"); | ||
405 | 36 | oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY); | 30 | oauth_params.insert ("ConsumerKey", Config.SINA_CONSUMER_KEY); |
406 | 37 | oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET); | 31 | oauth_params.insert ("ConsumerSecret", Config.SINA_CONSUMER_SECRET); |
407 | 38 | oauth_params.insert ("Callback", "http://www.ubuntu.com/"); | ||
408 | 39 | string[] schemes = { | ||
409 | 40 | "https", | ||
410 | 41 | "http" | ||
411 | 42 | }; | ||
412 | 43 | oauth_params.insert ("AllowedSchemes", schemes); | ||
413 | 44 | set_oauth_parameters (oauth_params); | 32 | set_oauth_parameters (oauth_params); |
414 | 45 | 33 | ||
415 | 46 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); | 34 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); |
416 | 47 | 35 | ||
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 | 27 | construct | 27 | construct |
422 | 28 | { | 28 | { |
423 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
424 | 30 | oauth_params.insert ("RequestEndpoint", | ||
425 | 31 | "http://api.t.sohu.com/oauth/request_token"); | ||
426 | 32 | oauth_params.insert ("TokenEndpoint", | ||
427 | 33 | "http://api.t.sohu.com/oauth/access_token"); | ||
428 | 34 | oauth_params.insert ("AuthorizationEndpoint", | ||
429 | 35 | "http://api.t.sohu.com/oauth/authorize"); | ||
430 | 36 | oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY); | 30 | oauth_params.insert ("ConsumerKey", Config.SOHU_CONSUMER_KEY); |
431 | 37 | oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET); | 31 | oauth_params.insert ("ConsumerSecret", Config.SOHU_CONSUMER_SECRET); |
432 | 38 | oauth_params.insert ("Callback", "http://www.ubuntu.com/"); | ||
433 | 39 | string[] schemes = { | ||
434 | 40 | "https", | ||
435 | 41 | "http" | ||
436 | 42 | }; | ||
437 | 43 | oauth_params.insert ("AllowedSchemes", schemes); | ||
438 | 44 | set_oauth_parameters (oauth_params); | 32 | set_oauth_parameters (oauth_params); |
439 | 45 | 33 | ||
440 | 46 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); | 34 | set_mechanism (Ap.OAuthMechanism.HMAC_SHA1); |
441 | 47 | 35 | ||
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 | 27 | construct | 27 | construct |
447 | 28 | { | 28 | { |
448 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
449 | 30 | oauth_params.insert ("RequestEndpoint", | ||
450 | 31 | "https://api.twitter.com/oauth/request_token"); | ||
451 | 32 | oauth_params.insert ("TokenEndpoint", | ||
452 | 33 | "https://api.twitter.com/oauth/access_token"); | ||
453 | 34 | oauth_params.insert ("AuthorizationEndpoint", | ||
454 | 35 | "https://api.twitter.com/oauth/authorize"); | ||
455 | 36 | oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY); | 30 | oauth_params.insert ("ConsumerKey", Config.TWITTER_CONSUMER_KEY); |
456 | 37 | oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET); | 31 | oauth_params.insert ("ConsumerSecret", Config.TWITTER_CONSUMER_SECRET); |
457 | 38 | oauth_params.insert ("Callback", "https://wiki.ubuntu.com/"); | ||
458 | 39 | set_oauth_parameters (oauth_params); | 32 | set_oauth_parameters (oauth_params); |
459 | 40 | 33 | ||
460 | 41 | set_mechanism(Ap.OAuthMechanism.HMAC_SHA1); | 34 | set_mechanism(Ap.OAuthMechanism.HMAC_SHA1); |
461 | 42 | 35 | ||
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 | 27 | construct | 27 | construct |
467 | 28 | { | 28 | { |
468 | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); | 29 | var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null); |
469 | 30 | oauth_params.insert ("Host", "login.live.com"); | ||
470 | 31 | oauth_params.insert ("AuthPath", "/oauth20_authorize.srf"); | ||
471 | 32 | oauth_params.insert ("TokenPath", "/oauth20_token.srf"); | ||
472 | 33 | oauth_params.insert ("RedirectUri", "https://login.live.com/oauth20_desktop.srf"); | ||
473 | 34 | oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID); | 30 | oauth_params.insert ("ClientId", Config.WINDOWS_LIVE_CLIENT_ID); |
474 | 35 | oauth_params.insert ("ResponseType", "code"); | ||
475 | 36 | string[] scopes = { | ||
476 | 37 | "wl.messenger", | ||
477 | 38 | "wl.offline_access", | ||
478 | 39 | "wl.emails" | ||
479 | 40 | }; | ||
480 | 41 | oauth_params.insert ("Scope", scopes); | ||
481 | 42 | set_oauth_parameters (oauth_params); | 31 | set_oauth_parameters (oauth_params); |
482 | 43 | set_mechanism(Ap.OAuthMechanism.WEB_SERVER); | 32 | set_mechanism(Ap.OAuthMechanism.WEB_SERVER); |
483 | 44 | } | 33 | } |
FAILED: Continuous integration, rev:92 /code.launchpad .net/~mardy/ account- plugins/ no-hardcoded- data/+merge/ 148856/ +edit-commit- message
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:/
http:// s-jenkins: 8080/job/ account- plugins- ci/21/ s-jenkins: 8080/job/ account- plugins- ci/./build= pbuilder, distribution= raring, flavor= amd64/21/ console s-jenkins: 8080/job/ account- plugins- ci/./build= pbuilder, distribution= raring, flavor= i386/21/ console
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ account- plugins- ci/21// rebuild/?
http://