Skip to content

Address SonarCloud findings #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
npv2k1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Address SonarCloud findings #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ jobs:
run: uv lock --locked

- name: Ruff lint
run: |
uv sync --locked --no-build --only-dev
uv run --no-sync ruff check --output-format=github .
run: uv run --locked --no-build ruff check --output-format=github .

- name: Ruff format
run: uv run --no-sync ruff format --check .
run: uv run --locked --no-build ruff format --check .

test:
runs-on: ubuntu-latest
Expand All @@ -47,7 +45,7 @@ jobs:
env:
POSTGRES_DB: app
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_HOST_AUTH_METHOD: trust
ports:
- 5432:5432
options: >-
Expand All @@ -56,7 +54,7 @@ jobs:
--health-timeout 5s
--health-retries 10
env:
DATABASE_URL: ${{ matrix.database == 'postgres' && 'postgres://postgres:postgres@localhost:5432/app' || 'sqlite:///db.sqlite3' }}
DATABASE_URL: ${{ matrix.database == 'postgres' && 'postgres://postgres@localhost:5432/app' || 'sqlite:///db.sqlite3' }}
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

Expand All @@ -69,13 +67,13 @@ jobs:
run: uv sync --locked --no-build

- name: Django system checks
run: uv run --no-sync manage.py check
run: uv run --locked --no-build manage.py check

- name: Check for missing migrations
run: uv run --no-sync manage.py makemigrations --check --dry-run
run: uv run --locked --no-build manage.py makemigrations --check --dry-run

- name: Test
run: uv run --no-sync pytest
run: uv run --locked --no-build pytest

deploy-check:
runs-on: ubuntu-latest
Expand All @@ -92,6 +90,4 @@ jobs:
enable-cache: true

- name: Django deployment checks
run: |
uv sync --locked --no-build --no-dev
uv run --no-sync manage.py check --deploy --fail-level ERROR
run: uv run --locked --no-build --no-dev manage.py check --deploy --fail-level ERROR
8 changes: 5 additions & 3 deletions apps/core/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
)
from .utils import Util

INVALID_TOKEN_MESSAGE = "Token is not valid, please request a new one"


class CustomRedirect(HttpResponsePermanentRedirect):
allowed_schemes = [os.environ.get("APP_SCHEME"), "http", "https"]
Expand Down Expand Up @@ -107,7 +109,7 @@ def post(self, request, *args, **kwargs):

if not PasswordResetTokenGenerator().check_token(user, token):
return Response(
{"error": "Token is not valid, please request a new one"},
{"error": INVALID_TOKEN_MESSAGE},
status=status.HTTP_400_BAD_REQUEST,
)
return Response({"success": "Token is valid"}, status=status.HTTP_200_OK)
Expand All @@ -116,13 +118,13 @@ def post(self, request, *args, **kwargs):
try:
if not PasswordResetTokenGenerator().check_token(user):
return Response(
{"error": "Token is not valid, please request a new one"},
{"error": INVALID_TOKEN_MESSAGE},
status=status.HTTP_400_BAD_REQUEST,
)

except UnboundLocalError:
return Response(
{"error": "Token is not valid, please request a new one"},
{"error": INVALID_TOKEN_MESSAGE},
status=status.HTTP_400_BAD_REQUEST,
)

Expand Down
Loading