accrete 0.0.59__tar.gz → 0.0.60__tar.gz

{accrete-0.0.59 → accrete-0.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: accrete
-Version: 0.0.59
+Version: 0.0.60
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

accrete-0.0.60/accrete/urls.py

@@ -0,0 +1,8 @@
+from django.urls import path, include
+from django.conf import settings
+from accrete.views import get_tenant_file
+
+
+urlpatterns = [
+    path(f'{settings.MEDIA_URL.strip("/")}/<int:tenant_id>/<path:filepath>', get_tenant_file)
+]

{accrete-0.0.59 → accrete-0.0.60}/accrete/views.py

@@ -1,31 +1,15 @@
+import os
 from functools import wraps
+from django.http import HttpResponse, HttpResponseNotFound
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import login_required
 from django.core.exceptions import ImproperlyConfigured
 from django.shortcuts import redirect
 from django.conf import settings
+from accrete.tenant import get_tenant
 from . import config
 
 
-def tenant_required(
-        redirect_field_name: str = None,
-        login_url: str = None
-):
-    def decorator(f):
-        @wraps(f)
-        @login_required(
-            redirect_field_name=redirect_field_name,
-            login_url=login_url
-        )
-        def _wrapped_view(request, *args, **kwargs):
-            tenant = request.tenant
-            if not tenant:
-                return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
-            return f(request, *args, **kwargs)
-        return _wrapped_view
-    return decorator
-
-
 class TenantRequiredMixin(LoginRequiredMixin):
 
     tenant_missing_url = None
@@ -80,3 +64,34 @@ class TenantRequiredMixin(LoginRequiredMixin):
                 f"{cls_name}.get_member_not_authorized_url()."
             )
         return url
+
+
+def tenant_required(
+        redirect_field_name: str = None,
+        login_url: str = None
+):
+    def decorator(f):
+        @wraps(f)
+        @login_required(
+            redirect_field_name=redirect_field_name,
+            login_url=login_url
+        )
+        def _wrapped_view(request, *args, **kwargs):
+            tenant = request.tenant
+            if not tenant:
+                return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
+            return f(request, *args, **kwargs)
+        return _wrapped_view
+    return decorator
+
+
+@tenant_required()
+def get_tenant_file(request, tenant_id, filepath):
+    tenant = get_tenant()
+    if tenant.id != tenant_id:
+        return HttpResponseNotFound()
+    filepath = f'{settings.MEDIA_ROOT}/{tenant_id}/{filepath}'
+    if not os.path.exists(filepath):
+        return HttpResponseNotFound()
+    with open(filepath, 'rb') as f:
+        return HttpResponse(f)

{accrete-0.0.59 → accrete-0.0.60}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.59'
+version = '0.0.60'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]