diff --git a/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java b/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java index 33028caf21c5c5aeb89444f6106d262f7859ce83..fe2fac1506400c59bed33bf7175eef29a6c2b378 100644 --- a/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java +++ b/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java @@ -51,9 +51,9 @@ public class WebSecurityConfig{ // Turn off the csrf mechanism, you can use get login, otherwise you can only use post http .csrf(csrf-> csrf.disable()) .authorizeHttpRequests(requests -> requests - .requestMatchers("/device.html").hasRole("ADMIN") - //+.requestMatchers("/superAdminView.html").hasRole("SUPER") - .requestMatchers("/commonUser.html").authenticated() + .requestMatchers("/superAdminView.html").hasRole("SUPER") + .requestMatchers("/hospitalView.html").hasRole("HOSPITAL") + .requestMatchers("/admin.html").hasRole("ADMIN") .anyRequest().permitAll() ) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 016cd27131628dfda5f2294af201f310b8e13c52..0b8680184734f9359f3e3bc8f2de28c6194ba4d9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ healthcare: datasource: - url: jdbc:mariadb://localhost:3307/healthcare - port: 3307 + url: jdbc:mariadb://localhost:3306/healthcare?createDatabaseIfNotExist=true + port: 3306 username: root - password: root \ No newline at end of file + password: comsc \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ccda0b6b30cbed6abaff7a0272a6c488f1819e0c..6263e3e2af0caa0e71a1306ab9140573a94bd15b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,12 +8,12 @@ spring: username: ${healthcare.datasource.username} password: ${healthcare.datasource.password} port: ${healthcare.datasource.port} - sql: - init: - schema-locations: classpath:schema.sql - data-locations: classpath:data.sql - platform: mariadb - mode: always + sql: + init: + schema-locations: classpath:schema.sql + data-locations: classpath:data.sql + platform: mariadb + mode: always thymeleaf: prefix: classpath:/templates/ suffix: .html