django-restit 4.2.161__tar.gz → 4.2.163__tar.gz

{django_restit-4.2.161 → django_restit-4.2.163}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.161
+Version: 4.2.163
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.161 → django_restit-4.2.163}/account/rpc/auth.py

@@ -3,7 +3,7 @@ from rest import crypto
 from rest.mail import render_to_mail
 from rest import views as rv
 # from rest.views import restStatus, restGet, restPermissionDenied
-from rest.jwtoken import JWToken, JWT_KEY
+from rest.jwtoken import JWToken, JWT_KEY, JWT_EXPIRES, JWT_REFRESH_EXPIRES
 from rest import helpers
 from rest import settings
 from account import models as am
@@ -67,7 +67,13 @@ def on_complete_jwt(request, member):
         request, method="login", level=7)
 
     device_id = request.DATA.get(["device_id", "deviceID"])
-    token = JWToken(user_id=member.pk, key=member.security_token, device_id=device_id)
+    
+    token = JWToken(
+        user_id=member.pk,
+        key=member.security_token,
+        device_id=device_id,
+        access_expires_in=member.getProperty("jwt.expires_in", JWT_EXPIRES, field_type=int),
+        refresh_expires_in=member.getProperty("jwt.refresh_expires_in", JWT_REFRESH_EXPIRES, field_type=int))
 
     request.user = member.getUser()
     request.member = member
@@ -121,9 +127,10 @@ def jwt_refresh(request):
     if member.security_token is None:
         member.refreshSecurityToken()
     member.canLogin(request)
-    token.refresh()
+    token.refresh(member.getProperty("jwt.expires_in", JWT_EXPIRES, field_type=int))
     request.jwt_token = token.access_token  # this tells the middleware to store in cookie
     if JWT_UPDATE_REFRESH_TOKEN:
+        token.refresh_expires_in = member.getProperty("jwt.refresh_expires_in", JWT_REFRESH_EXPIRES, field_type=int)
         rtoken = token.refresh_token
     return rv.restGet(request, dict(access=token.access_token, refresh=rtoken))
 

{django_restit-4.2.161 → django_restit-4.2.163}/account/rpc/group.py

@@ -15,7 +15,7 @@ def rest_on_group(request, pk=None):
 @rd.urlGET(r'^member/groups$')
 @rd.login_required
 def member_groups(request):
-    member_id = request.DATA.get(["member", "member_id"])
+    member_id = request.DATA.get(["member", "member_id"], request.member.id)
     if not member_id:
         return rv.restPermissionDenied(request)
     member = Member.objects.filter(pk=member_id).last()

{django_restit-4.2.161 → django_restit-4.2.163}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.161"
+version = "4.2.163"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.161 → django_restit-4.2.163}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.161"
+__version__ = "4.2.163"

{django_restit-4.2.161 → django_restit-4.2.163}/rest/jwtoken.py

@@ -4,7 +4,8 @@ import time
 import uuid
 from rest import settings
 
-
+JWT_EXP_6_HOURS = 21600
+JWT_EXP_12_HOURS = 43200
 JWT_EXP_1_DAY = 86400
 JWT_EXP_2_DAY = 172800
 JWT_EXP_7_DAY = 604800
@@ -58,10 +59,12 @@ class JWToken():
             return False
         return self.payload.exp > time.time()
 
-    def refresh(self):
+    def refresh(self, expires_in=None):
         self.payload["token_type"] = "access"
         self.payload["iat"] = int(time.time())
-        self.payload["exp"] = int(time.time()) + self.access_expires_in
+        if expires_in is None:
+            expires_in = self.access_expires_in
+        self.payload["exp"] = int(time.time()) + expires_in
 
     @property
     def access_token(self):

{django_restit-4.2.161 → django_restit-4.2.163}/taskqueue/models.py

@@ -90,6 +90,7 @@ class Task(models.Model, RestModel):
                     'cancel_requested',
                     'state',
                     'runtime',
+                    'current_runtime',
                     'channel',
                     'model',
                     'attempts',