Skip to content

Commit a5f2d32

Browse files
authored
Merge pull request #1006 from maykinmedia/fix/2083-remove-hijack
➖ [#2083] Remove django-hijack
2 parents 6a9a910 + 00c8ab7 commit a5f2d32

File tree

7 files changed

+0
-40
lines changed

7 files changed

+0
-40
lines changed

requirements/base.in

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Django>=3.2.11<4.0
1717
django-admin-index
1818
django-axes
1919
django-filer
20-
django-hijack
2120
django-ordered-model
2221
django-redis
2322
django-rosetta

requirements/base.txt

-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ django==3.2.23
8989
# django-filer
9090
# django-filter
9191
# django-formtools
92-
# django-hijack
9392
# django-htmx
9493
# django-import-export
9594
# django-localflavor
@@ -179,8 +178,6 @@ django-formtools==2.3
179178
# via
180179
# django-cms
181180
# maykin-django-two-factor-auth
182-
django-hijack==3.0.4
183-
# via -r requirements/base.in
184181
django-htmx==1.13.0
185182
# via -r requirements/base.in
186183
django-image-cropping==1.7

requirements/ci.txt

-5
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ django==3.2.23
155155
# django-filer
156156
# django-filter
157157
# django-formtools
158-
# django-hijack
159158
# django-htmx
160159
# django-import-export
161160
# django-localflavor
@@ -285,10 +284,6 @@ django-formtools==2.3
285284
# -r requirements/base.txt
286285
# django-cms
287286
# maykin-django-two-factor-auth
288-
django-hijack==3.0.4
289-
# via
290-
# -c requirements/base.txt
291-
# -r requirements/base.txt
292287
django-htmx==1.13.0
293288
# via
294289
# -c requirements/base.txt

requirements/dev.txt

-5
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ django==3.2.23
190190
# django-filer
191191
# django-filter
192192
# django-formtools
193-
# django-hijack
194193
# django-htmx
195194
# django-import-export
196195
# django-localflavor
@@ -324,10 +323,6 @@ django-formtools==2.3
324323
# -r requirements/ci.txt
325324
# django-cms
326325
# maykin-django-two-factor-auth
327-
django-hijack==3.0.4
328-
# via
329-
# -c requirements/ci.txt
330-
# -r requirements/ci.txt
331326
django-htmx==1.13.0
332327
# via
333328
# -c requirements/ci.txt

src/open_inwoner/conf/base.py

-13
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@
167167
"sniplates",
168168
"digid_eherkenning",
169169
"eherkenning",
170-
# "hijack.contrib.admin", # This should be imported but it causes an error. So now there are
171-
# "hijack",
172170
"localflavor",
173171
"easy_thumbnails", # used by filer
174172
"image_cropping",
@@ -247,7 +245,6 @@
247245
"django.contrib.messages.middleware.MessageMiddleware",
248246
"django.middleware.clickjacking.XFrameOptionsMiddleware",
249247
"axes.middleware.AxesMiddleware",
250-
"hijack.middleware.HijackUserMiddleware",
251248
"django_otp.middleware.OTPMiddleware",
252249
"django.middleware.locale.LocaleMiddleware",
253250
"cms.middleware.utils.ApphookReloadMiddleware",
@@ -643,16 +640,6 @@
643640

644641
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
645642

646-
#
647-
# DJANGO-HIJACK
648-
#
649-
HIJACK_LOGIN_REDIRECT_URL = "/"
650-
HIJACK_LOGOUT_REDIRECT_URL = reverse_lazy("admin:accounts_user_changelist")
651-
HIJACK_REGISTER_ADMIN = False
652-
# This is a CSRF-security risk.
653-
# See: http://django-hijack.readthedocs.io/en/latest/configuration/#allowing-get-method-for-hijack-views
654-
HIJACK_ALLOW_GET_REQUESTS = True
655-
656643
#
657644
# SENTRY - error monitoring
658645
#

src/open_inwoner/templates/hijack/contrib/admin/button.html

-12
This file was deleted.

src/open_inwoner/urls.py

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
auth_views.PasswordResetCompleteView.as_view(),
5757
name="password_reset_complete",
5858
),
59-
path("admin/hijack/", include("hijack.urls")),
6059
path("admin/login/failure/", AdminLoginFailure.as_view(), name="admin-oidc-error"),
6160
path("admin/", admin.site.urls),
6261
path("csp/", include("cspreports.urls")),

0 commit comments

Comments
 (0)