Skip to content

Commit e25849d

Browse files
committed
feat: update CORS configuration to allow localhost for development and enhance audit logging for user logins
1 parent 6a1a117 commit e25849d

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

server/src/main/java/com/incial/crm/config/SecurityConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
6767
public CorsConfigurationSource corsConfigurationSource() {
6868
CorsConfiguration configuration = new CorsConfiguration();
6969

70-
configuration.setAllowedOrigins(List.of("https://workhub.incial.in"));
70+
configuration.setAllowedOrigins(List.of("https://workhub.incial.in","http://localhost:3000"));
7171
configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
7272
configuration.setAllowedHeaders(List.of("*"));
7373
configuration.setExposedHeaders(List.of("Authorization"));

server/src/main/java/com/incial/crm/service/AuthService.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.io.IOException;
3333
import java.security.GeneralSecurityException;
3434
import java.util.Collections;
35+
import java.util.Objects;
3536

3637
@Slf4j
3738
@Service
@@ -117,13 +118,15 @@ public LoginResponse login(LoginRequest request) {
117118
.clientCrmId(user.getClientCrmId())
118119
.build();
119120

120-
auditLogService.createLog(
121-
"USER_LOGIN",
122-
user.getName() + " logged in via email/password",
123-
user.getName(),
124-
user.getEmail(),
125-
"LOGIN"
126-
);
121+
if(!Objects.equals(user.getRole(), "ROLE_SUPER_ADMIN")){
122+
auditLogService.createLog(
123+
"USER_LOGIN",
124+
user.getName() + " logged in via password",
125+
user.getName(),
126+
user.getEmail(),
127+
"LOGIN"
128+
);
129+
}
127130

128131
return LoginResponse.builder()
129132
.statusCode(200)
@@ -198,13 +201,15 @@ public LoginResponse loginWithGoogle(GoogleLoginRequest request) {
198201
.clientCrmId(user.getClientCrmId())
199202
.build();
200203

201-
auditLogService.createLog(
202-
"USER_LOGIN",
203-
user.getName() + " logged in via Google",
204-
user.getName(),
205-
user.getEmail(),
206-
"LOGIN"
207-
);
204+
if(!Objects.equals(user.getRole(), "ROLE_SUPER_ADMIN")){
205+
auditLogService.createLog(
206+
"USER_LOGIN",
207+
user.getName() + " logged in via Google",
208+
user.getName(),
209+
user.getEmail(),
210+
"LOGIN"
211+
);
212+
}
208213

209214
return LoginResponse.builder()
210215
.statusCode(200)

0 commit comments

Comments
 (0)