Commit 44dc676d authored by Pierre-Elliott Bécue's avatar Pierre-Elliott Bécue

New upstream version 0.39.1

parent b9099ef6
......@@ -13,12 +13,12 @@ Agustin Perez Paladini
Ahmet Emre Aladağ
Aldiantoro Nugroho
Alexander Gaevsky
Anna Sirota
Andrean Franc
Andrey Balandin
Andrey Akolpakov
Andrey Balandin
Andy Matthews
Ani Vera
Anna Sirota
Antonin Delpeuch
Aron Griffis
Basil Shubin
......@@ -33,6 +33,7 @@ Christopher Grebs
Daniel Eriksson
Daniel Widerin
David Ascher
David Cain
David Evans
David Friedman
Egor Poderyagin
......@@ -58,6 +59,7 @@ Jannis Leidel
Jannis Vajen
Jeff Triplett
Jerome Leclanche
Jiyoon Ha
Joe Vanderstelt
John Bazik
John Whitlock
......@@ -88,9 +90,9 @@ Mauro Stettler
Morgante Pell
Nariman Gharib
Niklas A Emanuelsson
Pavel Savchenko
Patrick Paul
Paulo Eduardo Neves
Pavel Savchenko
Peter Bittner
Peter Rowlands
Peter Stein
......@@ -111,14 +113,15 @@ Serafeim Papastefanos
Shane Rice
Stuart Ross
Terry Jones
Tiago Loureiro
Tomas Babej
Tomas Marcik
Tuk Bredsdorff
Udi Oron
Vuong Nguyen
Volodymyr Yatsyk
Vuong Nguyen
Wendy Edwards
Will Ross
William Li
Yuri Kriachko
Yaroslav Muravsky
Yuri Kriachko
\ No newline at end of file
0.39.1 (2019-02-28)
*******************
Note worthy changes
-------------------
- The ``linkedin_oauth2`` provider now gracefully deals with old V1
data that might still be present in ``SocialAccount.extra_data``.
0.39.0 (2019-02-26)
*******************
Note worthy changes
-------------------
- New providers: JupyterHub (OAuth2), Steam (OpenID)
- Refactor translations: Portuguese (Portugal).
- Add testing for Django 2.2 (no code changes required)
Backwards incompatible changes
------------------------------
- ``linkedin_oauth2``: As the LinkedIn V1 API is deprecated, the user info
endpoint has been moved over to use the API V2. The format of the user
``extra_data`` is different and the profile picture is absent by default.
0.38.0 (2018-10-03)
*******************
......
Metadata-Version: 1.1
Name: django-allauth
Version: 0.38.0
Version: 0.39.1
Summary: Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication.
Home-page: http://github.com/pennersr/django-allauth
Author: Raymond Penners
Author-email: raymond.penners@intenct.nl
License: UNKNOWN
Description-Content-Type: UNKNOWN
Description: ==========================
Welcome to django-allauth!
==========================
......@@ -111,3 +110,4 @@ Classifier: Framework :: Django
Classifier: Framework :: Django :: 1.11
Classifier: Framework :: Django :: 2.0
Classifier: Framework :: Django :: 2.1
Classifier: Framework :: Django :: 2.2
......@@ -8,7 +8,7 @@ r"""
"""
VERSION = (0, 38, 0, 'final', 0)
VERSION = (0, 39, 1, 'final', 0)
__title__ = 'django-allauth'
__version_info__ = VERSION
......@@ -16,4 +16,4 @@ __version__ = '.'.join(map(str, VERSION[:3])) + ('-{}{}'.format(
VERSION[3], VERSION[4] or '') if VERSION[3] != 'final' else '')
__author__ = 'Raymond Penners'
__license__ = 'MIT'
__copyright__ = 'Copyright 2010-2018 Raymond Penners and contributors'
__copyright__ = 'Copyright 2010-2019 Raymond Penners and contributors'
......@@ -47,7 +47,7 @@ class AuthenticationBackend(ModelBackend):
# Even though allauth will pass along `email`, other apps may
# not respect this setting. For example, when using
# django-tastypie basic authentication, the login is always
# passed as `username`. So let's place nice with other apps
# passed as `username`. So let's play nice with other apps
# and use username as fallback
email = credentials.get('email', credentials.get('username'))
if email:
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2016-01-19 19:32+0100\n"
"Last-Translator: David D Lowe <daviddlowe.flimm@gmail.com>\n"
"Language-Team: Arabic\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.35\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-04-17 16:52+0200\n"
"Last-Translator: Beda Kosata <beda.kosata@gmail.com>\n"
"Language-Team: Czech <>\n"
......
......@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-09-03 14:25+0200\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-09-03 16:04+0200\n"
"Last-Translator: b'Tuk Bredsdorff <tukodeb@gmail.com>'\n"
"Language-Team: \n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Last-Translator: b'Tuk Bredsdorff <tukodeb@gmail.com>'\n"
"Language-Team: \n"
"X-Generator: Poedit 2.1.1\n"
#: account/adapter.py:45
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2017-11-04 16:22+0100\n"
"Last-Translator: Jannis Vajen <jvajen@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:29+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -552,7 +552,7 @@ msgstr "Επιβεβαιωτικό e-mail στάλθηκε στο %(email)s."
#: templates/account/messages/email_confirmed.txt:2
#, python-format
msgid "You have confirmed %(email)s."
msgstr "Έχετε επιβαβαιώσει το %(email)s."
msgstr "Έχετε επιβεβαιώσει το %(email)s."
#: templates/account/messages/email_deleted.txt:2
#, python-format
......@@ -723,7 +723,7 @@ msgid ""
"verification. Please click on the link inside this e-mail. Please\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Σαςστείλαμε ένα e-mail\n"
"Σας στείλαμε ένα e-mail\n"
"για επιβεβαίωση. Παρακαλούμε ακολουθήστε τη σύνδεση που περιέχει. \n"
"Παρακαλούμε επικοινωνήστε μαζί μας αν δε το λάβετε εντός λίγων λεπτών."
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-02-14 17:46-0600\n"
"Last-Translator: Jannis Š\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-28 20:53+0200\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-08-29 08:16+0200\n"
"Last-Translator: Eneko Illarramendi <eneko@illarra.com>\n"
"Language-Team: Basque <translate@tropela.eus>\n"
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2015-08-13 15:17+0300\n"
"Last-Translator: Anonymous User <seppo.erviala@iki.fi>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2016-10-06 15:16+0200\n"
"Last-Translator: Steve Kossouho <steve.kossouho@yahoo.fr>\n"
"Language-Team: français <>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2017-08-26 16:11+0300\n"
"Last-Translator: Udi Oron <udioron@gmail.com>\n"
"Language-Team: Hebrew\n"
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:31+0200\n"
"Last-Translator: <goran.cetusic@gmail.com>\n"
"Language-Team: Bojan Mihelac <bmihelac@mihelac.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2015-05-08 22:42+0100\n"
"Last-Translator: Tamás Makó <tom@greenplug.hu>\n"
"Language-Team: \n"
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-03-08 00:40+0100\n"
"Last-Translator: joke2k <joke2k@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:32+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2016-07-20 22:24+0600\n"
"Last-Translator: Murat Jumashev <jumasheff at gmail dot com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2016-07-25 15:18+0200\n"
"Last-Translator: pennersr <raymond.penners@intenct.nl>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"PO-Revision-Date: 2016-12-05 10:43+0100\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2018-10-04 02:18+0200\n"
"Last-Translator: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
"Language-Team: \n"
"Language: pl\n"
......@@ -292,7 +292,7 @@ msgstr "Tokeny aplikacji społecznościowych"
#: socialaccount/providers/douban/views.py:36
msgid "Invalid profile data"
msgstr ""
msgstr "Nieprawidłowe dane profilu"
#: socialaccount/providers/oauth/client.py:78
#, python-format
......@@ -390,15 +390,7 @@ msgid "Do you really want to remove the selected e-mail address?"
msgstr "Czy naprawdę chcesz usunąć wybrany adres e-mail?"
#: templates/account/email/email_confirmation_message.txt:1
#, fuzzy, python-format
#| msgid ""
#| "Hello from %(site_name)s!\n"
#| "\n"
#| "You're receiving this e-mail because user %(user_display)s at "
#| "%(site_domain)s has given yours as an e-mail address to connect their "
#| "account.\n"
#| "\n"
#| "To confirm this is correct, go to %(activate_url)s\n"
#, python-format
msgid ""
"Hello from %(site_name)s!\n"
"\n"
......@@ -407,12 +399,12 @@ msgid ""
"\n"
"To confirm this is correct, go to %(activate_url)s\n"
msgstr ""
"Witam w imieniu%(site_name)s!\n"
"Witam w imieniu %(site_name)s!\n"
"\n"
"Otrzymujesz ten e-mail ,ponieważ użytkownik %(user_display)s na "
"%(site_domain)s podał niniejszy adres e-mail, aby powiązać z swoim kontem.\n"
"Otrzymujesz ten e-mail, ponieważ użytkownik %(user_display)s podał niniejszy "
"adres e-mail, aby powiązać z swoim kontem.\n"
"\n"
"Jeżeli to prawda. Kliknij, aby go aktywować %(activate_url)s \n"
"Aby to potwierdzić, kliknij w link %(activate_url)s \n"
#: templates/account/email/email_confirmation_message.txt:7
#, python-format
......@@ -428,14 +420,7 @@ msgid "Please Confirm Your E-mail Address"
msgstr "Proszę potwierdź adres e-mail"
#: templates/account/email/password_reset_key_message.txt:1
#, fuzzy, python-format
#| msgid ""
#| "Hello from %(site_name)s!\n"
#| "\n"
#| "You're receiving this e-mail because you or someone else has requested a "
#| "password for your user account at %(site_domain)s.\n"
#| "It can be safely ignored if you did not request a password reset. Click "
#| "the link below to reset your password."
#, python-format
msgid ""
"Hello from %(site_name)s!\n"
"\n"
......@@ -447,7 +432,7 @@ msgstr ""
"Witam z %(site_name)s!\n"
"\n"
"Otrzymujesz tą wiadomość, ponieważ Ty lub ktoś inny zażądał zresetowania "
"hasła do Twojego konta na stronie %(site_domain)s.\n"
"hasła do Twojego konta\n"
"Niniejszą wiadomość możesz spokojnie zignorować, jeżeli nie żądałeś "
"zresetowania hasła. Kliknij w link poniżej, aby zresetować hasło."
......
......@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-12-01 01:20+0000\n"
"Last-Translator: cacarrara <caiocarrara@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
......
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2017-04-05 22:48+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2017-04-26 12:48+0200\n"
"Last-Translator: Tomas Babej <tomasbabej@gmail.com>\n"
"Language-Team: \n"
......
This diff is collapsed.
This diff is collapsed.
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:35+0200\n"
"Last-Translator: Jannis Š\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2015-06-26 13:09+0700\n"
"Last-Translator: Nattaphoom Chaipreecha <attomos@gmail.com>\n"
"Language-Team: Thai <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:35+0200\n"
"Last-Translator: Jannis Š\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/django-allauth/"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:36+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:36+0200\n"
"Last-Translator: jresins <jresins@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 05:00-0500\n"
"POT-Creation-Date: 2019-02-26 12:47-0600\n"
"PO-Revision-Date: 2014-08-12 00:36+0200\n"
"Last-Translator: jresins <jresins@gmail.com>\n"
"Language-Team: Chinese (Traditional)\n"
......
......@@ -26,8 +26,9 @@ class AgaveProvider(OAuth2Provider):
def extract_common_fields(self, data):
return dict(
email=data.get('email'),
username=data.get('username'),
name=(data.get('first_name') + ' ' + data.get('last_name')),
username=data.get('username', ''),
name=((data.get('first_name', '') + ' ' +
data.get('last_name', '')).strip()),
)
def get_default_scope(self):
......
import requests
from allauth.socialaccount import app_settings
from allauth.socialaccount.providers.agave.provider import AgaveProvider
from allauth.socialaccount.providers.oauth2.views import (
OAuth2Adapter,
......@@ -10,10 +11,9 @@ from allauth.socialaccount.providers.oauth2.views import (
class AgaveAdapter(OAuth2Adapter):
provider_id = AgaveProvider.id
provider_default_url = 'https://public.agaveapi.co/'
provider_api_version = 'v2'
provider_base_url = 'https://public.agaveapi.co'
settings = app_settings.PROVIDERS.get(provider_id, {})
provider_base_url = settings.get("API_URL", 'https://public.agaveapi.co')
access_token_url = '{0}/token'.format(provider_base_url)
authorize_url = '{0}/authorize'.format(provider_base_url)
......@@ -26,9 +26,13 @@ class AgaveAdapter(OAuth2Adapter):
'Authorization': 'Bearer ' + token.token,
})
user_profile = extra_data.json()['result'] \
if 'result' in extra_data.json() \
else {}
return self.get_provider().sociallogin_from_response(
request,
extra_data.json()['result']
user_profile
)
......
......@@ -104,12 +104,6 @@ class BattleNetOAuth2Adapter(OAuth2Adapter):
return "https://www.battlenet.com.cn"
return "https://%s.battle.net" % (region)
@property
def battlenet_api_url(self):
if self.battlenet_region == "cn":
return "https://api.battlenet.com.cn"
return "https://%s.api.battle.net" % (self.battlenet_region)
@property
def access_token_url(self):
return self.battlenet_base_url + "/oauth/token"
......@@ -120,7 +114,7 @@ class BattleNetOAuth2Adapter(OAuth2Adapter):
@property
def profile_url(self):
return self.battlenet_api_url + "/account/user"
return self.battlenet_base_url + "/oauth/userinfo"
def complete_login(self, request, app, token, **kwargs):
params = {"access_token": token.token}
......
from allauth.socialaccount.providers.base import ProviderAccount
from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
class JupyterHubAccount(ProviderAccount):
def to_str(self):
dflt = super(JupyterHubAccount, self).to_str()
return self.account.extra_data.get('name', dflt)
class JupyterHubProvider(OAuth2Provider):
id = 'jupyterhub'
name = 'JupyterHub'
account_class = JupyterHubAccount
def extract_uid(self, data):
return str(data.get('name'))
def extract_common_fields(self, data):
return dict(
name=data.get('name', '')
)
provider_classes = [JupyterHubProvider]
from allauth.socialaccount.tests import OAuth2TestsMixin
from allauth.tests import MockedResponse, TestCase
from .provider import JupyterHubProvider
class JupyterHubTests(OAuth2TestsMixin, TestCase):
provider_id = JupyterHubProvider.id
def get_mocked_response(self):
return MockedResponse(200, """
{
"kind": "user",
"name": "abc",
"admin": false,
"groups": [],
"server": null,
"pending": null,
"created": "2016-12-06T18:30:50.297567Z",
"last_activity": "2017-02-07T17:29:36.470236Z",
"servers": null}
""")
from allauth.socialaccount.providers.jupyterhub.provider import (
JupyterHubProvider,
)
from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
urlpatterns = default_urlpatterns(JupyterHubProvider)
import requests
from allauth.socialaccount import app_settings
from allauth.socialaccount.providers.jupyterhub.provider import (
JupyterHubProvider,
)
from allauth.socialaccount.providers.oauth2.views import (
OAuth2Adapter,
OAuth2CallbackView,
OAuth2LoginView,
)
class JupyterHubAdapter(OAuth2Adapter):
provider_id = JupyterHubProvider.id
settings = app_settings.PROVIDERS.get(provider_id, {})
provider_base_url = settings.get("API_URL", '')
access_token_url = '{0}/hub/api/oauth2/token'.format(provider_base_url)
authorize_url = '{0}/hub/api/oauth2/authorize'.format(provider_base_url)
profile_url = '{0}/hub/api/user'.format(provider_base_url)
def complete_login(self, request, app, access_token, **kwargs):
headers = {
'Authorization': 'Bearer {0}'.format(access_token)
}
extra_data = requests.get(self.profile_url, headers=headers)
user_profile = extra_data.json()
return self.get_provider().sociallogin_from_response(
request,
user_profile