Properly check for dict values in JWTs (#28)

This solves and issue where if name or role are empty a KeyError is
raised

django_descope/forms.py

@@ -14,7 +14,7 @@ class LoginForm(forms.Form):
     )
 
     def clean_email(self) -> str:
-        email = self.cleaned_data["email"].lower()
+        email = self.cleaned_data.get("email").lower()
 
         try:
             user = User.objects.get(email=email)
@@ -36,7 +36,7 @@ class SignupForm(forms.Form):
     )
 
     def clean_email(self) -> str:
-        email = self.cleaned_data["email"].lower()
+        email = self.cleaned_data.get("email").lower()
 
         try:
             user = User.objects.get(email=email)

django_descope/views.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Dict
 
 from descope import (
     REFRESH_SESSION_TOKEN_NAME,
@@ -45,7 +46,7 @@ def post(self, request: HttpRequest, *args, **kwargs):
             context["login_form"] = form
             return self.render_to_response(context)
 
-        email = form.cleaned_data["email"]
+        email = form.cleaned_data.get("email")
         try:
             descope_client.magiclink.sign_in(
                 DeliveryMethod.EMAIL,
@@ -71,24 +72,34 @@ class LoginVerify(TemplateView):
 
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
-        token = request.GET["t"]
+        token = request.GET.get("t")
         try:
             jwt_response = descope_client.magiclink.verify(token)
         except AuthException as e:
             context["login_error"] = e.error_message
             return self.render_to_response(context)
 
         logger.info("Login successful", jwt_response)
-        request.session["descopeUser"] = u = jwt_response["user"]
-        request.session["descopeSession"] = s = jwt_response[SESSION_TOKEN_NAME]
-        request.session["descopeRefresh"] = jwt_response[REFRESH_SESSION_TOKEN_NAME]
-
-        user, created = User.objects.get_or_create(
-            username=u["userId"],
-            email=u["email"],
-            is_staff=("is_staff" in s["roles"]),
-            first_name=u["name"].split()[0],
-            last_name=" ".join(u["name"].split()[0:]),
+
+        u: Dict
+        s: Dict
+        request.session["descopeUser"] = u = jwt_response.get("user")
+        request.session["descopeSession"] = s = jwt_response.get(SESSION_TOKEN_NAME)
+        request.session["descopeRefresh"] = jwt_response.get(REFRESH_SESSION_TOKEN_NAME)
+
+        username = u.get("userId")
+        email = u.get("email")
+        roles = s.get("roles", [])
+        name = u.get("name", "").split()
+        first_name = " ".join(name[:1])
+        last_name = " ".join(name[1:])
+        user, _ = User.objects.get_or_create(
+            username=username,
+            email=email,
+            is_staff=("is_staff" in roles),
+            is_superuser=("is_superuser" in roles),
+            first_name=first_name,
+            last_name=last_name,
         )
 
         login(request, user)
@@ -115,7 +126,7 @@ def post(self, request, *args, **kwargs):
             context["signup_form"] = form
             return self.render_to_response(context)
 
-        email = form.cleaned_data["email"]
+        email = form.cleaned_data.get("email")
         try:
             descope_client.magiclink.sign_up_or_in(
                 DeliveryMethod.EMAIL,

example/pyproject.toml

@@ -9,6 +9,7 @@ license = "MIT"
 python = ">=3.7,<4.0"
 django = ">=3.2,<5"
 django-descope = {path = "..", develop = true}
+python-dotenv = "0.21.0"
 
 [tool.poetry.dev-dependencies]
 black = "22.6.0"

example/settings.py

@@ -10,8 +10,13 @@
 https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 
+import os
 from pathlib import Path
 
+from dotenv import load_dotenv
+
+load_dotenv()
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -28,7 +33,9 @@
 ALLOWED_HOSTS = ["*"]
 
 
-DESCOPE_PROJECT_ID = "P2GMsgxPSSQrq3Ig7M0ExAwoRGbP"  # <-- Set this to your project ID
+DESCOPE_PROJECT_ID = os.environ.get(
+    "DESCOPE_PROJECT_ID"
+)  # <-- Set this to your project ID
 
 
 # Application definition