Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion backend/apps/ifc_validation_bff/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from django.urls import path

from .views_legacy import me, models_paginated, upload, delete
from .views_legacy import me, logout_view, models_paginated, upload, delete
from .views_legacy import report, report_error

urlpatterns = [

# 'Flask'-way of doing things; backend for legacy API (< 0.6)
path('api/me', me),
path('api/logout', logout_view),
path('api/models_paginated/<int:start>/<int:end>', models_paginated),
path('api/', upload),
path('api/delete/<str:ids>', delete),
Expand Down
29 changes: 13 additions & 16 deletions backend/apps/ifc_validation_bff/views_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,9 @@ def get_current_user(request):


def create_redirect_response(login=True, dashboard=False):

if dashboard:

return JsonResponse({
"redirect": '/dashboard',
"reason": "403 - Forbidden"
})

else:

return JsonResponse({
"redirect": LOGIN_URL,
"reason": "401 - Unauthorized"
})

return JsonResponse({
"redirect": LOGIN_URL if login else '/dashboard',
})

@functools.lru_cache(maxsize=1024)
def get_feature_filename(feature_code):
Expand Down Expand Up @@ -249,6 +237,15 @@ def me(request):
return create_redirect_response(login=True)


@ensure_csrf_cookie
@csrf_protect
def logout_view(request):
if get_current_user(request):
request.session.pop('user', None)

return create_redirect_response(login=True)


@ensure_csrf_cookie
def models_paginated(request, start: int, end: int):

Expand Down Expand Up @@ -287,7 +284,7 @@ def upload(request):
if not user:
return create_redirect_response(login=True)
if not user.is_active:
return create_redirect_response(waiting_zone=True)
return create_redirect_response(dashboard=True)

set_user_context(user)

Expand Down
Loading
Loading