From: Matías Aguirre Date: Sat, 28 Apr 2012 08:52:34 +0000 (-0300) Subject: Merge remote-tracking branch 'niQo/master' X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8598de24abf3d6aa283a460d34da3ed22e3b77c3;p=django-social-auth.git Merge remote-tracking branch 'niQo/master' Conflicts: README.rst doc/backends/index.rst doc/configuration.rst doc/intro.rst --- 8598de24abf3d6aa283a460d34da3ed22e3b77c3 diff --cc README.rst index acd247b,d60bc6e..9a7b206 --- a/README.rst +++ b/README.rst @@@ -44,8 -44,7 +44,9 @@@ credentials, some features are * `GitHub OAuth`_ * `Dropbox OAuth`_ * `Flickr OAuth`_ + * `Vkontakte OAuth`_ + * `MSN Live Connect OAuth2`_ + * `Skyrock OAuth`_ - Basic user data population and signaling, to allows custom fields values from providers response @@@ -120,10 -119,8 +121,11 @@@ Configuratio 'social_auth.backends.contrib.dropbox.DropboxBackend', 'social_auth.backends.contrib.flickr.FlickrBackend', 'social_auth.backends.contrib.instagram.InstagramBackend', + 'social_auth.backends.contrib.vkontakte.VkontakteBackend', + 'social_auth.backends.contrib.skyrock.SkyrockBackend', 'social_auth.backends.OpenIDBackend', + 'social_auth.backends.contrib.bitbucket.BitbucketBackend', + 'social_auth.backends.contrib.live.LiveBackend', 'django.contrib.auth.backends.ModelBackend', ) @@@ -157,12 -154,8 +159,14 @@@ FLICKR_API_SECRET = '' INSTAGRAM_CLIENT_ID = '' INSTAGRAM_CLIENT_SECRET = '' + VK_APP_ID = '' + VK_API_SECRET = '' + BITBUCKET_CONSUMER_KEY = '' + BITBUCKET_CONSUMER_SECRET = '' + LIVE_CLIENT_ID = '' + LIVE_CLIENT_SECRET = '' + SKYROCK_CONSUMER_KEY = '' + SKYROCK_CONSUMER_SECRET = '' - Setup login URLs:: @@@ -921,47 -811,19 +925,60 @@@ Instagram uses OAuth v2 for Authenticat a single ``/associate`` url which takes a ``?complete=true`` parameter for the cases when you want to complete rather than associate. +Vkontakte +^^^^^^^^^ + +Vkontakte uses OAuth v2 for Authentication + +- Register a new application at the `Vkontakte API`_, and + +- fill ``App Id`` and ``Api Secret`` values in the settings:: + + VK_APP_ID = '' + VK_API_SECRET = '' + +- Define VK_EXTRA_DATA to pass extra fields when gathering the user profile data, like:: + + VK_EXTRA_DATA = 'photo,country' + +- Also it's possible to define extra permissions with:: + + VK_EXTRA_SCOPE = [...] + + See the `names of the privileges VKontakte`_. + +MSN Live Connect +^^^^^^^^^^^^^^^^ + +OAuth2 based Live Connect workflow, notice that it isn't OAuth WRAP. + +- Register a new application at `Live Connect Developer Center`_, set your site domain as + redirect domain, + +- Fill ``Client Id`` and ``Client Secret`` values in the settings:: + + LIVE_CLIENT_ID = '' + LIVE_CLIENT_SECRET = '' + +- Also it's possible to define extra permissions with:: + + LIVE_EXTENDED_PERMISSIONS = [...] + + Defaults are "wl.basic" and "wl.emails". Latter one is necessary to retrieve user email. + + Skyrock + ^^^^^^^ + + Skyrock offers per application keys named ``Consumer Key`` and ``Consumer Secret``. + To enable Skyrock these two keys are needed. Further documentation at + `Skyrock API Documentation`_: + + - Register a new application at `Skyrock App Creation`_, + + - fill ``Consumer Key`` and ``Consumer Secret`` values:: + + SKYROCK_CONSUMER_KEY + SKYROCK_CONSUMER_SECRET Testing ------- @@@ -1148,10 -986,10 +1165,14 @@@ Attributions to whom deserves - Instagram support +- andrusha_ (Andrew Korzhuev) + + - MSN Live Connect support + + - niQo_ (Nicolas Quiénot) + + - Skyrock.com support + Copyrights ---------- @@@ -1215,7 -1053,7 +1236,8 @@@ Base work is copyrighted by .. _Quard: https://github.com/Quard .. _micrypt: https://github.com/micrypt .. _r4vi: https://github.com/r4vi +.. _andrusha: https://github.com/andrusha + .. _niQo: https://github.com/niQo .. _South: http://south.aeracode.org/ .. _bedspax: https://github.com/bedspax .. _django-social-auth: https://github.com/omab/django-social-auth @@@ -1236,11 -1074,6 +1258,14 @@@ .. _BrowserID: https://browserid.org .. _Instagram API: http://instagr.am/developer/ .. _django-social-auth discussion list: https://groups.google.com/group/django-social-auth +.. _Twitter OAuth keys: https://dev.twitter.com/docs/auth/authorizing-request +.. _Vkontakte OAuth: http://vk.com/developers.php?oid=-1&p=%D0%90%D0%B2%D1%82%D0%BE%D1%80%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F_%D1%81%D0%B0%D0%B9%D1%82%D0%BE%D0%B2 +.. _names of the privileges VKontakte: http://vk.com/developers.php?oid=-1&p=%D0%9F%D1%80%D0%B0%D0%B2%D0%B0_%D0%B4%D0%BE%D1%81%D1%82%D1%83%D0%BF%D0%B0_%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B9 +.. _Vkontakte API: http://vk.com/developers.php +.. _MSN Live Connect OAuth2: http://msdn.microsoft.com/en-us/library/live/hh243647.aspx +.. _Live Connect Developer Center: https://manage.dev.live.com/Applications/Index +.. _StackOverflow: http://stackoverflow.com/questions/9835506/urllib-urlopen-works-on-sslv3-urls-with-python-2-6-6-on-1-machine-but-not-wit +.. _#315: https://github.com/omab/django-social-auth/issues/315 + .. _Skyrock OAuth: http://www.skyrock.com/developer/ + .. _Skyrock App Creation: https://www.skyrock.com/developer/application/ + .. _Skyrock API Documentation: http://www.skyrock.com/developer/documentation/ diff --cc doc/backends/index.rst index 4053ab3,32dfdfb..8660467 --- a/doc/backends/index.rst +++ b/doc/backends/index.rst @@@ -8,15 -8,11 +8,16 @@@ Contents openid oauth - google twitter facebook + google linkedin github + bitbucket + dropbox + flickr browserid instagram - skyrock + vkontakte + live ++ skyrock diff --cc doc/configuration.rst index dff894c,78e6fcf..34259c9 --- a/doc/configuration.rst +++ b/doc/configuration.rst @@@ -23,8 -23,7 +23,9 @@@ Configuratio 'social_auth.backends.contrib.orkut.OrkutBackend', 'social_auth.backends.contrib.foursquare.FoursquareBackend', 'social_auth.backends.contrib.github.GithubBackend', + 'social_auth.backends.contrib.vkontakte.VkontakteBackend', + 'social_auth.backends.contrib.live.LiveBackend', + 'social_auth.backends.contrib.skyrock.SkyrockBackend', 'social_auth.backends.OpenIDBackend', 'django.contrib.auth.backends.ModelBackend', ) @@@ -51,10 -50,8 +52,12 @@@ GOOGLE_OAUTH2_CLIENT_SECRET = '' FOURSQUARE_CONSUMER_KEY = '' FOURSQUARE_CONSUMER_SECRET = '' + VK_APP_ID = '' + VK_API_SECRET = '' + LIVE_CLIENT_ID = '' + LIVE_CLIENT_SECRET = '' + SKYROCK_CONSUMER_KEY = '' + SKYROCK_CONSUMER_SECRET = '' - Setup login URLs:: diff --cc doc/intro.rst index f803028,f38b06e..576daab --- a/doc/intro.rst +++ b/doc/intro.rst @@@ -31,8 -31,7 +31,9 @@@ credentials, some features are * `LiveJournal OpenID`_ * `Orkut OAuth`_ * `Linkedin OAuth`_ + * `Vkontakte OAuth`_ + * `MSN Live Connect OAuth2`_ + * `Skyrock OAuth`_ - Basic user data population and signaling, to allows custom fields values from providers response @@@ -58,5 -57,4 +59,6 @@@ .. _Orkut OAuth: http://code.google.com/apis/orkut/docs/rest/developers_guide_protocol.html#Authenticating .. _myOpenID: https://www.myopenid.com/ .. _LiveJournal OpenID: http://www.livejournal.com/support/faqbrowse.bml?faqid=283 +.. _Vkontakte OAuth: http://vk.com/developers.php?oid=-1&p=%D0%90%D0%B2%D1%82%D0%BE%D1%80%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F_%D1%81%D0%B0%D0%B9%D1%82%D0%BE%D0%B2 +.. _MSN Live Connect OAuth2: http://msdn.microsoft.com/en-us/library/live/hh243647.aspx + .. _Skyrock OAuth: http://www.skyrock.com/developer/ diff --cc example/settings.py index 9ccca23,768e44c..a9d30b1 --- a/example/settings.py +++ b/example/settings.py @@@ -75,12 -75,9 +75,13 @@@ AUTHENTICATION_BACKENDS = 'social_auth.backends.google.GoogleBackend', 'social_auth.backends.yahoo.YahooBackend', 'social_auth.backends.contrib.linkedin.LinkedinBackend', + 'social_auth.backends.contrib.skyrock.SkyrockBackend', 'social_auth.backends.contrib.flickr.FlickrBackend', 'social_auth.backends.contrib.instagram.InstagramBackend', + 'social_auth.backends.contrib.github.GithubBackend', + 'social_auth.backends.contrib.vkontakte.VkontakteBackend', + 'social_auth.backends.contrib.yandex.YandexBackend', + 'social_auth.backends.contrib.yandex.YaruBackend', 'social_auth.backends.OpenIDBackend', 'social_auth.backends.contrib.livejournal.LiveJournalBackend', 'social_auth.backends.browserid.BrowserIDBackend',