1
0
forked from PGL/Clyde
Commit Graph

233 Commits

Author SHA1 Message Date
ee37dc79a7
Fixing the CI
Moving the dev test and build to port 5442 from 5432 to avoid
conflicting with the running postgresql
2024-03-17 22:02:12 +01:00
2fb6aef67c added GET /user/{id} 2024-03-17 22:01:48 +01:00
7e7cec2f6c Merge branch 'Max/Backend/GetUserById' into wal/front/listingUsers 2024-03-17 22:00:56 +01:00
345599888d added GET /user/{id} 2024-03-17 21:48:58 +01:00
19b4950be4 Merge branch 'master' into wal/front/listingUsers 2024-03-17 21:39:04 +01:00
d9307753c4 trop de truc 2024-03-17 21:38:10 +01:00
f2b80ba89f Resolve conflicts and resolve condition bug in isNotSecretaryOrAdmin 2024-03-17 19:17:38 +01:00
114116b97c Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
2024-03-17 19:14:25 +01:00
924faca13f Add testing for file uploading and correct minors bugs in service 2024-03-17 19:06:27 +01:00
ea4a0745e0 creation of the user when request accepted 2024-03-17 17:15:33 +01:00
76f5a39a8f GET /users doesn't return Admins if the poster isn't an admin 2024-03-17 16:26:30 +01:00
37f8a3ac4e removed an unused variable 2024-03-17 16:25:00 +01:00
ea46dd664c added a todo to send an email for every state changement of request 2024-03-17 16:02:30 +01:00
b2d0be014c UserList and Student List part1 2024-03-17 15:59:12 +01:00
571d27c230 Add test for user patch 2024-03-17 15:53:50 +01:00
37a9eb46ae Add tests for UserController get and post 2024-03-17 15:42:43 +01:00
bfc4f6567b Merge remote-tracking branch 'origin/Leo/Backend/UnitTest' into Leo/Backend/UnitTest
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
2024-03-17 15:40:45 +01:00
d423a57fa0 Add tests for UserController get and post 2024-03-17 15:40:14 +01:00
210fda0401 Merge branch 'master' into wal/front/listingUsers 2024-03-17 13:33:47 +01:00
b67b25b4a4 Login Finished, add curricula and apps 2024-03-17 13:24:24 +01:00
385290d1a2 Merge branch 'master' into Max/Backend/ReturnUserPasswordIssue 2024-03-17 13:07:20 +01:00
cf2deb983d added security to assistant posting and Get courses/owned for owners 2024-03-17 12:13:03 +01:00
008af10d0e Merge branch 'master' into Leo/Backend/UnitTest 2024-03-17 10:36:00 +01:00
f7df234312 moved portective method to Static ProtectiveService 2024-03-17 03:06:19 +01:00
d855bbe911 Merge branch 'Max/Backend/CourseInCurriculum' into Max/Backend/ReturnUserPasswordIssue 2024-03-17 02:50:12 +01:00
f2507ddcdd forgot the return statement 2024-03-17 02:46:33 +01:00
a70b05a0ef protected course'owner password 2024-03-17 02:45:49 +01:00
1d793cef4e moved UserWithouPaswword to authenticatorService 2024-03-17 02:40:05 +01:00
4cf2ac1aa8 fixed an issue with the getting of curriculums 2024-03-17 02:34:00 +01:00
6e6bd285af added security to the post of course and GET /courses 2024-03-17 02:15:08 +01:00
474a8d3f31 added POST /curriculum/{id} endopoint to post courses 2024-03-17 02:00:42 +01:00
4379794dba added /students endpoint 2024-03-16 23:05:26 +01:00
c5d7ce4178 cleaned the Entities 2024-03-16 20:31:03 +01:00
382d3c203a cleaned the services 2024-03-16 20:25:35 +01:00
5a7934b2a3 Merge branch 'master' into wal/front/listingUsers 2024-03-16 19:57:53 +01:00
97b57b361d cleaned all controllers 2024-03-16 19:13:57 +01:00
069466ef5f Max/Backend/CoursesEndpoints (#129)
PLZ FIX

Reviewed-on: PGL/Clyde#129
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-16 17:17:07 +01:00
d5f6656e2b added the GET /teachers (#130)
had to fix the mock and the UserController isAdminOrSecretary

Reviewed-on: PGL/Clyde#130
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-16 17:16:46 +01:00
17ab241250
show map by role 2024-03-16 16:57:52 +01:00
36ce5a553b Profil, merge Master and corrections 2024-03-16 15:21:10 +01:00
a5807148e1 And again we continue 2024-03-16 15:06:21 +01:00
182be8ac7b
Merge branch 'master' into Max/Backend/AppsController 2024-03-16 14:48:03 +01:00
da3f8c47f9
Fix merge because i'm bad 2024-03-16 14:34:11 +01:00
1546fc6d47
Merge branch 'master' into Max/Backend/BackendClean 2024-03-16 14:13:47 +01:00
45fbef52ed
fix tokens characters 2024-03-16 12:29:51 +01:00
abff9aef3a Merge branch 'master' into Max/Backend/AppsController 2024-03-16 11:58:03 +01:00
8f2fb04112 I pressed tab by accident 2024-03-16 09:03:03 +01:00
c6198b7220 cleaned Services + added private final to all repos 2024-03-16 09:02:08 +01:00
13fd048cd2 added a inscriptionService mock user 2024-03-16 09:01:36 +01:00
b7b2eafb93 removed the GET /Apps/{id} frontend just iterates on the /apps list 2024-03-16 00:44:11 +01:00
0860567e1b fixed the GetAuthorizedApps method 2024-03-16 00:42:46 +01:00
25009ba149 Enum in CamelCase 2024-03-16 00:34:20 +01:00
208c6c63e8 moved the isSecretaryOrAdmin method 2024-03-16 00:31:03 +01:00
e2da7271af rename Cursus -> Curriculum 2024-03-15 23:53:15 +01:00
1f14890d43 added ApplicationController and Application enum 2024-03-15 18:54:53 +01:00
189e664f37 Add tests for Storage system 2024-03-15 18:49:41 +01:00
f33a421aee Merge branch 'master' into Max/Backend/Curriculum 2024-03-15 17:40:42 +01:00
017235cccf fixed inscription in the backend 2024-03-15 17:29:45 +01:00
c8b7930a8e Setup unit tests and implements test for the token limit and trivial tests for userRepository 2024-03-15 11:20:23 +01:00
20d52b2b21 Merge pull request 'Max/Backend/RegisterEndPoint' (#105) from Max/Backend/RegisterEndPoint into master
Reviewed-on: PGL/Clyde#105
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
2024-03-14 23:30:13 +01:00
1502cc871c Merge pull request 'UploadAPI and profilePicture' (#102) from tonitch/front/apiUpload into master
Reviewed-on: PGL/Clyde#102
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
2024-03-14 22:37:30 +01:00
826bbf5990 Create the directory if not exists 2024-03-14 22:36:48 +01:00
c26972369f Putting the right configuration for cors 2024-03-14 22:35:57 +01:00
12846ed83d added cursus/course interactions 2024-03-14 21:53:43 +01:00
bb4ee784fa Merge pull request 'Max/Backend/UserControllerUpdate' (#94) from Max/Backend/UserControllerUpdate into master
Reviewed-on: PGL/Clyde#94
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-14 21:53:33 +01:00
9aa425d1c3 changed details 2024-03-14 20:04:27 +01:00
f0a411c031 added InscriptionController 2024-03-14 16:36:09 +01:00
64e7f8dc6b
modifying the frontend to send the image and getting the data 2024-03-13 22:33:39 +01:00
a0285e700d
Modifying backend so it send the full entry of a file upload 2024-03-13 22:28:59 +01:00
68e55e8355
Putting the right configuration for cors 2024-03-13 20:42:06 +01:00
157e5951fc ups je change un copié collé 2024-03-13 19:14:22 +01:00
4241f15731 j'ai envie de me pendre 2024-03-13 19:12:46 +01:00
cead1188ab Merge pull request 'Leo/Backend' (#95) from Leo/Backend into master
Reviewed-on: PGL/Clyde#95
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-13 18:06:33 +01:00
5c7147bb17 fixing the double throw before the merge
Signed-off-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-13 18:05:35 +01:00
2a58c335f2 Apply les trucs de l'exception 2024-03-13 15:48:28 +01:00
62f64eed60 HUUUUGE CHANGE 2024-03-13 15:36:13 +01:00
4b1db883e2 updated tonitch's reviews 2024-03-13 15:28:17 +01:00
044648674c Merge branch 'master' into Max/Backend/UserControllerUpdate 2024-03-12 23:16:35 +01:00
4b0ea8cf40 added the post /user Endpoint 2024-03-12 23:08:18 +01:00
dae59f67ce encoding the password before saving it
oups I Forgor
2024-03-12 22:35:25 +01:00
66282bce9f Create new constructor for ReinscriptionRequest so you don't have to worry about the type of the request 2024-03-12 17:53:52 +01:00
8fbfb36958 Remove the bad link between users and file. Add a delete function for storageFile entities and clean things. 2024-03-12 10:48:13 +01:00
5c728098df protected post /user and get/users and return without password 2024-03-12 00:03:32 +01:00
28d252279a added a small description 2024-03-11 22:33:53 +01:00
ab91a39a63 Create exception for file deletion.
Add user/inscriptionrequest connection to StorageFile entity.
Create a prototype of the delete for file function
2024-03-11 20:23:45 +01:00
d4c48ee9f1 Leo/Backend (#82)
Ce merge enverra dans main : le timeout des token, la limite de 5 token par user, les nouvelles tables pour les demandes d'inscriptions

Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: PGL/Clyde#82
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Co-authored-by: LeoMoulin <leomoulin125@gmail.com>
Co-committed-by: LeoMoulin <leomoulin125@gmail.com>
2024-03-11 19:16:19 +01:00
5325d6e3ae Storage System (#92)
First idea of the storage system

Reviewed-on: PGL/Clyde#92
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-11 17:52:08 +01:00
ce2efb61c8 fixed some issue for the token authorization (#87)
Reviewed-on: PGL/Clyde#87
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-10 23:28:13 +01:00
8fdfb470cb fixing the origin requests once and for all 2024-03-09 18:54:46 +01:00
847b1ca419 Solve crossOrigin Finally 2024-03-09 16:20:55 +01:00
521c98fdc2 token is now an writable char thanks to the modulos ! 2024-03-09 00:46:40 +01:00
82a3b152f2 put the params in the body and fixed token issue 2024-03-08 20:54:23 +01:00
fba30cff9e fixed a token encoding issue 2024-03-08 18:52:10 +01:00
acfd366fc8 fixed the user constructor issue 2024-03-08 12:00:56 +01:00
3b31fa794f Merge branch 'Leo/Backend' into Max/Backend/loginApi 2024-03-07 20:53:33 +01:00
c33b73a114 - Ajout de "l'url" de l'image dans User 2024-03-07 19:12:48 +01:00
2f2a72bfa0 added the possibility to remove the mocks 2024-03-07 17:29:31 +01:00
6b58c852a2 cleaning 2024-03-07 17:02:19 +01:00
8b35b3dc01 cleaned the login process 2024-03-07 17:01:50 +01:00
e1d8e37c52 Merge branch 'master' into Max/Backend/loginApi 2024-03-07 15:15:32 +01:00
2938707f0f added mocks users with their role as password and token 2024-03-07 00:55:07 +01:00
434cc8dd2b - On objectise tout
- Ajout des relation
2024-03-06 20:05:24 +01:00
4a85a55290 added Token and User Services 2024-03-06 17:38:09 +01:00
37d24c59e7 add generic HttpResponse 2024-03-06 17:37:38 +01:00
5acca4d10d added foreign key to user 2024-03-06 17:37:06 +01:00
b050a74b75 added LoginController Post(/login) 2024-03-06 17:35:49 +01:00
010f9200a7 removed useless line 2024-03-06 17:35:27 +01:00
6a39464f61 /bin/bash: line 1: q: command not found 2024-03-06 17:34:18 +01:00
7222bca6e2 added spring boot security without the login page 2024-03-06 17:30:13 +01:00
38ed249150
using unix socket 2024-03-06 10:52:11 +01:00
212ab638a2
allow unix socket connection for database in prod 2024-03-06 10:01:55 +01:00
bb0e6783ec correction commit 2024-03-05 23:34:49 +01:00
57de070eb1
Merge branch 'master' into LeoMoulin/Backend/Leo 2024-03-05 20:30:00 +01:00
c27c3ac9fb - Ajout des champs password et salt dans user
- Ajout de la table token
- Ajout des foreign keys
2024-03-05 14:14:56 +01:00
cc89d7f5b7 added ResponseEntity and TODOs 2024-03-04 23:35:15 +01:00
6c688dab59 added Admin and Secretary 2024-03-04 21:25:44 +01:00
516fc0d5e6
fix last commit 2024-03-04 20:42:10 +01:00
7abd2a001f
relatives position for static api 2024-03-04 20:15:12 +01:00
684c3095eb - Changement des noms de variables
- Ajout des getters/setters appropriés
- Ajout des constructeur nécessaires
2024-03-03 17:42:26 +01:00
bbe1f9767c Merge remote-tracking branch 'origin/LeoMoulin/Backend/Leo' into LeoMoulin/Backend/Leo 2024-03-03 17:05:09 +01:00
3956037ab5 example backend api with user table 2024-03-02 23:33:48 +01:00
21a42737a2 adding api definition in static files 2024-03-02 22:19:10 +01:00
fa522eabd3 fixing db 2024-03-02 19:30:26 +01:00
caf11b5b19 Refactoring backend (#42)
removing cors fails.
refactoring ping as a proposal for rest endpoints locations

Reviewed-on: PGL/Clyde#42
Reviewed-by: Maxime <231026@umons.ac.be>
Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Co-committed-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2024-03-01 18:43:56 +01:00
25019d8b91 Suppression de TeacherOwnerCourse.java et ajout d'un booléen Owned dans TeacherGivenCourse.java 2024-03-01 01:47:11 +01:00
69c3a3b965 Implémentation des différentes classes représentants les tables 2024-02-29 20:08:12 +01:00
0de7b69b1b
enable jpa library for managing data 2024-02-29 08:53:33 +01:00
56df39b584
[fix] wrong file 2024-02-27 19:15:36 +01:00
43adb6d31f
database on deploy 2024-02-27 16:55:16 +01:00
9c92e7d1e9
Ajout du CORS Pour le dev local + toastify + exmpl
tout est dans le titre
2024-02-27 14:24:26 +01:00
88108918dd
adding database support 2024-02-27 12:08:28 +01:00
6503af0096
Adding docker entry for backend
This allow you to run `docker-compose up` in the backend directory
to run the whole backend in a docker. by default the port is set to 4000
2024-02-26 13:20:03 +01:00
fb6527afd5 base of backend
Co-authored-by: Debucquoy <debucqquoy.anthony@gmail.com>
Reviewed-on: PGL/Clyde#29
Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Co-committed-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
2024-02-23 12:00:36 +01:00