Aliaksei Darafeyeu · ethiraj krishnamanaidu · Duvelis Carao
--- a/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/Slf4jMDCFilter.java 0 → 100644
+++ b/provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/util/Slf4jMDCFilter.java 0 → 100644
+
+    String userId = getUserId();
+    if (userId != null) {
+      contextMap.put("user-id", userId);
+    }
+
+    return contextMap;
+  }
+
+  /**
+   * Get user ID from Authorization payload (JWT token).
+   *
+   * @return the user ID
+   */
+  private String getUserId() {
+    JWTClaimsSet claimsSet = authUtils.getClaimsFromJwtToken(dpsHeaders.getAuthorization());
--- a/notification-core/src/main/java/org/opengroup/osdu/notification/auth/EntitlementsClientFactory.java
+++ b/notification-core/src/main/java/org/opengroup/osdu/notification/auth/EntitlementsClientFactory.java
 public class EntitlementsClientFactory extends AbstractFactoryBean<IEntitlementsFactory> {

 	@Autowired
-    private IAppProperties config;
+	private IAppProperties config;
+	@Autowired
+	private HttpResponseBodyMapper responseBodyMapper;

 	@Override
 	protected IEntitlementsFactory createInstance()  {
-		return new EntitlementsFactory(EntitlementsAPIConfig.builder().rootUrl(config.getAuthorizeAPI()).build());
+		return new EntitlementsFactory(EntitlementsAPIConfig.builder().rootUrl(config.getAuthorizeAPI()).build(),