fix: Add togglz to track PAPI events

ORCID · Apr 5, 2024 · a50e2b1 · a50e2b1
1 parent 738da00
commit a50e2b1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/togglz/Features.java b/orcid-core/src/main/java/org/orcid/core/togglz/Features.java
@@ -18,7 +18,6 @@ public enum Features implements Feature {
 
     @Label("Registration 2.1: Add affiliations on registration")
     REGISTRATION_2_1,
-
 
     @Label("Registration 2.0")
     REGISTRATION_2_0,

diff --git a/...in/java/org/orcid/api/publicV2/server/delegator/impl/PublicV2ApiServiceDelegatorImpl.java b/...in/java/org/orcid/api/publicV2/server/delegator/impl/PublicV2ApiServiceDelegatorImpl.java
@@ -43,6 +43,7 @@
 import org.orcid.core.manager.read_only.ResearcherUrlManagerReadOnly;
 import org.orcid.core.manager.read_only.WorkManagerReadOnly;
 import org.orcid.core.oauth.openid.OpenIDConnectKeyService;
+import org.orcid.core.togglz.Features;
 import org.orcid.core.utils.ContributorUtils;
 import org.orcid.core.utils.OrcidRequestUtil;
 import org.orcid.core.utils.SourceUtils;
@@ -638,10 +639,12 @@ public Response viewClient(String clientId) {
 
     @Override
     public void trackEvents(HttpServletRequest httpRequest) {
-        String clientId = orcidSecurityManager.getClientIdFromAPIRequest();
-        String ip = OrcidRequestUtil.getIpAddress(httpRequest);
+        if (Features.PAPI_EVENTS.isActive()) {
+            String clientId = orcidSecurityManager.getClientIdFromAPIRequest();
+            String ip = OrcidRequestUtil.getIpAddress(httpRequest);
 
-        eventManager.createPapiEvent(clientId, ip, clientId == null ? true : false);
+            eventManager.createPapiEvent(clientId, ip, clientId == null ? true : false);
+        }
     }
 
 }
diff --git a/...in/java/org/orcid/api/publicV3/server/delegator/impl/PublicV3ApiServiceDelegatorImpl.java b/...in/java/org/orcid/api/publicV3/server/delegator/impl/PublicV3ApiServiceDelegatorImpl.java
@@ -46,6 +46,7 @@
 import org.orcid.core.manager.v3.read_only.ResearcherUrlManagerReadOnly;
 import org.orcid.core.manager.v3.read_only.WorkManagerReadOnly;
 import org.orcid.core.oauth.openid.OpenIDConnectKeyService;
+import org.orcid.core.togglz.Features;
 import org.orcid.core.utils.OrcidRequestUtil;
 import org.orcid.core.utils.v3.ContributorUtils;
 import org.orcid.core.utils.v3.SourceUtils;
@@ -969,10 +970,12 @@ public Response viewResearchResourceSummary(String orcid, Long putCode) {
 
     @Override
     public void trackEvents(HttpServletRequest httpRequest) {
-        String clientId = orcidSecurityManager.getClientIdFromAPIRequest();
-        String ip = OrcidRequestUtil.getIpAddress(httpRequest);
+        if (Features.PAPI_EVENTS.isActive()) {
+            String clientId = orcidSecurityManager.getClientIdFromAPIRequest();
+            String ip = OrcidRequestUtil.getIpAddress(httpRequest);
 
-        eventManager.createPapiEvent(clientId, ip, clientId == null ? true : false);
+            eventManager.createPapiEvent(clientId, ip, clientId == null ? true : false);
+        }
     }
 
 }