mirror of
https://git.v0id.ovh/n3wt-innov/n3wt-school.git
synced 2026-01-29 07:53:23 +00:00
refactor: Modification de l'url de l'api Auth
This commit is contained in:
@ -2,7 +2,7 @@ from django.urls import path, re_path
|
|||||||
|
|
||||||
from . import views
|
from . import views
|
||||||
import Auth.views
|
import Auth.views
|
||||||
from Auth.views import ProfileView, ProfileListView, SessionView, LoginView, SubscribeView, NewPasswordView, ResetPasswordView
|
from Auth.views import ProfileSimpleView, ProfileView, SessionView, LoginView, SubscribeView, NewPasswordView, ResetPasswordView
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
re_path(r'^csrf$', Auth.views.csrf, name='csrf'),
|
re_path(r'^csrf$', Auth.views.csrf, name='csrf'),
|
||||||
@ -10,12 +10,11 @@ urlpatterns = [
|
|||||||
re_path(r'^login$', LoginView.as_view(), name="login"),
|
re_path(r'^login$', LoginView.as_view(), name="login"),
|
||||||
re_path(r'^subscribe$', SubscribeView.as_view(), name='subscribe'),
|
re_path(r'^subscribe$', SubscribeView.as_view(), name='subscribe'),
|
||||||
re_path(r'^newPassword$', NewPasswordView.as_view(), name='newPassword'),
|
re_path(r'^newPassword$', NewPasswordView.as_view(), name='newPassword'),
|
||||||
re_path(r'^resetPassword/([a-zA-Z]+)$', ResetPasswordView.as_view(), name='resetPassword'),
|
re_path(r'^resetPassword/(?P<code>[a-zA-Z]+)$', ResetPasswordView.as_view(), name='resetPassword'),
|
||||||
re_path(r'^infoSession$', Auth.views.infoSession, name='infoSession'),
|
re_path(r'^infoSession$', Auth.views.infoSession, name='infoSession'),
|
||||||
|
|
||||||
re_path(r'^profiles$', ProfileListView.as_view(), name="profile"),
|
re_path(r'^profiles$', ProfileView.as_view(), name="profile"),
|
||||||
re_path(r'^profile$', ProfileView.as_view(), name="profile"),
|
re_path(r'^profiles/(?P<id>[0-9]+)$', ProfileSimpleView.as_view(), name="profile"),
|
||||||
re_path(r'^profile/([0-9]+)$', ProfileView.as_view(), name="profile"),
|
|
||||||
|
|
||||||
# Test SESSION VIEW
|
# Test SESSION VIEW
|
||||||
re_path(r'^session$', SessionView.as_view(), name="session"),
|
re_path(r'^session$', SessionView.as_view(), name="session"),
|
||||||
|
|||||||
@ -10,6 +10,9 @@ from rest_framework.views import APIView
|
|||||||
from rest_framework.parsers import JSONParser
|
from rest_framework.parsers import JSONParser
|
||||||
from rest_framework import status
|
from rest_framework import status
|
||||||
|
|
||||||
|
from drf_yasg.utils import swagger_auto_schema
|
||||||
|
from drf_yasg import openapi
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
import jwt
|
import jwt
|
||||||
import json
|
import json
|
||||||
@ -53,20 +56,12 @@ class SessionView(APIView):
|
|||||||
except jwt.InvalidTokenError:
|
except jwt.InvalidTokenError:
|
||||||
return JsonResponse({"error": "Invalid token"}, status=status.HTTP_401_UNAUTHORIZED)
|
return JsonResponse({"error": "Invalid token"}, status=status.HTTP_401_UNAUTHORIZED)
|
||||||
|
|
||||||
class ProfileListView(APIView):
|
class ProfileView(APIView):
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
profilsList = bdd.getAllObjects(_objectName=Profile)
|
profilsList = bdd.getAllObjects(_objectName=Profile)
|
||||||
profils_serializer = ProfileSerializer(profilsList, many=True)
|
profils_serializer = ProfileSerializer(profilsList, many=True)
|
||||||
return JsonResponse(profils_serializer.data, safe=False)
|
return JsonResponse(profils_serializer.data, safe=False)
|
||||||
|
|
||||||
@method_decorator(csrf_protect, name='dispatch')
|
|
||||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
|
||||||
class ProfileView(APIView):
|
|
||||||
def get(self, request, _id):
|
|
||||||
profil=bdd.getObject(Profile, "id", _id)
|
|
||||||
profil_serializer=ProfileSerializer(profil)
|
|
||||||
return JsonResponse(profil_serializer.data, safe=False)
|
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
profil_data=JSONParser().parse(request)
|
profil_data=JSONParser().parse(request)
|
||||||
print(f'{profil_data}')
|
print(f'{profil_data}')
|
||||||
@ -79,7 +74,15 @@ class ProfileView(APIView):
|
|||||||
|
|
||||||
return JsonResponse(profil_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
return JsonResponse(profil_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
def put(self, request, _id):
|
@method_decorator(csrf_protect, name='dispatch')
|
||||||
|
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||||
|
class ProfileSimpleView(APIView):
|
||||||
|
def get(self, request, id):
|
||||||
|
profil=bdd.getObject(Profile, "id", id)
|
||||||
|
profil_serializer=ProfileSerializer(profil)
|
||||||
|
return JsonResponse(profil_serializer.data, safe=False)
|
||||||
|
|
||||||
|
def put(self, request, id):
|
||||||
data=JSONParser().parse(request)
|
data=JSONParser().parse(request)
|
||||||
profil = Profile.objects.get(id=_id)
|
profil = Profile.objects.get(id=_id)
|
||||||
profil_serializer = ProfilUpdateSerializer(profil, data=data)
|
profil_serializer = ProfilUpdateSerializer(profil, data=data)
|
||||||
@ -89,8 +92,8 @@ class ProfileView(APIView):
|
|||||||
|
|
||||||
return JsonResponse(profil_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
return JsonResponse(profil_serializer.errors, safe=False, status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
def delete(self, request, _id):
|
def delete(self, request, id):
|
||||||
return bdd.delete_object(Profile, _id)
|
return bdd.delete_object(Profile, id)
|
||||||
|
|
||||||
def infoSession(request):
|
def infoSession(request):
|
||||||
profilCache = cache.get('session_cache')
|
profilCache = cache.get('session_cache')
|
||||||
@ -102,14 +105,6 @@ def infoSession(request):
|
|||||||
@method_decorator(csrf_protect, name='dispatch')
|
@method_decorator(csrf_protect, name='dispatch')
|
||||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||||
class LoginView(APIView):
|
class LoginView(APIView):
|
||||||
|
|
||||||
def get(self, request):
|
|
||||||
return JsonResponse({
|
|
||||||
'errorFields':'',
|
|
||||||
'errorMessage':'',
|
|
||||||
'profil':0,
|
|
||||||
}, safe=False)
|
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
data=JSONParser().parse(request)
|
data=JSONParser().parse(request)
|
||||||
validatorAuthentication = validator.ValidatorAuthentication(data=data)
|
validatorAuthentication = validator.ValidatorAuthentication(data=data)
|
||||||
@ -153,13 +148,6 @@ class LoginView(APIView):
|
|||||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||||
class SubscribeView(APIView):
|
class SubscribeView(APIView):
|
||||||
|
|
||||||
def get(self, request):
|
|
||||||
return JsonResponse({
|
|
||||||
'message':'',
|
|
||||||
'errorFields':'',
|
|
||||||
'errorMessage':''
|
|
||||||
}, safe=False)
|
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
retourErreur = error.returnMessage[error.BAD_URL]
|
retourErreur = error.returnMessage[error.BAD_URL]
|
||||||
retour = ''
|
retour = ''
|
||||||
@ -200,12 +188,6 @@ class SubscribeView(APIView):
|
|||||||
@method_decorator(csrf_protect, name='dispatch')
|
@method_decorator(csrf_protect, name='dispatch')
|
||||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||||
class NewPasswordView(APIView):
|
class NewPasswordView(APIView):
|
||||||
def get(self, request):
|
|
||||||
return JsonResponse({
|
|
||||||
'message':'',
|
|
||||||
'errorFields':'',
|
|
||||||
'errorMessage':''
|
|
||||||
}, safe=False)
|
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
retourErreur = error.returnMessage[error.BAD_URL]
|
retourErreur = error.returnMessage[error.BAD_URL]
|
||||||
@ -234,14 +216,7 @@ class NewPasswordView(APIView):
|
|||||||
@method_decorator(csrf_protect, name='dispatch')
|
@method_decorator(csrf_protect, name='dispatch')
|
||||||
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
@method_decorator(ensure_csrf_cookie, name='dispatch')
|
||||||
class ResetPasswordView(APIView):
|
class ResetPasswordView(APIView):
|
||||||
def get(self, request, _uuid):
|
def post(self, request, code):
|
||||||
return JsonResponse({
|
|
||||||
'message':'',
|
|
||||||
'errorFields':'',
|
|
||||||
'errorMessage':''
|
|
||||||
}, safe=False)
|
|
||||||
|
|
||||||
def post(self, request, _uuid):
|
|
||||||
retourErreur = error.returnMessage[error.BAD_URL]
|
retourErreur = error.returnMessage[error.BAD_URL]
|
||||||
retour = ''
|
retour = ''
|
||||||
newProfilConnection=JSONParser().parse(request)
|
newProfilConnection=JSONParser().parse(request)
|
||||||
@ -249,7 +224,7 @@ class ResetPasswordView(APIView):
|
|||||||
validatorResetPassword = validator.ValidatorResetPassword(data=newProfilConnection)
|
validatorResetPassword = validator.ValidatorResetPassword(data=newProfilConnection)
|
||||||
validationOk, errorFields = validatorResetPassword.validate()
|
validationOk, errorFields = validatorResetPassword.validate()
|
||||||
|
|
||||||
profil = bdd.getObject(Profile, "code", _uuid)
|
profil = bdd.getObject(Profile, "code", code)
|
||||||
if profil:
|
if profil:
|
||||||
|
|
||||||
if datetime.strptime(util.convertToStr(util._now(), '%d-%m-%Y %H:%M'), '%d-%m-%Y %H:%M') > datetime.strptime(profil.datePeremption, '%d-%m-%Y %H:%M'):
|
if datetime.strptime(util.convertToStr(util._now(), '%d-%m-%Y %H:%M'), '%d-%m-%Y %H:%M') > datetime.strptime(profil.datePeremption, '%d-%m-%Y %H:%M'):
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
from django.urls import path, re_path
|
from django.urls import path, re_path
|
||||||
|
|
||||||
from GestionMessagerie.views import MessagerieView, MessageView
|
from GestionMessagerie.views import MessagerieView, MessageView, MessageSimpleView
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
re_path(r'^messagerie/([0-9]+)$', MessagerieView.as_view(), name="messagerie"),
|
re_path(r'^messagerie/(?P<profile_id>[0-9]+)$', MessagerieView.as_view(), name="messagerie"),
|
||||||
re_path(r'^message$', MessageView.as_view(), name="message"),
|
re_path(r'^messages$', MessageView.as_view(), name="messages"),
|
||||||
re_path(r'^message/([0-9]+)$', MessageView.as_view(), name="message"),
|
re_path(r'^messages/(?P<id>[0-9]+)$', MessageSimpleView.as_view(), name="messages"),
|
||||||
]
|
]
|
||||||
@ -9,17 +9,12 @@ from GestionMessagerie.serializers import MessageSerializer
|
|||||||
from N3wtSchool import bdd
|
from N3wtSchool import bdd
|
||||||
|
|
||||||
class MessagerieView(APIView):
|
class MessagerieView(APIView):
|
||||||
def get(self, request, _idProfile):
|
def get(self, request, profile_id):
|
||||||
messagesList = bdd.getObjects(_objectName=Messagerie, _columnName='destinataire__id', _value=_idProfile)
|
messagesList = bdd.getObjects(_objectName=Messagerie, _columnName='destinataire__id', _value=profile_id)
|
||||||
messages_serializer = MessageSerializer(messagesList, many=True)
|
messages_serializer = MessageSerializer(messagesList, many=True)
|
||||||
return JsonResponse(messages_serializer.data, safe=False)
|
return JsonResponse(messages_serializer.data, safe=False)
|
||||||
|
|
||||||
class MessageView(APIView):
|
class MessageView(APIView):
|
||||||
def get(self, request, _id):
|
|
||||||
message=bdd.getObject(Messagerie, "id", _id)
|
|
||||||
message_serializer=MessageSerializer(message)
|
|
||||||
return JsonResponse(message_serializer.data, safe=False)
|
|
||||||
|
|
||||||
def post(self, request):
|
def post(self, request):
|
||||||
message_data=JSONParser().parse(request)
|
message_data=JSONParser().parse(request)
|
||||||
message_serializer = MessageSerializer(data=message_data)
|
message_serializer = MessageSerializer(data=message_data)
|
||||||
@ -30,3 +25,10 @@ class MessageView(APIView):
|
|||||||
return JsonResponse('Nouveau Message ajouté', safe=False)
|
return JsonResponse('Nouveau Message ajouté', safe=False)
|
||||||
|
|
||||||
return JsonResponse(message_serializer.errors, safe=False)
|
return JsonResponse(message_serializer.errors, safe=False)
|
||||||
|
|
||||||
|
class MessageSimpleView(APIView):
|
||||||
|
def get(self, request, id):
|
||||||
|
message=bdd.getObject(Messagerie, "id", id)
|
||||||
|
message_serializer=MessageSerializer(message)
|
||||||
|
return JsonResponse(message_serializer.data, safe=False)
|
||||||
|
|
||||||
|
|||||||
@ -3,5 +3,5 @@ from django.urls import path, re_path
|
|||||||
from GestionNotification.views import NotificationView
|
from GestionNotification.views import NotificationView
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
re_path(r'^notification$', NotificationView.as_view(), name="notification"),
|
re_path(r'^notifications$', NotificationView.as_view(), name="notifications"),
|
||||||
]
|
]
|
||||||
@ -2,7 +2,7 @@
|
|||||||
import {
|
import {
|
||||||
BE_AUTH_LOGIN_URL,
|
BE_AUTH_LOGIN_URL,
|
||||||
BE_AUTH_REGISTER_URL,
|
BE_AUTH_REGISTER_URL,
|
||||||
BE_AUTH_PROFILE_URL,
|
BE_AUTH_PROFILES_URL,
|
||||||
BE_AUTH_RESET_PASSWORD_URL,
|
BE_AUTH_RESET_PASSWORD_URL,
|
||||||
BE_AUTH_NEW_PASSWORD_URL,
|
BE_AUTH_NEW_PASSWORD_URL,
|
||||||
FE_USERS_LOGIN_URL ,
|
FE_USERS_LOGIN_URL ,
|
||||||
@ -67,7 +67,7 @@ export const disconnect = () => {
|
|||||||
|
|
||||||
export const createProfile = (data,csrfToken) => {
|
export const createProfile = (data,csrfToken) => {
|
||||||
const request = new Request(
|
const request = new Request(
|
||||||
`${BE_AUTH_PROFILE_URL}`,
|
`${BE_AUTH_PROFILES_URL}`,
|
||||||
{
|
{
|
||||||
method:'POST',
|
method:'POST',
|
||||||
headers: {
|
headers: {
|
||||||
@ -83,7 +83,7 @@ const request = new Request(
|
|||||||
|
|
||||||
export const updateProfile = (id, data, csrfToken) => {
|
export const updateProfile = (id, data, csrfToken) => {
|
||||||
const request = new Request(
|
const request = new Request(
|
||||||
`${BE_AUTH_PROFILE_URL}/${id}`,
|
`${BE_AUTH_PROFILES_URL}/${id}`,
|
||||||
{
|
{
|
||||||
method:'PUT',
|
method:'PUT',
|
||||||
headers: {
|
headers: {
|
||||||
|
|||||||
@ -11,7 +11,7 @@ export const BE_AUTH_REGISTER_URL = `${BASE_URL}/Auth/subscribe`
|
|||||||
export const BE_AUTH_RESET_PASSWORD_URL = `${BASE_URL}/Auth/resetPassword`
|
export const BE_AUTH_RESET_PASSWORD_URL = `${BASE_URL}/Auth/resetPassword`
|
||||||
export const BE_AUTH_LOGIN_URL = `${BASE_URL}/Auth/login`
|
export const BE_AUTH_LOGIN_URL = `${BASE_URL}/Auth/login`
|
||||||
export const BE_AUTH_LOGOUT_URL = `${BASE_URL}/Auth/logout`
|
export const BE_AUTH_LOGOUT_URL = `${BASE_URL}/Auth/logout`
|
||||||
export const BE_AUTH_PROFILE_URL = `${BASE_URL}/Auth/profile`
|
export const BE_AUTH_PROFILES_URL = `${BASE_URL}/Auth/profiles`
|
||||||
export const BE_AUTH_CSRF_URL = `${BASE_URL}/Auth/csrf`
|
export const BE_AUTH_CSRF_URL = `${BASE_URL}/Auth/csrf`
|
||||||
|
|
||||||
// GESTION INSCRIPTION
|
// GESTION INSCRIPTION
|
||||||
@ -43,7 +43,8 @@ export const BE_SCHOOL_PAYMENT_MODE_URL = `${BASE_URL}/School/paymentMode`;
|
|||||||
export const BE_SCHOOL_PAYMENT_MODES_URL = `${BASE_URL}/School/paymentModes`;
|
export const BE_SCHOOL_PAYMENT_MODES_URL = `${BASE_URL}/School/paymentModes`;
|
||||||
|
|
||||||
// GESTION MESSAGERIE
|
// GESTION MESSAGERIE
|
||||||
export const BE_GESTIONMESSAGERIE_MESSAGES_URL = `${BASE_URL}/GestionMessagerie/messagerie`
|
export const BE_GESTIONMESSAGERIE_MESSAGES_URL = `${BASE_URL}/GestionMessagerie/messages`
|
||||||
|
export const BE_GESTIONMESSAGERIE_MESSAGERIE_URL = `${BASE_URL}/GestionMessagerie/messagerie`
|
||||||
|
|
||||||
// URL FRONT-END
|
// URL FRONT-END
|
||||||
export const FE_HOME_URL = `/`
|
export const FE_HOME_URL = `/`
|
||||||
|
|||||||
Reference in New Issue
Block a user