Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ protected HashMap<String, Object> getConfig(HttpServletRequest request) {
config.put("contextPath", contextPath);
config.put("currentTime", System.currentTimeMillis());
config.put("googleAnalyticsId", appProperties.getProperty("google_analytics_id"));
config.put("googleTagManagerId", appProperties.getProperty("google_tag_manager_id"));
config.put("googleClientId", googleClientId);
config.put("isGoogleClassroomEnabled", isGoogleClassroomEnabled());
config.put("logOutURL", contextPath + "/api/logout");
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/wise/portal/spring/impl/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ public class WebConfig implements WebMvcConfigurer {
@Value("${google_analytics_id:}")
private String googleAnalyticsId;

@Value("${google_tag_manager_id:}")
private String googleTagManagerId;

@Autowired
private ObjectMapper objectMapper;

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/application-dockerdev-sample.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spring.servlet.multipart.max-request-size=100MB
# recaptcha_public_key - [key or leave empty] public key for recaptcha
# recaptcha_private_key - [key or leave empty] private key for recaptcha
# google_analytics_id - [key or leave empty] key for tracking visitors with google analytics. Go here to get your own key: http://analytics.google.com
# google_tag_manager_id - [key or leave empty] key for tracking visitors with google tag manager. Go here to set up your tag manager account: https://tagmanager.google.com/
# cRater_verification_url - [url or leave empty] cRater verification url
# cRater_scoring_url - [url or leave empty] cRater scoring url
# cRater_client_id - [id or leave empty] cRater client token id
Expand All @@ -57,6 +58,7 @@ maxWorkgroupSize=3
isRealTimeEnabled=true
isBatchCreateUserAccountsEnabled=true
google_analytics_id=
google_tag_manager_id=
userAgentParseKey=
recaptcha_public_key=
recaptcha_private_key=
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/application_sample.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ spring.servlet.multipart.max-request-size=100MB
# recaptcha_public_key - [key or leave empty] public key for recaptcha
# recaptcha_private_key - [key or leave empty] private key for recaptcha
# google_analytics_id - [key or leave empty] key for tracking visitors with google analytics. Go here to get your own key: http://analytics.google.com
# google_tag_manager_id - [key or leave empty] key for tracking visitors with google tag manager. Go here to set up your tag manager account: https://tagmanager.google.com/
# cRater_verification_url - [url or leave empty] cRater verification url
# cRater_scoring_url - [url or leave empty] cRater scoring url
# cRater_client_id - [id or leave empty] cRater client token id
Expand All @@ -57,6 +58,7 @@ maxWorkgroupSize=3
isRealTimeEnabled=true
isBatchCreateUserAccountsEnabled=true
google_analytics_id=
google_tag_manager_id=
userAgentParseKey=
recaptcha_public_key=
recaptcha_private_key=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public void getConfig_WISEContextPath_ReturnConfig() {
expect(request.getContextPath()).andReturn("wise");
replay(request);
expect(appProperties.getProperty("google_analytics_id")).andReturn("UA-XXXXXX-1");
expect(appProperties.getProperty("google_tag_manager_id")).andReturn("GTM-XXXXXXXX");
expect(appProperties.getProperty("recaptcha_public_key")).andReturn("recaptcha-123-abc");
expect(appProperties.getProperty("wise4.hostname")).andReturn("http://localhost:8080/legacy");
expect(appProperties.getProperty("discourse_url")).andReturn("http://localhost:9292");
Expand All @@ -87,6 +88,7 @@ public void getConfig_WISEContextPath_ReturnConfig() {
assertEquals("wise/api/logout", config.get("logOutURL"));
assertFalse((boolean) config.get("isGoogleClassroomEnabled"));
assertEquals("UA-XXXXXX-1", config.get("googleAnalyticsId"));
assertEquals("GTM-XXXXXXXX", config.get("googleTagManagerId"));
verify(request);
verify(appProperties);
}
Expand Down