This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 8f43e297 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch '309-fix-broadcast-messages' into 'development'

Resolve "Fix Broadcast Messages"

See merge request sharing/codeability-sharing-platform!122
parents 22e9e31f ffe6e3fe
Branches
2 merge requests!124Bring Hotfix for images to production,!122Resolve "Fix Broadcast Messages"
......@@ -116,6 +116,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
strictHttpFirewall.setAllowSemicolon(true);
return strictHttpFirewall;
}
@Override
public void configure(WebSecurity web) {
web
......
......@@ -83,9 +83,10 @@ public class AuditEventConverter {
WebAuthenticationDetails authenticationDetails = (WebAuthenticationDetails) entry.getValue();
results.put("remoteAddress", authenticationDetails.getRemoteAddress());
String sessionId = authenticationDetails.getSessionId();
if(sessionId==null)
sessionId = "unknown";
results.put("sessionId", sessionId);
if (sessionId == null) {
sessionId = "unknown";
}
results.put("sessionId", sessionId);
} else {
results.put(entry.getKey(), Objects.toString(entry.getValue()));
}
......
......@@ -36,8 +36,9 @@ public class MessageService {
BroadCastMessageDTO[] messages = null;
public BroadCastMessageDTO[] getMessages() {
if(messages==null)
return new BroadCastMessageDTO[] {};
if (messages == null) {
return new BroadCastMessageDTO[] {};
}
return messages.clone();
}
......
......@@ -15,4 +15,5 @@ public class BroadCastMessageDTO {
public String target_path; // "*/welcome",
public String broadcast_type; // "banner",
public boolean dismissable; // false
public int[] target_access_levels; // [10, 30]
}
......@@ -15,6 +15,7 @@ export interface BroadCastMessage {
target_path: string; // "*/welcome",
broadcast_type: string; // "banner",
dismissable: boolean; // false
target_access_levels: number[];
}
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment