Commit Graph

425 Commits

Author SHA1 Message Date
Daniel Stanton
053be68cdc Removed blank line 2017-01-25 12:39:54 +00:00
Daniel Stanton
fab9a7baa7 Try/except Knox Logout 2017-01-25 12:24:26 +00:00
Daniel Stanton
0db8c0dd95 Knox Login/Logout
Rather than using the Knox views themselves, to respect Session and GET settings, and because Knox logout signal shouldn't be triggered
2017-01-25 12:04:42 +00:00
Daniel Stanton
b6c267cafc Import KnoxTokenSerializer into views 2017-01-25 10:50:33 +00:00
Daniel Stanton
9588627414 Missed a revert to REST_USE_KNOX 2017-01-25 10:50:15 +00:00
Daniel Stanton
e1dffa4ef7 Reverted use of REST_AUTH_TOKEN_APP
This would be a breaking change, and would make it harder to use JWT and Knox simultaneously (e.g. JWT for Web, Knox for Mobile), so reverted.
2017-01-25 10:44:31 +00:00
Daniel Stanton
6f2319e20e Pass Knox serializer appropriate data format and separate from default 2017-01-24 14:54:14 +00:00
Daniel Stanton
a2aa430d4a KnoxTokenSerializer should be serializers.Serializer 2017-01-24 14:49:46 +00:00
Daniel Stanton
c27286170c KnoxTokenSerializer should just return the generated token 2017-01-24 14:48:24 +00:00
Daniel Stanton
544c45f84a Knox model stores token_key, not token 2017-01-24 14:42:53 +00:00
Daniel Stanton
3ac64f99dd Knox tokens should be created, not retrieved 2017-01-24 14:37:46 +00:00
Daniel Stanton
83f4db64a4 Added create_knox_token
as default_create_token fails
2017-01-24 14:34:06 +00:00
Daniel Stanton
e9c4ecbc07 Use REST_AUTH_TOKEN_APP and remove REST_USE_JWT
Prevent simultaneous Knox and JWT use. Options are 'jwt' or 'knox'
2017-01-24 14:20:41 +00:00
Daniel Stanton
b49bb2a1aa Remove KnoxTokenSerializer import from views
As default TokenSerializer is set depending on REST_USE_KNOX
2017-01-24 13:59:17 +00:00
Daniel Stanton
b926291fdc Replaced tabs with spaces 2017-01-24 13:56:23 +00:00
Daniel Stanton
d76b685c36 try/except Knox AuthToken model import 2017-01-24 13:53:06 +00:00
Daniel Stanton
0c9c9b5a5a Use TokenModel in Knox serializer 2017-01-24 13:52:19 +00:00
Daniel Stanton
41b5cca6db Removed bad commas 2017-01-24 13:01:17 +00:00
Daniel Stanton
b9aadef031 Remove KnoxTokenSerializer import 2017-01-24 12:52:50 +00:00
Daniel Stanton
a8c6248134 DefaultTokenSerializer depends on REST_USE_KNOX 2017-01-24 12:51:29 +00:00
Daniel Stanton
ca0cbd88e6 Use Knox AuthToken as default Token Model if REST_USE_KNOX is True 2017-01-24 12:47:46 +00:00
Daniel Stanton
ea9bdec6ca Use self.token instead of user.auth_token
Removes implicit 1-to-1 user-to-token requirement
2017-01-24 12:44:03 +00:00
Daniel Stanton
64b241c93f Added KnoxTokenSerializer to app_settings 2017-01-24 12:36:19 +00:00
Daniel Stanton
e4487dc029 Added serializer for Knox AuthToken 2017-01-24 12:31:29 +00:00
Maxim Kukhtenkov
beb073f35f Update travis.yml and add latest Django 1.10 to tests 2016-12-31 12:59:49 -08:00
Maxim Kukhtenkov
971072ae37 Add sensitive_post_parameters decorator to several views 2016-12-31 12:55:19 -08:00
Maxim Kukhtenkov
ce58da58b2 Update configs and changelog for version 0.9.0 2016-12-22 13:29:51 -08:00
Maxim Kukhtenkov
951f3ce284 Compile translations and small text fixes 2016-12-22 11:57:23 -08:00
Maxim Kukhtenkov
aa677d51c0 PEP8 cleanup and small text fixes 2016-12-21 14:08:56 -08:00
Maxim Kukhtenkov
5bcf31f545 Remove redundant required=True from serializer fields 2016-12-21 13:47:24 -08:00
Maxim Kukhtenkov
9df9608631 Add get_queryset method to UserDetailsView due to issue with Swagger
#275
2016-12-21 11:40:18 -08:00
Maxim Kukhtenkov
e81ed716ec Add verification e-mail sent message
#240
2016-12-21 11:31:04 -08:00
Maxim Kukhtenkov
a673db87f8 Merge pull request #200 from mariuccio/master
'detail' keyword in success response messages
2016-12-21 11:12:59 -08:00
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
45bda640e5 Add note to docs for defining custom REGISTER_SERIALIZER
#198
2016-11-30 19:49:25 -08:00
Maxim Kukhtenkov
ebf6a92b17 Merge pull request #288 from Tivix/logout_on_get
Logout on get
2016-11-30 19:41:14 -08:00
Maxim Kukhtenkov
cef8d67968 Move note under info on accepted params 2016-11-30 19:38:47 -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