django-restit 4.2.20__tar.gz → 4.2.22__tar.gz

{django_restit-4.2.20 → django_restit-4.2.22}/PKG-INFO

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

{django_restit-4.2.20 → django_restit-4.2.22}/account/models/session.py

@@ -9,9 +9,10 @@ from rest import ua
 class AuthSession(models.Model, RestModel):
     class RestMeta:
         SEARCH_FIELDS = ["ip", "member__username", "browser", "location__city"]
-        VIEW_PERMS = ["view_members", "manage_members", "manage_users"]
+        VIEW_PERMS = ["view_members", "manage_members", "manage_users", "owner"]
         CAN_SAVE = False
         CAN_DELETE = False
+        VIEW_PERMS_MEMBER_FIELD = "member"
         # note the | will check collection parameter...
         #   trailing "." will check if the collection has the key set to true
         SEARCH_TERMS = [

{django_restit-4.2.20 → django_restit-4.2.22}/account/rpc/auth.py

@@ -241,6 +241,20 @@ def is_member_logged_in(request):
     return rv.restStatus(request, False)
 
 
+@rd.urlPOST('invite/validate')
+@rd.never_cache
+def member_invite_confirm(request):
+    username = request.DATA.get('username', None)
+    auth_code = request.DATA.get(["auth_token", "invite_token"], None)
+    member = getMemberByUsername(username)
+    if not member or not auth_code:
+        return rv.restPermissionDenied(request, error=f"Username or code is incorrect {username}/{auth_code}", error_code=422)
+    auth_code = auth_code.replace('-', '').replace(' ', '')
+    if member.auth_code is None or member.auth_code != auth_code:
+        return rv.restStatus(request, False)
+    return rv.restStatus(request, True)
+
+
 @rd.urlPOST('mfa/request_code')
 @rd.never_cache
 def member_request_code(request):

{django_restit-4.2.20 → django_restit-4.2.22}/account/rpc/oauth.py

@@ -70,4 +70,12 @@ def oauth_google_login(request):
     member.auditLog("user succesfully authenticated with google", "google_oauth", level=17)
 
     params = urlencode({'oauth_code': member.auth_code, "username":member.username})
-    return redirect(f"{app_url}?{params}")
+    rurl = None
+    if "?" in app_url:
+        if app_url[-1] == "?":
+            rurl = f"{app_url}{params}"
+        else:
+            rurl = f"{app_url}&{params}"
+    else:
+        rurl = f"{app_url}?{params}"
+    return redirect(rurl)

{django_restit-4.2.20 → django_restit-4.2.22}/pyproject.toml

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

{django_restit-4.2.20 → django_restit-4.2.22}/rest/__init__.py

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