Merge pull request #9 from carbon-mapper/feature/dynamic-username-field

Use dynamically generated schema, and use specified username field

Author: eadwinCode

ninja_jwt/__init__.py

@@ -1,3 +1,3 @@
 """Django Ninja JWT - JSON Web Token for Django-Ninja"""
 
-__version__ = "5.1.8"
+__version__ = "5.1.9"

ninja_jwt/schema.py

@@ -19,6 +19,12 @@
 user_name_field = get_user_model().USERNAME_FIELD  # type: ignore
 
 
+class AuthUserSchema(ModelSchema):
+    class Config:
+        model = get_user_model()
+        include = [user_name_field]
+
+
 class TokenObtainSerializer(ModelSchema):
     class Config:
         model = get_user_model()
@@ -69,10 +75,9 @@ def get_token(cls, user: Type[AbstractUser]) -> Type[Token]:
         )
 
 
-class TokenObtainPairOutput(Schema):
+class TokenObtainPairOutput(AuthUserSchema):
     refresh: str
     access: str
-    username: str
 
 
 class TokenObtainPairSerializer(TokenObtainSerializer):
@@ -97,9 +102,8 @@ def output_schema(self):
         return TokenObtainPairOutput(**self.dict(exclude={"password"}))
 
 
-class TokenObtainSlidingOutput(Schema):
+class TokenObtainSlidingOutput(AuthUserSchema):
     token: str
-    username: str
 
 
 class TokenObtainSlidingSerializer(TokenObtainSerializer):