Commit Graph

244 Commits

Author SHA1 Message Date
Maxim Kukhtenkov
592ea78edc Merge pull request #289 from squallcs12/refactor/allow-VerifyEmailView-work-with-swagger
Make VerifyEmailView display data field in swagger
2016-12-21 11:05:28 -08:00
Maxim Kukhtenkov
5ec3b73dec Merge pull request #284 from Akay7/RussianLanguage
Russian language
2016-12-10 13:52:13 -05:00
Maxim Kukhtenkov
d20a601fdd Merge pull request #286 from Tivix/jwt-serializer-with-custom-user-model
JWT serializer with custom user model
2016-12-09 10:12:52 -05:00
Bang Dao
d2917e9f3f refactor allow VerifyEmailView display data field in swagger 2016-12-09 16:53:09 +07:00
Maxim Kukhtenkov
f200b8d6f0 Remove redundant required=True from serializer fields
`required=True` is default setting
2016-12-07 21:47:07 -05:00
Maxim Kukhtenkov
f79537de77 Update API endpoints docs and docstring
https://github.com/Tivix/django-rest-auth/issues/280
2016-12-07 19:12:01 -05:00
Maxim Kukhtenkov
6812deeeb4 Rename variable for clarity
We have two variables named `token` which have different data types
2016-12-02 16:35:13 -08:00
Maxim Kukhtenkov
f09bbaf877 Merge pull request #283 from DigiCred/master
fix: social login using auth code flow
2016-12-02 16:08:13 -08:00
Maxim Kukhtenkov
ca62f44061 Append more information to comment
Explain why we are defining JWTUserDetailsSerializer in registration/serializers.py instead of getting it from app_settings.py
2016-11-30 20:03:34 -08:00
Maxim Kukhtenkov
42ae22152a Remove dependency on allauth for logout on GET 2016-11-30 17:39:57 -08:00
Ankit Popli
139dd4a4e4
refactor: remove redundant check as suggested by @maxim-kht 2016-11-28 11:42:06 +05:30
Maxim Kukhtenkov
dd6db3563f Allow using custom UserDetailsSerializer with JWTSerializer - update 2016-11-27 17:57:55 -08:00
Maxim Kukhtenkov
7fc875a4f5 Change handling for logout on GET
+ Make it require allauth
+ Add a note to docs that it’s not a recommended setting
2016-11-27 03:37:05 -08:00
Egor Poderyagin
49ddf00d57 update messages in agreement to comment of pull request 2016-11-27 09:38:18 +03:00
Egor Poderyagin
89b48ce053 update language file 2016-11-27 09:25:48 +03:00
Egor Poderyagin
a9c6900e26 Merge branch 'RussianLanguage' of https://github.com/Akay7/django-rest-auth into RussianLanguage 2016-11-27 08:05:30 +03:00
Ankit Popli
4599adf92b
fix: social login using auth code flow
'access_token' in attrs always returns True, we need to check whether
the token is empty or not
2016-11-25 20:33:43 +05:30
Maxim Kukhtenkov
a907efc06b Allow using custom UserDetailsSerializer with JWTSerializer 2016-10-31 20:45:33 -07:00
Maxim Kukhtenkov
70d03e3e9b Update docstring for UserDetailsView and cleanup 2016-10-31 20:17:31 -07:00
Maxim Kukhtenkov
37375461df Add info to docs and comments
+ Add comments by @chubz regarding django-allauth hmac pattern from PR #233
+ Cleanup
2016-10-24 14:23:44 -07:00
Maxim Kukhtenkov
35fe1ae590 Return pk in /rest-auth/user/ instead of id 2016-10-17 10:27:03 -07:00
Maxim Kukhtenkov
e662736e4a Merge pull request #256 from briva/patch-1
Return ID user on /rest-auth/user/
2016-10-17 10:26:22 -07:00
Maxim Kukhtenkov
83e200e576 Revert "allows registration throttle control" 2016-10-17 10:11:04 -07:00
Le Pogam Brivael
f793447bae Return ID user on /rest-auth/user/ 2016-09-05 12:44:17 +02:00
Poderyagin Egor
2546b17067 fix import allauth error 2016-08-12 10:46:25 +03:00
Poderyagin Egor
2d54117863 added russian language 2016-08-01 07:51:44 +03:00
mario
9df528f482 Changed confirm email url path + test fixes 2016-07-28 20:14:26 +02:00
mariodev
0ffc573482 Merge pull request #209 from vsevolod-kolchinsky/patch-1
allows registration throttle control
2016-07-18 08:14:11 +02:00
mariodev
c5e0382d25 Increased test coverage (#229)
* Added twitter login test

* pep8

* Fixes missing backend attr issue

* Refactored login process

* pep8

* Added more tests for twitter social login
2016-07-18 07:06:28 +02:00
mariodev
c4e7bdc77f pep8 2016-06-28 20:20:53 +02:00
mariodev
8a004bb48a Increased test coverage
+ minor fixes
2016-06-28 20:14:05 +02:00
vsevolod kolchinsky
2a0fa1ab4e allows registration throttle control 2016-05-05 09:03:34 +03:00
mariodev
3189a5c7a0 Merge pull request #187 from marsam/master
Capture OAuthError in TwitterLoginSerializer
2016-04-14 19:08:18 +02:00
mariodev
5e4d85bca9 Merge pull request #191 from EnTeQuAk/bugfix/fix-social-login-test
Fix social-adatper tests for allauth>=0.25.0
2016-04-14 17:15:16 +02:00
Girish
22667230bb passing on the context/request to serializer 2016-04-14 12:54:50 +01:00
mariuccio
f9b6a6cd9f 'detail' keyword in success response messages 2016-03-31 10:58:14 +02:00
Christopher Grebs
50087549e8 Fix social-adatper tests for allauth>=0.25.0
See 742d114abf for more details.

This unfortunately requires bumping up the version to 0.25.0
2016-03-14 13:20:24 +01:00
Maxim Kukhtenkov
e8cd780ae2 Remove unreachable code in LogoutView 2016-03-07 18:21:11 -05:00
Mario Rodas
0737da0077 Capture OAuthError in TwitterLoginSerializer 2016-03-02 15:00:26 -05:00
Mario Rodas
86a487fe21 Import allauth.socialaccount only when declared in INSTALLED_APPS
Don't silently ignore ImportError
2016-03-02 14:37:27 -05:00
Maciej Jaworski
e3fc4e64e9 Merge pull request #178 from jasinai/UnignoreMoFiles
Unignore mo files
2016-03-01 12:00:57 +00:00
mjaworski
2572475971 fixed code quality 2016-03-01 11:51:01 +00:00
mariodev
eda3d7b6d2 Merge pull request #168 from Haos616/master
Fixed errors messages for PasswordResetSerializer
2016-02-29 21:56:16 +01:00
Jon Gregorowicz
4ba9841bc5 Merge changes 2016-02-29 08:01:39 -05:00
Jon Gregorowicz
1eb4b45e50 Fixing tests 2016-02-29 07:57:54 -05:00
Jon Gregorowicz
85c2fe4661 Merge branch 'master' into jwt-support 2016-02-29 07:48:37 -05:00
Jon Gregorowicz
e3901516cb Merge branch 'master' into jwt-support
# Conflicts:
#	docs/changelog.rst
#	rest_auth/registration/views.py
2016-02-29 07:45:43 -05:00
Andreas Bissinger
9a0cbc81eb typo fix 2016-02-29 12:53:08 +01:00
mariodev
ef56efc0c8 Merge pull request #152 from caruccio/logout-on-get
Allow logout on GET
2016-02-26 13:38:01 +01:00
Nicola Hauke
340f0651c9 Adds the german mo file 2016-02-23 18:27:29 +01:00
Maciej Jaworski
b6dfd69009 Merge pull request #177 from tevinjoseph/master
fixed pep8 error in social_serializers
2016-02-23 13:27:01 +00:00
Tevin Joseph K O
b2edfffc91 fixed pep8 error in social_serializers
fixed pep8 error in social_serializers which cause documentation build error
2016-02-23 17:52:44 +05:30
Maciej Jaworski
b6e991e787 Merge pull request #154 from tevinjoseph/master
Added a Serializer for Twitter oauth
2016-02-23 12:04:38 +00:00
Maciej Jaworski
aa839f97d2 Added missing import 2016-02-23 10:59:47 +00:00
Maciej Jaworski
1a0ab4488e Merge pull request #165 from jasinai/AddTranslation
Adds ugettext_lazy to more texts
2016-02-23 10:55:42 +00:00
Maciej Jaworski
3bcabe6b17 Update serializers.py
pepfix
2016-02-23 10:35:41 +00:00
Poderyagin Egor
cc9552adda update for accept login users of CustomUserModel objects where doesn't exist username field and setted USERNAME_FIELD property 2016-02-17 08:35:47 +03:00
Jon Gregorowicz
511329c30a Fixing merge tool induced file endings 2016-02-16 00:49:41 -05:00
Jon Gregorowicz
8b5e5173d0 Added newline to pip file 2016-02-16 00:43:19 -05:00
Jon Gregorowicz
e3a1ba520e Added tests for JWT, fixed merge issues 2016-02-16 00:42:18 -05:00
Jon Gregorowicz
f8a9cc152d Merge branch 'master' into jwt-support
# Conflicts:
#	docs/configuration.rst
#	rest_auth/registration/views.py
#	rest_auth/tests/test_api.py
#	rest_auth/utils.py
#	rest_auth/views.py
2016-02-15 23:35:32 -05:00
Haos616
dae38d4e10 Fixed errors messages for PasswordResetSerializer
Fixed errors messages for PasswordResetSerializer
2016-02-10 18:45:32 +02:00
mariodev
7c8a34f700 Merge pull request #132 from asudoma/master
fix import complete_social_login
2016-02-08 08:12:52 +01:00
Nicola Hauke
152b0a6fb6 Adds ugettext_lazy to more texts
Also adds a first german translation.
2016-02-02 15:29:16 +01:00
mariodev
00415301d6 Merge pull request #145 from mdentremont/topic/131
#131: Do not raise 400 when resetting password for non-existing account
2016-01-14 23:53:31 +01:00
mario
7e85667208 Made e-mail options more extendible for PasswordResetSerializer 2016-01-14 23:42:02 +01:00
Tevin Joseph K O
1af16ae7ba Added a Serializer for Twitter oauth
Added a serializer for twitter OAuth to work. If you are not using this it will cause an error ('TwitterOAuthAdapter' object has no attribute 'parse_token'). It happens because method parse_token() is implemented in OAuth2Adapter, but Twitter uses OAuth 1.0, so TwitterOAuthAdapter inherits from OAuthAdapter, which doesn't have parse_token() method. Example usage is given below:

class TwitterLogin(LoginView):
    serializer_class = TwitterLoginSerializer
    adapter_class = TwitterOAuthAdapter
2016-01-13 12:43:12 +05:30
mario
ae8a26b708 Return token only when verification is mandatory 2016-01-11 22:33:14 +01:00
Mateus Caruccio
70a4dc9a13 Allow logout on GET 2016-01-09 01:11:35 -02:00
Mateus Caruccio
ccc261d57f Merge branch 'master' of https://github.com/Tivix/django-rest-auth 2016-01-07 19:56:33 -02:00
mariodev
334a29c4d9 Merge pull request #151 from Tivix/pr/130
Refactored registration logic
2016-01-06 18:26:47 +01:00
mariodev
d63232224e Merge pull request #150 from Tivix/pr/141
Ability to login using e-mail (without allauth)
2016-01-06 18:16:51 +01:00
mario
54eb54ad65 Cleaned up LoginSerializer codebase 2016-01-06 01:18:13 +01:00
mario
b12ed79bb1 Merge branch 'master' into pr/141 2016-01-05 22:32:38 +01:00
Tabatha Memmott
55fb36ec91 url change for tests 2016-01-05 11:46:01 -08:00
Tabatha Memmott
29669be296 Merge branch 'master' into developDemo 2016-01-05 08:08:17 -08:00
mario
073dd3e765 Fixed flake8 warnings 2016-01-05 15:09:31 +01:00
mario
99c4dc9d05 Brought back pass verification + added test 2016-01-05 14:56:11 +01:00
Tabatha Memmott
0e3fb4a5c9 closes PR #134 and adds same syntax to demo 2016-01-04 16:29:47 -08:00
Jon Gregorowicz
19e234d1dc * Added support for REST_USE_JWT
* Added JWTSerializer
* Added JWT encoding support, based on django-rest-framework-jwt
* Tests for JWT authentication
2016-01-04 12:45:33 -05:00
Matt d'Entremont
d36a9bc1cb #131: Do not raise 400 when resetting password for non-existing account
- Do not raises validation error if email doesn't exist
- Update unit test
2016-01-04 10:17:47 -04:00
Mateus Caruccio
c9d55f768c Add support for custom Token model 2016-01-02 15:59:06 -02:00
mario
ec91620550 Merge branch 'master' into pr/130 2016-01-02 17:32:40 +01:00
mariodev
4a56a9e7e5 Merge pull request #140 from Akay7/TestResetPass
Test reset pass
2015-12-22 11:57:01 +01:00
mario
4c8db510b0 Fixed test exception. 2015-12-22 09:28:35 +01:00
ron8mcr
f848c8b6fa Merge remote-tracking branch 'Tivix/django-rest-auth/master' 2015-12-15 17:06:47 +07:00
Poderyagin Egor
bb2fb65f7d Auth by email 2015-12-13 23:43:33 +03:00
Poderyagin Egor
a93b7f5cec Added test case for reset by email in different case 2015-12-13 22:24:27 +03:00
Poderyagin Egor
9b7ede752b Make email in password reset serializer Case unsensetive 2015-12-10 18:13:28 +06:00
mario
72062408aa Reorganized test files 2015-12-04 09:32:03 +01:00
anyone_j
cc963ca1a1 fix import complete_social_login 2015-11-26 14:38:25 +05:00
ron8mcr
52f04ba224 Update tests and fix register serializer 2015-11-24 22:04:57 +07:00
ron8mcr
65b29d3515 None as success_url for complete_signup in RegisterView 2015-11-24 21:16:39 +07:00
ron8mcr
30fd6414ce Explict Allow Any for register view 2015-11-24 21:07:20 +07:00
Roman Gorbil
10ae7acac9 Rewrite registration logic 2015-11-24 17:11:46 +07:00
mario
f3151ad5c0 Fixed try/catch in logout view 2015-11-23 22:52:59 +01:00
mario
d9b8f3faf6 Added non existing e-mail validation on password reset
+ small cleanup
2015-11-23 22:17:32 +01:00
ron8mcr
fac959ea80 raise_exception=True for views 2015-11-23 21:04:56 +07:00
mario
6ace9de268 Compatibility updates
+ removed some legacy code
+ added force_text for py3 support
2015-11-19 09:38:57 +01:00
Mateusz Sikora
315f6f2844 Merge pull request #118 from mdentremont/topic/py3-fix
Alter a statement to make it python3 compatible
2015-11-06 15:16:07 +01:00