From c4674dc77df4c0f03601267debda0a2cebc0625e Mon Sep 17 00:00:00 2001
From: manuconcepbrito <manu041196@gmail.com>
Date: Thu, 28 Oct 2021 10:20:53 +0200
Subject: [PATCH] change name of API for managmenet as it seemed to conflict
with middleware
---
wahlfang_api/urls.py | 2 +-
wahlfang_web/src/api/index.js | 2 +-
wahlfang_web/src/api/management.js | 3 ++-
wahlfang_web/src/pages/management/Logout.js | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/wahlfang_api/urls.py b/wahlfang_api/urls.py
index fe69745..39b8c9b 100644
--- a/wahlfang_api/urls.py
+++ b/wahlfang_api/urls.py
@@ -27,6 +27,6 @@ urlpatterns = [
path('auth/token/', TokenObtainElectionManagerView.as_view(), name='token_obtain_pair'),
path('auth/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
path('auth/token/verify/', TokenVerifyView.as_view(), name='token_verify'),
- path('management/add-session', ManagerSessionView.as_view(), name='add_session'),
+ path('manager/add-session', ManagerSessionView.as_view(), name='add_session'),
path('drf/', include('rest_framework.urls', namespace='rest_framework'))
]
diff --git a/wahlfang_web/src/api/index.js b/wahlfang_web/src/api/index.js
index e7b16c1..2d29e2b 100644
--- a/wahlfang_web/src/api/index.js
+++ b/wahlfang_web/src/api/index.js
@@ -1,4 +1,4 @@
-export const apiURL = (process.env.REACT_APP_SERVER_URL || 'http://localhost:8000') + '/api/v1';
+export const apiURL = (process.env.REACT_APP_SERVER_URL || 'http://127.0.0.1:8000') + '/api/v1';
export const voteAPIRoutes = {
login: "/auth/code/token/",
diff --git a/wahlfang_web/src/api/management.js b/wahlfang_web/src/api/management.js
index 2ef96c6..3bd40a7 100644
--- a/wahlfang_web/src/api/management.js
+++ b/wahlfang_web/src/api/management.js
@@ -4,7 +4,7 @@ export const managementAPIRoutes = {
login: "/auth/token/",
refreshToken: "/auth/token/refresh/",
verifyToken: "/auth/token/verify/",
- manageSessions: "/management/add-session",
+ manageSessions: "/manager/add-session",
}
@@ -50,6 +50,7 @@ export const loginManager = async (username, password) => {
username: username,
password: password
})
+ debugger
if (response.status < 300) {
const token = await response.json();
localStorage.setItem("managerToken", JSON.stringify(token));
diff --git a/wahlfang_web/src/pages/management/Logout.js b/wahlfang_web/src/pages/management/Logout.js
index b83816d..4a3d33c 100644
--- a/wahlfang_web/src/pages/management/Logout.js
+++ b/wahlfang_web/src/pages/management/Logout.js
@@ -14,7 +14,7 @@ export default function Logout() {
setAuthenticated(false);
// TODO: this is a very hacky way of reloading the whole app such that the recoil app state is reset.
// TODO: find a saner way of resetting the recoil state without having to force reload the whole page.
- window.location.assign('/');
+ window.location.assign('/management');
});
})
--
GitLab