Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #49

Merged
merged 63 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
8dc89a4
feat: Initial spring-boot api
Jan 31, 2024
493d7ad
chore: removed .idea
Toto-hitori Feb 2, 2024
95d1df7
Merge branch 'develop' into feat/spring-api
Toto-hitori Feb 3, 2024
6a2d124
feat: auth controller
Toto-hitori Feb 3, 2024
f5b7791
feat: register endpoint
Toto-hitori Feb 3, 2024
2126f72
feat: non null checks in LoginDto
Toto-hitori Feb 3, 2024
51e37fe
feat: refresh token endpoint
Toto-hitori Feb 3, 2024
d9376be
feat: mocked security config
Toto-hitori Feb 3, 2024
c107683
feat: user and role tables
Toto-hitori Feb 3, 2024
575f170
feat: jwt auth filter
Toto-hitori Feb 3, 2024
c65dcd7
refactor: jwt auth filter
Toto-hitori Feb 3, 2024
4dc7fc7
feat: added user to role
Toto-hitori Feb 3, 2024
627ed44
feat: jwt expiration
Toto-hitori Feb 3, 2024
f068a59
Merge branch 'develop' of https://github.com/Arquisoft/wiq_en2b into …
Feb 4, 2024
e510b82
chore: name added in README.md
Feb 4, 2024
d1d4878
chore: name added in README.md
Feb 4, 2024
64026e4
Merge remote-tracking branch 'origin/feat/spring-api' into feat/sprin…
Feb 4, 2024
b9d1d16
feat and refactor: add the initial version of the routing
jjgancfer Feb 2, 2024
72916e1
fix: solved tests not passing
jjgancfer Feb 2, 2024
0ffe3aa
chore: add localization dependencies and dotenv
jjgancfer Feb 4, 2024
991505a
feat: add a new top bar
jjgancfer Feb 4, 2024
c19dc9b
chore: cleaned up the base html document
jjgancfer Feb 4, 2024
204096b
feat: email as jwt subject
Toto-hitori Feb 5, 2024
72eb50a
chore: commented authManager
Toto-hitori Feb 5, 2024
35c5655
feat: dummy login implementation
Toto-hitori Feb 5, 2024
4a93b0d
chore: cleaned code
Toto-hitori Feb 5, 2024
12e95d3
chore: commented code
Toto-hitori Feb 5, 2024
6563fb7
chore: unused imports
Toto-hitori Feb 5, 2024
ca736c4
feat: register implementation
Toto-hitori Feb 5, 2024
c4d0b28
chore: removed unused methods
Toto-hitori Feb 5, 2024
2a0a6ac
chore: cleaned code
Toto-hitori Feb 5, 2024
c9ce864
feat: register implementation
Toto-hitori Feb 5, 2024
6f569f5
chore: removed unused methods
Toto-hitori Feb 5, 2024
b4e767b
Merge remote-tracking branch 'origin/feat/spring-api' into feat/sprin…
Toto-hitori Feb 6, 2024
9f0097f
fix!: cors filter
Toto-hitori Feb 6, 2024
633222f
chore: moved RoleRepository
Toto-hitori Feb 6, 2024
7390b7b
Merge pull request #14 from Arquisoft/feat/initial-webapp-routing
gony02 Feb 6, 2024
70f7215
feat: database settings -> environment variables
Toto-hitori Feb 6, 2024
ac9d652
fix: added missing request body
Toto-hitori Feb 6, 2024
a3164b2
fix: added missing dependencies
Toto-hitori Feb 6, 2024
e99a2e1
refactor: JwtService -> JwtUtils
Toto-hitori Feb 6, 2024
7820bf5
feat: updated pom dependencies
Toto-hitori Feb 6, 2024
5a0c70c
feat: refresh token
Toto-hitori Feb 6, 2024
c9091c3
feat: exception handling
Toto-hitori Feb 6, 2024
6b18c5c
refactor: moved user folder
Toto-hitori Feb 6, 2024
8dd1e5c
feat: finished auth
Toto-hitori Feb 6, 2024
c3947c7
chore: used same logger as CustomControllerAdvice
Toto-hitori Feb 7, 2024
d31584e
Merge branch 'initial-modifications' into feat/spring-api
Toto-hitori Feb 7, 2024
72a2a8e
Merge pull request #17 from Arquisoft/feat/spring-api
UO283615 Feb 9, 2024
1b1a91f
chore: installed chakra ui and removed mui
jjgancfer Feb 9, 2024
8cfdf3e
refactor: removal of the login and register pages, and their tests
jjgancfer Feb 9, 2024
493abec
feat: added new topbar, with a external json that serves as nav tree
jjgancfer Feb 9, 2024
53e2030
feat: add localization for the top bar
jjgancfer Feb 9, 2024
8ff034d
test: add some initial rendering testing for the top bar
jjgancfer Feb 10, 2024
4e1f1da
chore: useless files
Toto-hitori Feb 14, 2024
065d6c0
chore: .idea
Toto-hitori Feb 14, 2024
f300902
chore: useless files
Toto-hitori Feb 14, 2024
87cab42
Merge remote-tracking branch 'origin/initial-modifications' into init…
Toto-hitori Feb 14, 2024
07d39d7
Merge branch 'initial-modifications' into feat/webapp/top-bar
gony02 Feb 15, 2024
d2b8c58
fix/chore: remove dead code and tests
jjgancfer Feb 16, 2024
d6821ec
Merge pull request #32 from Arquisoft/feat/webapp/top-bar
gony02 Feb 16, 2024
4c9857d
Merge branch 'develop' into initial-modifications
gony02 Feb 20, 2024
0851d7e
Merge pull request #48 from Arquisoft/initial-modifications
Toto-hitori Feb 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: moved RoleRepository
  • Loading branch information
Toto-hitori committed Feb 6, 2024
commit 633222fcef21d2cd2114ab54a0790014e345d193
1 change: 1 addition & 0 deletions api/src/main/java/lab/en2b/quizapi/user/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lab.en2b.quizapi.auth.config.UserDetailsImpl;
import lab.en2b.quizapi.auth.dtos.RegisterDto;
import lab.en2b.quizapi.user.role.RoleRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package lab.en2b.quizapi.user;
package lab.en2b.quizapi.user.role;


import lab.en2b.quizapi.user.role.Role;
Expand Down