changeset 276:a7dd71fa8516 inbox

cleanup
author Alain Mazy <am@orthanc.team>
date Tue, 12 Aug 2025 16:47:33 +0200
parents 4f693a12935e
children a1bd1135a2c0 a662aa0e0d58
files NEWS Plugin/Plugin.cpp
diffstat 2 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Aug 12 10:43:35 2025 +0200
+++ b/NEWS	Tue Aug 12 16:47:33 2025 +0200
@@ -1,6 +1,12 @@
 Pending changes in the mainline
 ===============================
 
+=> Recommended Orthanc version: 1.12.9 <=
+=> Minimum Orthanc version: 1.11.3 <=
+=> Recommended SDK version: 1.12.9 <=
+=> Minimum SDK version: 1.11.3 <=
+
+
 * New configuration "ExtraPermissions" to ADD new permissions to
   the default "Permissions" entries.
 * Improved handling of "Anonymous" user profiles (when no auth-tokens
@@ -213,7 +219,8 @@
 ====================
 
 * BREAKING-CHANGE: the API between the authorization plugin and the 
-  WebService has slightly changed.  Check the samples in the README (TODO).
+  WebService has slightly changed.  Check the samples in this project:
+  https://github.com/orthanc-team/orthanc-auth-service.
   - "identifier" has been renamed into "server-id"
 * new user-permission based authorization model.  This is enabled if you
   define the new "WebServiceUserProfileUrl" configuration.
--- a/Plugin/Plugin.cpp	Tue Aug 12 10:43:35 2025 +0200
+++ b/Plugin/Plugin.cpp	Tue Aug 12 16:47:33 2025 +0200
@@ -52,8 +52,7 @@
 static std::string JoinStrings(const std::set<std::string>& values)
 {
   std::string out;
-  std::set<std::string> copy = values;    // TODO: remove after upgrading to OrthancFramework 1.11.3+
-  Orthanc::Toolbox::JoinStrings(out, copy, "|");
+  Orthanc::Toolbox::JoinStrings(out, values, "|");
   return out;
 }
 
@@ -149,8 +148,6 @@
                            const std::string& action,
                            const Json::Value& logData)
 {
-  LOG(WARNING) << "AUDIT-LOG: " << userId << " / " << action << " on " << resourceType << ":" << resourceId << ", " << logData.toStyledString();
-
   if (!enableAuditLogs_)
   {
     // This function should not be called if audit logs are disabled
@@ -178,6 +175,8 @@
                             action.c_str(),
                             logDataPtr,
                             logDataSize);
+#else
+  LOG(WARNING) << "AUDIT-LOG: " << userId << " / " << action << " on " << resourceType << ":" << resourceId << ", " << logData.toStyledString();
 #endif
 }
 
@@ -710,7 +709,6 @@
                 RecordAuditLog(userId,
                                 jobResourceType,
                                 sourceResourceId,
-                                // TODO: "isAnonymization" is always true because of "if" => why this test?
                                 (isAnonymization ? "success-anonymization-job" : "success-modification-job"),
                                 logData);
               }
@@ -725,7 +723,6 @@
                 RecordAuditLog(userId,
                                 jobResourceType,
                                 modifiedResourceId,
-                                // TODO: "isAnonymization" is always true because of "if" => why this test?
                                 (isAnonymization ? "new-study-from-anonymization-job" : "new-study-from-modification-job"), 
                                 logData);
               }
@@ -1323,7 +1320,7 @@
     
     if (coreApi.GetAnswerJson(coreResponse))
     {
-      LOG(WARNING) << "TODO AUDIT-LOG " << coreResponse.toStyledString(); // TODO 
+      LOG(WARNING) << "TODO AUDIT-LOG synchronous modification " << coreResponse.toStyledString(); // TODO 
     }
   }
 }