fix: Build errors

Signed-off-by: Yash Pandey (YP) <[email protected]>

Author: EmperorYP7

CMakeLists.txt

@@ -32,7 +32,7 @@ endif()
 # Project definition.
 
 project(CasbinCPP
-    VERSION 1.36.0
+    VERSION 1.37.0
     DESCRIPTION "An authorization library that supports access control models like ACL, RBAC, ABAC in C/C++"
     HOMEPAGE_URL https://github.com/casbin/casbin-cpp
     LANGUAGES CXX C

bindings/python/py_model.cpp

@@ -58,6 +58,4 @@ void bindPyModel(py::module &m) {
         .def_static("NewModel", &casbin::Model::NewModel, "NewModel creates an empty model.")
         .def_static("NewModelFromFile", &casbin::Model::NewModelFromFile, "NewModelFromFile creates a model from a .CONF file.")
         .def_static("NewModelFromString", &casbin::Model::NewModelFromString, "NewModel creates a model from a std::string which contains model text.");
-
-    m.def("LoadModelFromConfig", &PyLoadModelFromConfig);
 }

casbin/CMakeLists.txt

@@ -13,65 +13,65 @@
 #  limitations under the License.
 
 set(CASBIN_SOURCE
-        abac_data.cpp
-        enforcer.cpp
-        enforcer_cached.cpp
-        enforcer_synced.cpp
-        internal_api.cpp
-        logger.cpp
-        management_api.cpp
-        pch.cpp
-        rbac_api.cpp
-        rbac_api_with_domains.cpp
-        config/config.cpp
-        duktape/duktape.cpp
-        effect/default_effector.cpp
-        ip_parser/exception/parser_exception.cpp
-        ip_parser/parser/allFF.cpp
-        ip_parser/parser/CIDRMask.cpp
-        ip_parser/parser/dtoi.cpp
-        ip_parser/parser/equal.cpp
-        ip_parser/parser/IP.cpp
-        ip_parser/parser/IPNet.cpp
-        ip_parser/parser/IPv4.cpp
-        ip_parser/parser/parseCIDR.cpp
-        ip_parser/parser/parseIP.cpp
-        ip_parser/parser/parseIPv4.cpp
-        ip_parser/parser/parseIPv6.cpp
-        ip_parser/parser/Print.cpp
-        ip_parser/parser/xtoi.cpp
-        model/assertion.cpp
-        model/function.cpp
-        model/model.cpp
-        model/scope_config.cpp
-        persist/file_adapter/batch_file_adapter.cpp
-        persist/file_adapter/file_adapter.cpp
-        persist/file_adapter/filtered_file_adapter.cpp
-        persist/adapter.cpp
-        persist/default_watcher.cpp
-        persist/default_watcher_ex.cpp
-        rbac/default_role_manager.cpp
-        util/array_equals.cpp
-        util/array_remove_duplicates.cpp
-        util/array_to_string.cpp
-        util/built_in_functions.cpp
-        util/ends_with.cpp
-        util/escape_assertion.cpp
-        util/find_all_occurences.cpp
-        util/is_instance_of.cpp
-        util/join.cpp
-        util/join_slice.cpp
-        util/remove_comments.cpp
-        util/set_subtract.cpp
-        util/split.cpp
-        util/ticker.cpp
-        util/trim.cpp
-        )
+    abac_data.cpp
+    enforcer.cpp
+    enforcer_cached.cpp
+    enforcer_synced.cpp
+    internal_api.cpp
+    logger.cpp
+    management_api.cpp
+    pch.cpp
+    rbac_api.cpp
+    rbac_api_with_domains.cpp
+    config/config.cpp
+    duktape/duktape.cpp
+    effect/default_effector.cpp
+    ip_parser/exception/parser_exception.cpp
+    ip_parser/parser/allFF.cpp
+    ip_parser/parser/CIDRMask.cpp
+    ip_parser/parser/dtoi.cpp
+    ip_parser/parser/equal.cpp
+    ip_parser/parser/IP.cpp
+    ip_parser/parser/IPNet.cpp
+    ip_parser/parser/IPv4.cpp
+    ip_parser/parser/parseCIDR.cpp
+    ip_parser/parser/parseIP.cpp
+    ip_parser/parser/parseIPv4.cpp
+    ip_parser/parser/parseIPv6.cpp
+    ip_parser/parser/Print.cpp
+    ip_parser/parser/xtoi.cpp
+    model/assertion.cpp
+    model/function.cpp
+    model/model.cpp
+    model/scope_config.cpp
+    persist/file_adapter/batch_file_adapter.cpp
+    persist/file_adapter/file_adapter.cpp
+    persist/file_adapter/filtered_file_adapter.cpp
+    persist/adapter.cpp
+    persist/default_watcher.cpp
+    persist/default_watcher_ex.cpp
+    rbac/default_role_manager.cpp
+    util/array_equals.cpp
+    util/array_remove_duplicates.cpp
+    util/array_to_string.cpp
+    util/built_in_functions.cpp
+    util/ends_with.cpp
+    util/escape_assertion.cpp
+    util/find_all_occurences.cpp
+    util/is_instance_of.cpp
+    util/join.cpp
+    util/join_slice.cpp
+    util/remove_comments.cpp
+    util/set_subtract.cpp
+    util/split.cpp
+    util/ticker.cpp
+    util/trim.cpp
+)
 
 # Setting to C++ standard to C++17
 set(CMAKE_CXX_STANDARD 17)
 
-add_library(casbin ${CASBIN_SOURCE})
+add_library(casbin STATIC ${CASBIN_SOURCE})
 target_include_directories(casbin PUBLIC ${CMAKE_SOURCE_DIR}/casbin)
 
 target_precompile_headers(casbin PUBLIC "pch.h")
@@ -89,12 +89,13 @@ elseif(UNIX)
     )
 endif()
 
-install(TARGETS casbin EXPORT CasbinTargets
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib
-        RUNTIME DESTINATION bin
-        INCLUDES DESTINATION include
-        )
+install(
+    TARGETS casbin EXPORT CasbinTargets
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+    INCLUDES DESTINATION include
+)
 
 install(
     DIRECTORY ${CMAKE_SOURCE_DIR}/include/casbin

include/casbin/casbin_helpers.h

@@ -54,7 +54,7 @@ namespace casbin {
         std::unordered_map<std::string, std::unordered_map<std::string, std::string>> data;
 
         /**
-         * addConfig adds a new section->key:value to the configuration.
+            * addConfig adds a new section->key:value to the configuration.
          */
         bool AddConfig(std::string section, const std::string& option, const std::string& value);
 
@@ -82,6 +82,10 @@ namespace casbin {
 
         bool GetBool(std::string_view key);
 
+        Config();
+
+        Config(const std::string& conf_name);
+
         int GetInt(std::string_view key);
 
         float GetFloat(std::string_view key);
@@ -206,7 +210,7 @@ namespace casbin {
             // LoadModelFromText loads the model from the text.
             void LoadModelFromText(const std::string& text);
 
-            void LoadModelFromConfig(std::shared_ptr<ConfigInterface> cfg);
+            void LoadModelFromConfig(std::shared_ptr<Config>& cfg);
 
             // PrintModel prints the model to the log.
             void PrintModel();