Merge branch 'develop' into enroll-mgmt-exception-handling

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/config/CommonModuleConfiguration.java

@@ -14,6 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -26,6 +27,9 @@
 @ComponentScan(basePackages = "com.google.cloud.healthcare.fdamystudies")
 public class CommonModuleConfiguration implements WebMvcConfigurer {
 
+  @Autowired
+  private RestTemplateAuthTokenModifierInterceptor restTemplateAuthTokenModifierInterceptor;
+
   @Bean
   public ObjectMapper objectMapper() {
     return new ObjectMapper();
@@ -57,7 +61,7 @@ protected void addInterceptors(RestTemplate restTemplate) {
     if (CollectionUtils.isEmpty(interceptors)) {
       interceptors = new ArrayList<>();
     }
-    interceptors.add(new RestTemplateAuthTokenModifierInterceptor());
+    interceptors.add(restTemplateAuthTokenModifierInterceptor);
     restTemplate.setInterceptors(interceptors);
   }
 }

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/interceptor/RestTemplateAuthTokenModifierInterceptor.java

@@ -17,7 +17,9 @@
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.stereotype.Component;
 
+@Component
 public class RestTemplateAuthTokenModifierInterceptor implements ClientHttpRequestInterceptor {
 
   @Autowired private OAuthService oauthService;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/AppEntity.java

@@ -32,16 +32,11 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "app_info")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class AppEntity implements Serializable {
 
   private static final long serialVersionUID = 4985607753888575491L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/AppPermissionEntity.java

@@ -30,17 +30,12 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @ToString
 @Setter
 @Getter
 @Entity
 @Table(name = "app_permissions")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class AppPermissionEntity implements Serializable {
 
   private static final long serialVersionUID = 8610289975376774137L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/AuditEventEntity.java

@@ -21,16 +21,11 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "audit_events")
-@ConditionalOnProperty(
-    value = "commonservice.auditlogevent.enabled",
-    havingValue = "true",
-    matchIfMissing = true)
 public class AuditEventEntity {
 
   @Id

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/AuthInfoEntity.java

@@ -27,16 +27,11 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "auth_info")
-@ConditionalOnProperty(
-    value = "participant.datastore.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class AuthInfoEntity implements Serializable {
 
   private static final long serialVersionUID = 4985607753888575491L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/LocationEntity.java

@@ -32,16 +32,11 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "locations")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class LocationEntity implements Serializable {
 
   private static final long serialVersionUID = 1L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/ParticipantRegistrySiteEntity.java

@@ -34,12 +34,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 @Setter
 @Getter
 @Entity

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/ParticipantStudyEntity.java

@@ -30,12 +30,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 @Setter
 @Getter
 @Entity

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/PersonalizedUserReportEntity.java

@@ -27,7 +27,6 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @AllArgsConstructor
 @Builder
@@ -36,10 +35,6 @@
 @Entity
 @NoArgsConstructor
 @Table(name = "personalized_user_report")
-@ConditionalOnProperty(
-    value = "participant.datastore.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class PersonalizedUserReportEntity implements Serializable {
 
   private static final long serialVersionUID = -3019529323339411129L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/SiteEntity.java

@@ -33,16 +33,11 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "sites")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class SiteEntity implements Serializable {
 
   private static final long serialVersionUID = 1L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/SitePermissionEntity.java

@@ -31,18 +31,13 @@
 import lombok.ToString;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
 @Table(name = "sites_permissions")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class SitePermissionEntity implements Serializable {
 
   private static final long serialVersionUID = 1L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/StudyConsentEntity.java

@@ -27,16 +27,11 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "study_consent")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class StudyConsentEntity implements Serializable {
 
   private static final long serialVersionUID = 6218229749598633153L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/StudyEntity.java

@@ -37,7 +37,6 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
@@ -49,10 +48,6 @@
           columnNames = {"custom_id", "app_info_id"},
           name = "study_info_custom_id_app_info_id_uidx")
     })
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class StudyEntity implements Serializable {
 
   private static final long serialVersionUID = 5392367043067145963L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/StudyPermissionEntity.java

@@ -28,17 +28,12 @@
 import lombok.ToString;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @ToString
 @Entity
 @Table(name = "study_permissions")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class StudyPermissionEntity implements Serializable {
 
   private static final long serialVersionUID = -9223143734827095684L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/UserAppDetailsEntity.java

@@ -23,16 +23,11 @@
 import lombok.ToString;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
 @Entity
 @Table(name = "user_app_details")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class UserAppDetailsEntity implements Serializable {
 
   private static final long serialVersionUID = 4985607753888575491L;

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/UserDetailsEntity.java

@@ -35,12 +35,7 @@
 import lombok.ToString;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 @Setter
 @Getter
 @ToString

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/UserInstitutionEntity.java

@@ -19,7 +19,6 @@
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 @Setter
 @Getter
@@ -28,10 +27,6 @@
 @Builder
 @NoArgsConstructor
 @Table(name = "user_institution")
-@ConditionalOnProperty(
-    value = "participant.datastore.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class UserInstitutionEntity {
   @Id
   @GeneratedValue(generator = "system-uuid")

common-modules/common-service/src/main/java/com/google/cloud/healthcare/fdamystudies/model/UserRegAdminEntity.java

@@ -31,18 +31,13 @@
 import lombok.ToString;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.annotation.Transient;
 
 @ToString
 @Getter
 @Setter
 @Entity
 @Table(name = "ur_admin_user")
-@ConditionalOnProperty(
-    value = "participant.manager.entities.enabled",
-    havingValue = "true",
-    matchIfMissing = false)
 public class UserRegAdminEntity implements Serializable {
 
   private static final long serialVersionUID = 8686769972691178223L;

common-modules/common-tests/src/main/resources/__files/auth-server/auth-server-token-validation-response.json

@@ -0,0 +1 @@
+1

common-modules/common-tests/src/main/resources/__files/auth-server/validate_client_credential_response.json

@@ -0,0 +1,5 @@
+{
+	"code": 200,
+	"message":"SUCCESS",
+	"isValidClient":true
+}

common-modules/common-tests/src/main/resources/__files/oauth-scim-service/unauthorized.json

@@ -0,0 +1,8 @@
+{
+  "error": "request_unauthorized",
+  "error_description": "The request could not be authorized",
+  "error_hint": "Check that you provided valid credentials in the right format.",
+  "status_code": 401,
+  "error_debug": ": not_found",
+  "request_id": ""
+}

common-modules/common-tests/src/main/resources/mappings/auth-server/auth-server-token-validation.json

@@ -0,0 +1,13 @@
+{
+	"request": {
+		"method": "POST",
+		"url": "/AuthServer/tokenAuthentication"
+	},
+	"response": {
+		"status": 200,
+		"headers": {
+			"Content-Type": "application/json;charset=UTF-8"
+		},
+		"bodyFileName": "auth-server/auth-server-token-validation-response.json"
+	}
+}

common-modules/common-tests/src/main/resources/mappings/auth-server/validate_client_credential.json

@@ -0,0 +1,13 @@
+{
+	"request": {
+		"method": "POST",
+		"url": "/AuthServer/validateClientCredentials"
+	},
+	"response": {
+		"status": 200,
+		"headers": {
+			"Content-Type": "application/json;charset=UTF-8"
+		},
+		"bodyFileName": "auth-server/validate_client_credential_response.json"
+	}
+}

common-modules/common-tests/src/main/resources/mappings/oauth-scim-service/rest-template-auth-token-nodifier-interceptor-unauthorized.json

@@ -0,0 +1,18 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/restTemplateAuthTokenModifierInterceptor",
+    "headers": {
+      "Authorization": {
+        "contains": "cd57710c-1d19-4058-8bfe-a6aac3a39e35"
+      }
+    }
+  },
+  "response": {
+    "status": 401,
+    "headers": {
+      "Content-Type": "application/json;charset=UTF-8"
+    },
+    "bodyFileName": "oauth-scim-service/unauthorized.json"
+  }
+}