Merge lp:~mardy/account-plugins/lp1180297 into lp:account-plugins/13.04

[Alberto Mardegan]

Allow Facebook to connect via plain HTTP

Workaround for https://developers.facebook.com/bugs/449221825171392

Allow Facebook to connect via plain HTTP

Workaround for https://developers.facebook.com/bugs/449221825171392

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/account-plugins-13.04-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-13.04-raring-amd64-ci/1

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good, not ideal, but we need to work around the problem with facebook. We did get approval from the security team on bug 1180297

review: Approve

=== modified file 'data/providers/facebook.provider.in.in'
--- data/providers/facebook.provider.in.in	2013-02-25 06:25:34 +0000
+++ data/providers/facebook.provider.in.in	2013-05-27 06:21:28 +0000
@@ -18,6 +18,7 @@
           <setting name="Display">popup</setting>
           <setting name="Scope" type="as">['publish_stream','read_stream','status_update','user_photos','friends_photos','xmpp_login']</setting>
           <setting name="ClientId">@FACEBOOK_CLIENT_ID@</setting>
+          <setting name="AllowedSchemes" type="as">['https','http']</setting>
         </group>
       </group>
     </group>