diff --git a/django/embedded_analytics/embedded_analytics/settings.py b/django/embedded_analytics/embedded_analytics/settings.py
index 8896342..5b806ce 100644
--- a/django/embedded_analytics/embedded_analytics/settings.py
+++ b/django/embedded_analytics/embedded_analytics/settings.py
@@ -51,6 +51,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'allauth.account.middleware.AccountMiddleware',
]
ROOT_URLCONF = 'embedded_analytics.urls'
diff --git a/django/embedded_analytics/embedded_analytics/urls.py b/django/embedded_analytics/embedded_analytics/urls.py
index f59995d..814968a 100644
--- a/django/embedded_analytics/embedded_analytics/urls.py
+++ b/django/embedded_analytics/embedded_analytics/urls.py
@@ -13,11 +13,11 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
-from django.conf.urls import include, url
+from django.urls import re_path, include
from django.contrib import admin
urlpatterns = [
- url(r'^admin/', admin.site.urls),
- url(r'^accounts/', include('allauth.urls')),
- url(r'^', include('user_stats.urls'))
+ re_path(r'^admin/', admin.site.urls),
+ re_path(r'^accounts/', include('allauth.urls')),
+ re_path(r'^', include('user_stats.urls'))
]
diff --git a/django/embedded_analytics/requirements.txt b/django/embedded_analytics/requirements.txt
index dc1e68d..a26672d 100644
--- a/django/embedded_analytics/requirements.txt
+++ b/django/embedded_analytics/requirements.txt
@@ -1,3 +1,3 @@
-Django==1.11.29
-django-allauth==0.30.0
-PyJWT==1.4.2
\ No newline at end of file
+Django==5.2
+django-allauth==65.7
+PyJWT==2.10
\ No newline at end of file
diff --git a/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html b/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html
index a2ece7d..e54cb02 100644
--- a/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html
+++ b/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html
@@ -23,7 +23,7 @@
Embedding charts with signed parameters
}
}
-token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256").decode('utf8')
+token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256")
iframeUrl = METABASE_SITE_URL + "/embed/question/" + token + "#bordered=true"
diff --git a/django/embedded_analytics/user_stats/templates/user_stats/signed_dashboard.html b/django/embedded_analytics/user_stats/templates/user_stats/signed_dashboard.html
index fbd47e5..1d89e6e 100644
--- a/django/embedded_analytics/user_stats/templates/user_stats/signed_dashboard.html
+++ b/django/embedded_analytics/user_stats/templates/user_stats/signed_dashboard.html
@@ -27,7 +27,7 @@ Embedding dashboards with signed parameters
}
}
- token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256").decode('utf8')
+ token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256")
iframeUrl = METABASE_SITE_URL + "/embed/dashboard/" + token + "#bordered=true"
diff --git a/django/embedded_analytics/user_stats/templates/user_stats/signed_public_dashboard.html b/django/embedded_analytics/user_stats/templates/user_stats/signed_public_dashboard.html
index b233cff..68117aa 100644
--- a/django/embedded_analytics/user_stats/templates/user_stats/signed_public_dashboard.html
+++ b/django/embedded_analytics/user_stats/templates/user_stats/signed_public_dashboard.html
@@ -17,7 +17,7 @@ Signed dashboards without parameters
}
}
-token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256").decode('utf8')
+token = jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256")
iframeUrl = METABASE_SITE_URL + "/embed/dashboard/" + token + "#bordered=true"
diff --git a/django/embedded_analytics/user_stats/urls.py b/django/embedded_analytics/user_stats/urls.py
index ed050d1..0571c20 100644
--- a/django/embedded_analytics/user_stats/urls.py
+++ b/django/embedded_analytics/user_stats/urls.py
@@ -1,10 +1,10 @@
-from django.conf.urls import url
+from django.urls import re_path
from . import views
urlpatterns = [
- url(r'^signed_chart/(?P[0-9]+)/$', views.signed_chart, name='signed_chart'),
- url(r'^signed_dashboard/(?P[0-9]+)/$', views.signed_dashboard, name='signed_dashboard'),
- url(r'^signed_public_dashboard/$', views.signed_public_dashboard, name='signed_public_dashboard'),
- url(r'^$', views.index, name='index'),
+ re_path(r'^signed_chart/(?P[0-9]+)/$', views.signed_chart, name='signed_chart'),
+ re_path(r'^signed_dashboard/(?P[0-9]+)/$', views.signed_dashboard, name='signed_dashboard'),
+ re_path(r'^signed_public_dashboard/$', views.signed_public_dashboard, name='signed_public_dashboard'),
+ re_path(r'^$', views.index, name='index'),
]
\ No newline at end of file
diff --git a/django/embedded_analytics/user_stats/views.py b/django/embedded_analytics/user_stats/views.py
index 4456d72..8b56979 100644
--- a/django/embedded_analytics/user_stats/views.py
+++ b/django/embedded_analytics/user_stats/views.py
@@ -8,7 +8,7 @@
METABASE_SECRET_KEY = "a1c0952f3ff361f1e7dd8433a0a50689a004317a198ecb0a67ba90c73c27a958"
def get_token(payload):
- return jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256").decode('utf8')
+ return jwt.encode(payload, METABASE_SECRET_KEY, algorithm="HS256")
def index(request):
return render(request,
diff --git a/django/minimal_example/index.html b/django/minimal_example/index.html
index cd293cb..acdeb03 100644
--- a/django/minimal_example/index.html
+++ b/django/minimal_example/index.html
@@ -6,7 +6,7 @@
Embed {{ title }}