Merge pull request #9 from drivergroup/export-service-separationv0.2.4

Export service separation

2 files changed, 3 insertions, 31 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
index 276ef9f..48a86e3 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala
@@ -19,21 +19,6 @@ object ACL extends PhiLogging {
 
   // Common
 
-  object User
-      extends BaseACL(
-        label = "user",
-        create = Set(RecordAdmin, TrialAdmin, TreatmentMatchingAdmin),
-        read = Allow,
-        update = Allow,
-        delete = Set(RecordAdmin, TrialAdmin, TreatmentMatchingAdmin)
-      )
-
-  object Label
-      extends BaseACL(
-        label = "label",
-        read = RepRoles ++ TcRoles ++ TreatmentMatchingRoles + ResearchOncologist
-      )
-
   object UserHistory
       extends BaseACL(
         label = "user history",
@@ -53,7 +38,7 @@ object ACL extends PhiLogging {
   object MedicalRecord
       extends BaseACL(
         label = "medical record",
-        read = RepRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist,
+        read = RepRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + SystemUser,
         update = RepRoles - DocumentExtractor
       )
 
@@ -75,12 +60,6 @@ object ACL extends PhiLogging {
         delete = Set(DocumentExtractor, RecordAdmin)
       )
 
-  object Keyword
-      extends BaseACL(
-        label = "keyword",
-        read = Set(DocumentExtractor, RecordAdmin)
-      )
-
   object ProviderType
       extends BaseACL(
         label = "provider type",
@@ -107,7 +86,7 @@ object ACL extends PhiLogging {
   object Trial
       extends BaseACL(
         label = "trial",
-        read = TcRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist,
+        read = TcRoles + RoutesCurator + TreatmentMatchingAdmin + ResearchOncologist + SystemUser,
         update = TcRoles
       )
 
@@ -156,12 +135,6 @@ object ACL extends PhiLogging {
         delete = Set(TrialSummarizer, TrialAdmin)
       )
 
-  object Category
-      extends BaseACL(
-        label = "category",
-        read = Set(DocumentExtractor, RecordAdmin, CriteriaCurator, TrialAdmin)
-      )
-
   object Intervention
       extends BaseACL(
         label = "intervention",
@@ -180,7 +153,7 @@ object ACL extends PhiLogging {
   object Patient
       extends BaseACL(
         label = "patient",
-        read = TreatmentMatchingRoles + ResearchOncologist,
+        read = TreatmentMatchingRoles + ResearchOncologist + SystemUser,
         update = TreatmentMatchingRoles
       )
 
diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
index 16265c6..42f7435 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
@@ -31,5 +31,4 @@ object AuthenticatedRequestContext {
   implicit def toPhiString(x: AuthenticatedRequestContext): PhiString = {
     phi"AuthenticatedRequestContext(executor=${x.executor}, requestId=${x.requestId})"
   }
-
 }