Skip to content

Commit

Permalink
rename SECRET_JEY to JWT_SECRET_KEY
Browse files Browse the repository at this point in the history
Signed-off-by: Olivier Léobal <olivier.leobal@owkin.com>
  • Loading branch information
oleobal committed Jun 12, 2023
1 parent 9a4ccaf commit a85ecd8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions backend/backend/settings/deps/jwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
# Key configuration for JSON web tokens (JWT) authentication
if common.to_bool(os.environ.get("JWT_SECRET_NEEDED", "False")):
try:
SECRET_KEY = pathlib.Path(JWT_SECRET_PATH).read_text().strip()
JWT_SECRET_KEY = pathlib.Path(JWT_SECRET_PATH).read_text().strip()
except IOError:
try:
SECRET_KEY = secrets.token_urlsafe() # uses a "reasonable default" length
JWT_SECRET_KEY = secrets.token_urlsafe() # uses a "reasonable default" length
with open(JWT_SECRET_PATH, "w") as fp:
fp.write(SECRET_KEY)
fp.write(JWT_SECRET_KEY)
except IOError:
raise Exception(f"Cannot open file `{JWT_SECRET_PATH}` for writing.")
else:
SECRET_KEY = "unused default value " + secrets.token_urlsafe()
JWT_SECRET_KEY = "unused default value " + secrets.token_urlsafe()
6 changes: 3 additions & 3 deletions backend/users/views/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def set_password(self, request, *args, **kwargs):
username = unquote(kwargs.get("username"))
instance = self.user_model.objects.get(username=username)

secret = _xor_secrets(instance.password, force_str(settings.SECRET_KEY))
secret = _xor_secrets(instance.password, force_str(settings.JWT_SECRET_KEY))
token_validation = _validate_token(token, secret)

if token_validation.get("is_valid"):
Expand All @@ -207,7 +207,7 @@ def verify_token(self, request, *args, **kwargs):
username = unquote(kwargs.get("username"))
instance = self.user_model.objects.get(username=username)

secret = _xor_secrets(instance.password, force_str(settings.SECRET_KEY))
secret = _xor_secrets(instance.password, force_str(settings.JWT_SECRET_KEY))
token_validation = _validate_token(token, secret)
if token_validation.get("is_valid"):
return ApiResponse(data={}, status=status.HTTP_200_OK, headers=self.get_success_headers({}))
Expand All @@ -221,7 +221,7 @@ def verify_token(self, request, *args, **kwargs):
def generate_reset_password_token(self, request, *args, **kwargs):
"""Returns reset password token. Restricted to Admin request"""
instance = self.get_object()
secret = _xor_secrets(instance.password, force_str(settings.SECRET_KEY))
secret = _xor_secrets(instance.password, force_str(settings.JWT_SECRET_KEY))

jwt_token = jwt.encode(
payload={"exp": datetime.datetime.now() + datetime.timedelta(days=7)},
Expand Down

0 comments on commit a85ecd8

Please sign in to comment.