[DAPS-1837] - refactor: core server to support proto3 (#1844)

* [DAPS-1845] - refactor repo server to use proto3 (#1846)
* [DAPS-1847] - refactor: python package to be compatible with proto3 envelope (#1849)
* [DAPS-1848] - refactor: update authz files to use proto3. (#1851)
* [DAPS-1850] - refactor web server proto3 (#1852)

Author: JoshuaSBrown

CMakeLists.txt

@@ -128,8 +128,8 @@ endif()
 if( BUILD_WEB_SERVER )
   include(./cmake/Web.cmake)
 
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/common/proto/common/" 
-     DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/web/proto/")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/common/proto3/common/" 
+     DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/web/proto3/")
 
   if( ENABLE_UNIT_TESTS )
     add_test(NAME unit_tests_web COMMAND "${DEPENDENCY_INSTALL_PATH}/nvm/versions/node/${LOCAL_NODE_VERSION}/bin/npm" "test")
@@ -199,7 +199,7 @@ endif()
 
 if( BUILD_PYTHON_CLIENT )
   # make target = pydatafed
-  file(COPY ${PROJECT_SOURCE_DIR}/external/DataFedDependencies/python/datafed_pkg/requirements.txt DESTINATION ${PROJECT_SOURCE_DIR}/python/datafed_pkg/requirements.txt)
+  file(COPY ${PROJECT_SOURCE_DIR}/external/DataFedDependencies/python/datafed_pkg/requirements.txt DESTINATION ${PROJECT_SOURCE_DIR}/python/datafed_pkg)
   add_subdirectory( python EXCLUDE_FROM_ALL )
 endif()
 
@@ -227,9 +227,9 @@ if( INSTALL_CORE_SERVER )
 endif()
 
 if( INSTALL_WEB_SERVER )
-  install( FILES ${ProtoFiles} DESTINATION ${DATAFED_INSTALL_PATH}/web )
   install( DIRECTORY ${PROJECT_SOURCE_DIR}/web/static DESTINATION ${DATAFED_INSTALL_PATH}/web )
   install( DIRECTORY ${PROJECT_SOURCE_DIR}/web/views DESTINATION ${DATAFED_INSTALL_PATH}/web )
+  install( DIRECTORY ${PROJECT_SOURCE_DIR}/web/proto3 DESTINATION ${DATAFED_INSTALL_PATH}/web )
   install( FILES ${PROJECT_SOURCE_DIR}/web/version.js DESTINATION ${DATAFED_INSTALL_PATH}/web )
 endif()
 

core/server/ClientWorker.cpp

@@ -182,7 +182,7 @@ class ClientWorker : public nlohmann::json_schema::basic_error_handler {
 
   void schemaEnforceRequiredProperties(const nlohmann::json &a_schema);
   void recordCollectionDelete(const std::vector<std::string> &a_ids,
-                              Auth::TaskDataReply &a_reply,
+                              SDMS::TaskDataReply &a_reply,
                               LogContext log_context);
   void handleTaskResponse(libjson::Value &a_result, LogContext log_context);
 

core/server/ClientWorker.hpp

@@ -8,7 +8,7 @@
 // DataFed Common public includes
 #include "common/DynaLog.hpp"
 #include "common/ICredentials.hpp"
-#include "common/SDMS.pb.h"
+#include "common/envelope.pb.h"
 
 // Standard includes
 #include <map>