Skip to content

Commit c5c2e80

Browse files
authored
Merge pull request #15 from BAMresearch/10-remove-login-credentials
Removed login page from app
2 parents bc18240 + bc5daef commit c5c2e80

File tree

5 files changed

+1
-157
lines changed

5 files changed

+1
-157
lines changed

masterdata_checker/app/templates/homepage.html

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212

1313
</head>
1414
<body class="bg-light">
15-
<div class="d-flex justify-content-end">
16-
<form action="{% url 'logout' %}" method="POST">
17-
{% csrf_token %}
18-
<button type="submit" class="btn btn-danger">Logout</button>
19-
</form>
20-
</div>
2115
<div class="container py-5">
2216
<div class="row justify-content-center">
2317
<div class="col-md-8">
@@ -109,6 +103,6 @@ <h5 class="text-center">Checker Logs</h5>
109103
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
110104
</body>
111105
<footer class="text-center py-3 mt-5 border-top">
112-
<small>&copy; 2025 BAM Masterdata Checker</small>
106+
<small>&copy; MIT 2025, BAM Data Store - Masterdata Checker</small>
113107
</footer>
114108
</html>

masterdata_checker/app/templates/login.html

Lines changed: 0 additions & 45 deletions
This file was deleted.

masterdata_checker/app/urls.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
urlpatterns = [
66
path("", views.homepage, name="homepage"),
7-
path("login/", views.login, name="login"),
8-
path("logout/", views.logout_view, name="logout"),
97
]

masterdata_checker/app/utils.py

Lines changed: 0 additions & 55 deletions
This file was deleted.

masterdata_checker/app/views.py

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
import datetime
22
import tempfile
3-
import uuid
43

54
from bam_masterdata.cli.cli import run_checker
65
from bam_masterdata.logger import log_storage, logger
7-
from django.conf import settings
8-
from django.contrib.auth import logout
9-
from django.core.cache import cache
106
from django.shortcuts import redirect, render
117
from django.views.decorators.http import require_POST
12-
from pybis import Openbis
13-
14-
from masterdata_checker.app.utils import encrypt_password, get_openbis_from_cache
158

169

1710
def homepage(request):
18-
# Check if the user is logged in
19-
o = get_openbis_from_cache(request)
20-
if not o:
21-
logger.info("User not logged in, redirecting to login page.")
22-
return redirect("login")
23-
2411
context = {}
2512

2613
if request.method == "POST" and "upload" in request.POST:
@@ -93,41 +80,6 @@ def homepage(request):
9380
return render(request, "homepage.html", context)
9481

9582

96-
def login(request):
97-
error = None
98-
99-
if request.method == "POST":
100-
username = request.POST.get("username")
101-
password = request.POST.get("password")
102-
103-
try:
104-
o = Openbis(settings.OPENBIS_URL)
105-
o.login(username, password, save_token=True)
106-
107-
encrypted_password = encrypt_password(password)
108-
session_id = str(uuid.uuid4())
109-
110-
request.session["openbis_username"] = username
111-
request.session["openbis_password"] = encrypted_password
112-
request.session["openbis_session_id"] = session_id
113-
114-
cache.set(session_id, o, timeout=60 * 60) # Cache for 1 hour (adjustable)
115-
116-
return redirect("homepage")
117-
118-
except Exception as e:
119-
logger.error(f"Login failed for user '{username}': {e}", exc_info=True)
120-
error = "Invalid username or password."
121-
122-
return render(request, "login.html", {"error": error})
123-
124-
125-
def logout_view(request):
126-
request.session.flush() # Clear all session data
127-
logout(request)
128-
return redirect("login")
129-
130-
13183
@require_POST
13284
def clear_logs(request):
13385
request.session.pop("checker_logs", None)

0 commit comments

Comments
 (0)