Skip to content

Commit

Permalink
Merge pull request #9 from carbon-mapper/feature/dynamic-username-field
Browse files Browse the repository at this point in the history
Use dynamically generated schema, and use specified username field
  • Loading branch information
eadwinCode committed Mar 20, 2022
2 parents 8281700 + d09bc97 commit 028bc9e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ninja_jwt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Django Ninja JWT - JSON Web Token for Django-Ninja"""

__version__ = "5.1.8"
__version__ = "5.1.9"
12 changes: 8 additions & 4 deletions ninja_jwt/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand Down

0 comments on commit 028bc9e

Please sign in to comment.