Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
school-portal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Suleman
school-portal
Commits
98075e37
Commit
98075e37
authored
Jul 04, 2022
by
Muhammad Suleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Paths in Security Config
parent
6fb9c0b9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
32 additions
and
28 deletions
+32
-28
CourseController.java
.../java/com/school/project/controller/CourseController.java
+6
-6
DepartmentController.java
...a/com/school/project/controller/DepartmentController.java
+7
-6
StudentController.java
...java/com/school/project/controller/StudentController.java
+6
-5
TeacherController.java
...java/com/school/project/controller/TeacherController.java
+6
-5
UserController.java
...in/java/com/school/project/controller/UserController.java
+5
-2
OAuth2ServerConfiguration.java
...om/school/project/security/OAuth2ServerConfiguration.java
+2
-3
SecurityConfig.java
...main/java/com/school/project/security/SecurityConfig.java
+0
-1
No files found.
src/main/java/com/school/project/controller/CourseController.java
View file @
98075e37
...
...
@@ -18,12 +18,12 @@ import java.util.NoSuchElementException;
import
java.util.Optional
;
@Controller
@RequestMapping
()
@RequestMapping
(
"/course"
)
public
class
CourseController
{
@Autowired
(
required
=
true
)
public
CourseServiceImp
courseServiceImpl
;
@PostMapping
(
"/
courses
"
)
@PostMapping
(
"/
save
"
)
public
ResponseEntity
<
CourseDTO
>
saveCourse
(
@RequestBody
CourseDTO
courseDTO
)
{
try
{
...
...
@@ -35,7 +35,7 @@ public class CourseController {
}
}
@GetMapping
(
"/
courses
"
)
@GetMapping
(
"/
findAll
"
)
public
ResponseEntity
<
List
<
CourseDTO
>>
readAllCourses
()
{
List
<
CourseDTO
>
course
=
courseServiceImpl
.
readAllCourse
();
...
...
@@ -46,7 +46,7 @@ public class CourseController {
}
}
@GetMapping
(
"/
courses
/{id}"
)
@GetMapping
(
"/
find
/{id}"
)
public
ResponseEntity
<
CourseDTO
>
readCourseById
(
@PathVariable
(
name
=
"id"
)
Long
id
)
{
try
{
...
...
@@ -58,7 +58,7 @@ public class CourseController {
}
@PutMapping
(
"/
courses
/{id}"
)
@PutMapping
(
"/
update
/{id}"
)
public
ResponseEntity
<
CourseDTO
>
updateCourseById
(
@RequestBody
CourseDTO
courseDTO
,
@PathVariable
(
name
=
"id"
)
Long
id
)
{
try
{
CourseDTO
updateCourse
=
courseServiceImpl
.
updateCourseById
(
courseDTO
,
id
);
...
...
@@ -70,7 +70,7 @@ public class CourseController {
}
@DeleteMapping
(
"/
courses
/{id}"
)
@DeleteMapping
(
"/
delete
/{id}"
)
public
ResponseEntity
deleteCourseById
(
@PathVariable
(
name
=
"id"
)
Long
id
)
{
try
{
...
...
src/main/java/com/school/project/controller/DepartmentController.java
View file @
98075e37
...
...
@@ -15,11 +15,12 @@ import java.util.NoSuchElementException;
import
java.util.Optional
;
@RestController
@RequestMapping
(
"/department"
)
public
class
DepartmentController
{
@Autowired
(
required
=
true
)
public
DepartmentServiceImp
departmentServiceImp
;
@GetMapping
(
"
departments
"
)
@GetMapping
(
"
/findAll
"
)
public
ResponseEntity
<
List
<
DepartmentDTO
>>
readAllDepartments
()
{
List
<
DepartmentDTO
>
departmentDTO
=
departmentServiceImp
.
readDepartment
();
...
...
@@ -30,7 +31,7 @@ public class DepartmentController {
}
}
@GetMapping
(
"
departmentI
d/{id}"
)
@GetMapping
(
"
/fin
d/{id}"
)
public
ResponseEntity
<
DepartmentDTO
>
readDepartmentById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
DepartmentDTO
departmentDTO
=
departmentServiceImp
.
readDepartmentById
(
id
);
...
...
@@ -44,7 +45,7 @@ public class DepartmentController {
}
@GetMapping
(
"
departmentName
/{name}"
)
@GetMapping
(
"
/find
/{name}"
)
public
ResponseEntity
<
DepartmentDTO
>
findDepartmentByName
(
@PathVariable
(
"name"
)
String
name
)
{
DepartmentDTO
departmentDTO
=
departmentServiceImp
.
findDepartmentByName
(
name
);
...
...
@@ -55,7 +56,7 @@ public class DepartmentController {
}
}
@PostMapping
(
"
departments
"
)
@PostMapping
(
"
/save
"
)
public
ResponseEntity
<
DepartmentDTO
>
saveDepartment
(
@RequestBody
DepartmentDTO
department
)
{
try
{
...
...
@@ -71,7 +72,7 @@ public class DepartmentController {
}
@PutMapping
(
"
departments
/{id}"
)
@PutMapping
(
"
/update
/{id}"
)
public
ResponseEntity
<
DepartmentDTO
>
updateDepartmentById
(
@RequestBody
DepartmentDTO
department
,
@PathVariable
(
"id"
)
Long
id
)
{
try
{
DepartmentDTO
updateDepartment
=
departmentServiceImp
.
updateDepartment
(
department
,
id
);
...
...
@@ -81,7 +82,7 @@ public class DepartmentController {
}
}
@DeleteMapping
(
"
departments
/{id}"
)
@DeleteMapping
(
"
/delete
/{id}"
)
public
ResponseEntity
<
Object
>
deleteDepartmentById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
departmentServiceImp
.
deleteDepartmentById
(
id
);
...
...
src/main/java/com/school/project/controller/StudentController.java
View file @
98075e37
...
...
@@ -16,11 +16,12 @@ import java.util.NoSuchElementException;
import
java.util.Optional
;
@RestController
@RequestMapping
(
"/student"
)
public
class
StudentController
{
@Autowired
(
required
=
true
)
public
StudentServiceImp
studentServiceImp
;
@PostMapping
(
"/s
tudents
"
)
@PostMapping
(
"/s
ave
"
)
public
ResponseEntity
<
StudentDTO
>
saveStudent
(
@RequestBody
StudentDTO
studentDTO
)
{
StudentDTO
student
=
studentServiceImp
.
saveStudent
(
studentDTO
);
...
...
@@ -32,7 +33,7 @@ public class StudentController {
}
}
@GetMapping
(
"/
students
"
)
@GetMapping
(
"/
findAll
"
)
public
ResponseEntity
<
List
<
StudentDTO
>>
readAllStudents
()
{
List
<
StudentDTO
>
studentsDTO
=
studentServiceImp
.
readAllStudents
();
...
...
@@ -43,7 +44,7 @@ public class StudentController {
}
}
@GetMapping
(
"
students
/{id}"
)
@GetMapping
(
"
/find
/{id}"
)
public
ResponseEntity
<
StudentDTO
>
readStudentById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
...
...
@@ -55,7 +56,7 @@ public class StudentController {
}
@PutMapping
(
"
students
/{id}"
)
@PutMapping
(
"
/update
/{id}"
)
public
ResponseEntity
<
StudentDTO
>
updateStudentById
(
@RequestBody
StudentDTO
studentDTO
,
@PathVariable
(
"id"
)
Long
id
)
{
try
{
StudentDTO
updateStudent
=
studentServiceImp
.
updateStudentById
(
studentDTO
,
id
);
...
...
@@ -66,7 +67,7 @@ public class StudentController {
}
@DeleteMapping
(
"
students
/{id}"
)
@DeleteMapping
(
"
/delete
/{id}"
)
public
ResponseEntity
deleteStudentById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
studentServiceImp
.
deleteStudentById
(
id
);
...
...
src/main/java/com/school/project/controller/TeacherController.java
View file @
98075e37
...
...
@@ -19,12 +19,13 @@ import java.util.Optional;
@RestController
@ComponentScan
(
basePackages
=
"com.school.project.service.interfaces.TeacherService"
)
@RequestMapping
(
"/teacher"
)
public
class
TeacherController
{
@Autowired
(
required
=
true
)
public
TeacherServiceImp
teacherServiceImp
;
@PostMapping
(
"/save
Teachers
"
)
@PostMapping
(
"/save"
)
public
ResponseEntity
<
TeacherDTO
>
saveTeacher
(
@RequestBody
TeacherDTO
teacherDTO
)
{
TeacherDTO
dto
=
teacherServiceImp
.
saveTeacher
(
teacherDTO
);
...
...
@@ -35,7 +36,7 @@ public class TeacherController {
}
}
@GetMapping
(
"/
teachers
"
)
@GetMapping
(
"/
findAll
"
)
public
ResponseEntity
<
List
<
TeacherDTO
>>
readAllTeachers
()
{
List
<
TeacherDTO
>
teacherDTOS
=
teacherServiceImp
.
readAllTeachers
();
...
...
@@ -46,7 +47,7 @@ public class TeacherController {
}
}
@GetMapping
(
"
teachers
/{id}"
)
@GetMapping
(
"
/find
/{id}"
)
public
ResponseEntity
<
TeacherDTO
>
readTeacherById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
...
...
@@ -58,7 +59,7 @@ public class TeacherController {
}
@PutMapping
(
"
teachers
/{id}"
)
@PutMapping
(
"
/update
/{id}"
)
public
ResponseEntity
<
TeacherDTO
>
updateTeacherById
(
@RequestBody
TeacherDTO
teacherDTO
,
@PathVariable
(
"id"
)
Long
id
)
{
try
{
TeacherDTO
updateTeacher
=
teacherServiceImp
.
updateTeacher
(
teacherDTO
,
id
);
...
...
@@ -68,7 +69,7 @@ public class TeacherController {
}
}
@DeleteMapping
(
"
teachers
/{id}"
)
@DeleteMapping
(
"
/delete
/{id}"
)
public
ResponseEntity
deleteTeacherById
(
@PathVariable
(
"id"
)
Long
id
)
{
try
{
teacherServiceImp
.
deleteTeacherById
(
id
);
...
...
src/main/java/com/school/project/controller/UserController.java
View file @
98075e37
...
...
@@ -7,9 +7,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
@Controller
@RestController
@RequestMapping
(
"/user"
)
public
class
UserController
{
@Autowired
(
required
=
true
)
...
...
@@ -18,7 +21,7 @@ public class UserController {
@Autowired
(
required
=
true
)
UserMapper
userMapper
;
@PostMapping
(
"/save
user
"
)
@PostMapping
(
"/save"
)
public
String
saveUser
(
@ModelAttribute
UserDTO
userDTO
)
{
Integer
id
=
userService
.
saveUser
(
userMapper
.
userDtoToUser
(
userDTO
));
...
...
src/main/java/com/school/project/security/OAuth2ServerConfiguration.java
View file @
98075e37
...
...
@@ -48,9 +48,8 @@ public class OAuth2ServerConfiguration {
.
disable
()
.
and
()
.
authorizeRequests
()
.
antMatchers
(
"/department"
).
fullyAuthenticated
()
.
antMatchers
(
"/saveuser"
).
permitAll
()
.
antMatchers
(
"/home"
).
authenticated
();
.
antMatchers
(
"/user/**"
).
permitAll
()
.
antMatchers
(
"/course/**"
,
"/department/**"
,
"/student/**"
,
"/teacher/**"
).
authenticated
();
}
}
...
...
src/main/java/com/school/project/security/SecurityConfig.java
View file @
98075e37
...
...
@@ -31,7 +31,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
http
.
requestMatcher
(
new
BasicRequestMatcher
())
.
authorizeRequests
()
.
antMatchers
(
"/saveuser"
).
permitAll
()
.
antMatchers
(
"/oauth/token"
).
authenticated
()
.
and
()
.
httpBasic
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment