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.

Sign up for GitHub

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

Jump to bottom

Merge Security Branch into Main: Resolve Conflicts and Integrate JWT and OAuth2 Features #74

Merged
merged 17 commits into from
Oct 15, 2024
Merged

Merge Security Branch into Main: Resolve Conflicts and Integrate JWT and OAuth2 Features #74

merged 17 commits into from
Oct 15, 2024

Conversation

Guhapriya01
Copy link
Collaborator

@Guhapriya01 Guhapriya01 commented Oct 14, 2024 •
edited
Loading

This pull request merges the Security branch into the Main branch and resolves merge conflicts that occurred due to the integration of JWT and OAuth2 features.

Updates:

  • Resolved merge conflicts in multiple files, including Application.java and several controller classes.
  • Integrated JWT and OAuth2 features for enhanced security ( PR Implemented Jwt and Oauth2.0 Authentication  #67 )
  • Added security checks in BorrowingsController.
  • Included username in MembersDto.
  • Refactored MembersService for username integration.

ajaynegi45 and others added 17 commits September 29, 2024 11:15
@ajaynegi45
Add security
f6e1213
@ajaynegi45
Update
2e8984f
@rishabhrawat05
Login and Logout Feature
9c6cc32
@rishabhrawat05
Login and Logout Feature
3fd9c8f
@rishabhrawat05
Updated Login and Register functionality
163007d
@rishabhrawat05
Updated Security Functionality
4dc2474
@rishabhrawat05
Login and Logout Functionality Implemented
0877d91
@rishabhrawat05
Implemented Login and Logout Functionality
3f55239
@rishabhrawat05
Implemented Login and Logout Functionality
57ae1cf
@rishabhrawat05
Implemented Login and Logout Functionality
4cc8056
@rishabhrawat05
Implemented Login and Logout Functionality
9e813c1
@Guhapriya01
Merge pull request ajaynegi45#67 from rishabhrawat05/security
c3fd7a4 
Implemented Jwt and Oauth2.0 Authentication
@Guhapriya01
resolve merge conflicts and update application files
9fc43ab
@Guhapriya01
refactor: rename Application.java to LibrarymanApiApplication.java
4aa0ef4
@Guhapriya01
refactor: remove Add Members API
dbde4e5
@Guhapriya01
refactor: resolve merge conflicts and update application files
12bae50
@Guhapriya01
feat: refactor security checks in BorrowingController, include userna…
df2a0f9 
…me in MembersDto, and refactor MemberService for username integration
@Guhapriya01 Guhapriya01 marked this pull request as ready for review October 14, 2024 13:35
@ajaynegi45 ajaynegi45 merged commit afbe1b3 into ajaynegi45:main Oct 15, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajaynegi45 ajaynegi45 Awaiting requested review from ajaynegi45

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Guhapriya01 @ajaynegi45 @rishabhrawat05