diff --git a/src/libs/CMakeLists.txt b/src/libs/CMakeLists.txt index 728cc175..196b2a1b 100644 --- a/src/libs/CMakeLists.txt +++ b/src/libs/CMakeLists.txt @@ -1,5 +1,4 @@ -add_subdirectory(auth) add_subdirectory(av) add_subdirectory(database) add_subdirectory(image) diff --git a/src/libs/auth/CMakeLists.txt b/src/libs/auth/CMakeLists.txt deleted file mode 100644 index 07400a6b..00000000 --- a/src/libs/auth/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ - -add_library(lmsauth SHARED - impl/AuthTokenService.cpp - impl/AuthServiceBase.cpp - impl/EnvService.cpp - impl/LoginThrottler.cpp - impl/PasswordServiceBase.cpp - impl/http-headers/HttpHeadersEnvService.cpp - impl/internal/InternalPasswordService.cpp - ) - -target_include_directories(lmsauth INTERFACE - include - ) - -target_include_directories(lmsauth PRIVATE - include - impl - ) - -target_link_libraries(lmsauth PRIVATE - lmsutils - lmsdatabase - ) - -target_link_libraries(lmsauth PUBLIC - pthread - Boost::system - Wt::Wt - ) - -if (USE_PAM) - target_compile_options(lmsauth PRIVATE "-DLMS_SUPPORT_PAM") - target_sources(lmsauth PRIVATE impl/pam/PAMPasswordService.cpp) - target_include_directories(lmsauth PRIVATE ${PAM_INCLUDE_DIR}) - target_link_libraries(lmsauth PRIVATE ${PAM_LIBRARIES}) -endif (USE_PAM) - -install(TARGETS lmsauth DESTINATION lib) - diff --git a/src/libs/lmscore/CMakeLists.txt b/src/libs/lmscore/CMakeLists.txt index 358df97a..4403380a 100644 --- a/src/libs/lmscore/CMakeLists.txt +++ b/src/libs/lmscore/CMakeLists.txt @@ -1,6 +1,13 @@ add_library(lmscore SHARED - impl/CoverService.cpp + impl/auth/AuthTokenService.cpp + impl/auth/AuthServiceBase.cpp + impl/auth/EnvService.cpp + impl/auth/LoginThrottler.cpp + impl/auth/PasswordServiceBase.cpp + impl/auth/http-headers/HttpHeadersEnvService.cpp + impl/auth/internal/InternalPasswordService.cpp + impl/cover/CoverService.cpp ) target_include_directories(lmscore INTERFACE @@ -14,7 +21,6 @@ target_include_directories(lmscore PRIVATE target_link_libraries(lmscore PRIVATE lmsav - lmsimage ) target_link_libraries(lmscore PUBLIC @@ -22,7 +28,16 @@ target_link_libraries(lmscore PUBLIC lmsimage lmsutils std::filesystem + Wt::Wt ) +if (USE_PAM) + target_compile_options(lmscore PRIVATE "-DLMS_SUPPORT_PAM") + target_sources(lmscore PRIVATE impl/auth/pam/PAMPasswordService.cpp) + target_include_directories(lmscore PRIVATE ${PAM_INCLUDE_DIR}) + target_link_libraries(lmscore PRIVATE ${PAM_LIBRARIES}) +endif (USE_PAM) + + install(TARGETS lmscore DESTINATION lib) diff --git a/src/libs/auth/impl/AuthServiceBase.cpp b/src/libs/lmscore/impl/auth/AuthServiceBase.cpp similarity index 100% rename from src/libs/auth/impl/AuthServiceBase.cpp rename to src/libs/lmscore/impl/auth/AuthServiceBase.cpp diff --git a/src/libs/auth/impl/AuthServiceBase.hpp b/src/libs/lmscore/impl/auth/AuthServiceBase.hpp similarity index 100% rename from src/libs/auth/impl/AuthServiceBase.hpp rename to src/libs/lmscore/impl/auth/AuthServiceBase.hpp diff --git a/src/libs/auth/impl/AuthTokenService.cpp b/src/libs/lmscore/impl/auth/AuthTokenService.cpp similarity index 99% rename from src/libs/auth/impl/AuthTokenService.cpp rename to src/libs/lmscore/impl/auth/AuthTokenService.cpp index f6f305b6..05949870 100644 --- a/src/libs/auth/impl/AuthTokenService.cpp +++ b/src/libs/lmscore/impl/auth/AuthTokenService.cpp @@ -23,7 +23,7 @@ #include #include -#include "auth/Types.hpp" +#include "lmscore/auth/Types.hpp" #include "database/Session.hpp" #include "database/User.hpp" #include "utils/Exception.hpp" diff --git a/src/libs/auth/impl/AuthTokenService.hpp b/src/libs/lmscore/impl/auth/AuthTokenService.hpp similarity index 97% rename from src/libs/auth/impl/AuthTokenService.hpp rename to src/libs/lmscore/impl/auth/AuthTokenService.hpp index 8825a3d3..f1425117 100644 --- a/src/libs/auth/impl/AuthTokenService.hpp +++ b/src/libs/lmscore/impl/auth/AuthTokenService.hpp @@ -21,7 +21,7 @@ #include -#include "auth/IAuthTokenService.hpp" +#include "lmscore/auth/IAuthTokenService.hpp" #include "AuthServiceBase.hpp" #include "LoginThrottler.hpp" diff --git a/src/libs/auth/impl/EnvService.cpp b/src/libs/lmscore/impl/auth/EnvService.cpp similarity index 93% rename from src/libs/auth/impl/EnvService.cpp rename to src/libs/lmscore/impl/auth/EnvService.cpp index 12de9858..99046d40 100644 --- a/src/libs/auth/impl/EnvService.cpp +++ b/src/libs/lmscore/impl/auth/EnvService.cpp @@ -17,9 +17,8 @@ * along with LMS. If not, see . */ -#include "auth/IEnvService.hpp" - -#include "auth/Types.hpp" +#include "lmscore/auth/IEnvService.hpp" +#include "lmscore/auth/Types.hpp" #include "http-headers/HttpHeadersEnvService.hpp" namespace Auth diff --git a/src/libs/auth/impl/LoginThrottler.cpp b/src/libs/lmscore/impl/auth/LoginThrottler.cpp similarity index 100% rename from src/libs/auth/impl/LoginThrottler.cpp rename to src/libs/lmscore/impl/auth/LoginThrottler.cpp diff --git a/src/libs/auth/impl/LoginThrottler.hpp b/src/libs/lmscore/impl/auth/LoginThrottler.hpp similarity index 100% rename from src/libs/auth/impl/LoginThrottler.hpp rename to src/libs/lmscore/impl/auth/LoginThrottler.hpp diff --git a/src/libs/auth/impl/PasswordServiceBase.cpp b/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp similarity index 98% rename from src/libs/auth/impl/PasswordServiceBase.cpp rename to src/libs/lmscore/impl/auth/PasswordServiceBase.cpp index 3b230503..e80d1b9b 100644 --- a/src/libs/auth/impl/PasswordServiceBase.cpp +++ b/src/libs/lmscore/impl/auth/PasswordServiceBase.cpp @@ -27,7 +27,7 @@ #include "pam/PAMPasswordService.hpp" #endif // LMS_SUPPORT_PAM -#include "auth/Types.hpp" +#include "lmscore/auth/Types.hpp" #include "database/Session.hpp" #include "database/User.hpp" #include "utils/Exception.hpp" diff --git a/src/libs/auth/impl/PasswordServiceBase.hpp b/src/libs/lmscore/impl/auth/PasswordServiceBase.hpp similarity index 95% rename from src/libs/auth/impl/PasswordServiceBase.hpp rename to src/libs/lmscore/impl/auth/PasswordServiceBase.hpp index f575e4e1..5c922f55 100644 --- a/src/libs/auth/impl/PasswordServiceBase.hpp +++ b/src/libs/lmscore/impl/auth/PasswordServiceBase.hpp @@ -21,8 +21,8 @@ #include -#include "auth/IPasswordService.hpp" -#include "AuthServiceBase.hpp" +#include "lmscore/auth/IPasswordService.hpp" +#include "auth/AuthServiceBase.hpp" #include "LoginThrottler.hpp" namespace Database diff --git a/src/libs/auth/impl/http-headers/HttpHeadersEnvService.cpp b/src/libs/lmscore/impl/auth/http-headers/HttpHeadersEnvService.cpp similarity index 100% rename from src/libs/auth/impl/http-headers/HttpHeadersEnvService.cpp rename to src/libs/lmscore/impl/auth/http-headers/HttpHeadersEnvService.cpp diff --git a/src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp b/src/libs/lmscore/impl/auth/http-headers/HttpHeadersEnvService.hpp similarity index 93% rename from src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp rename to src/libs/lmscore/impl/auth/http-headers/HttpHeadersEnvService.hpp index 5c44b9fb..7cad1441 100644 --- a/src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp +++ b/src/libs/lmscore/impl/auth/http-headers/HttpHeadersEnvService.hpp @@ -19,8 +19,8 @@ #pragma once -#include "auth/IEnvService.hpp" -#include "AuthServiceBase.hpp" +#include "lmscore/auth/IEnvService.hpp" +#include "auth/AuthServiceBase.hpp" namespace Auth { diff --git a/src/libs/auth/impl/internal/InternalPasswordService.cpp b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp similarity index 98% rename from src/libs/auth/impl/internal/InternalPasswordService.cpp rename to src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp index 96a6c34a..233fb9aa 100644 --- a/src/libs/auth/impl/internal/InternalPasswordService.cpp +++ b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.cpp @@ -20,8 +20,8 @@ #include "InternalPasswordService.hpp" #include -#include "auth/IAuthTokenService.hpp" -#include "auth/Types.hpp" +#include "lmscore/auth/IAuthTokenService.hpp" +#include "lmscore/auth/Types.hpp" #include "database/Session.hpp" #include "database/User.hpp" #include "utils/Exception.hpp" diff --git a/src/libs/auth/impl/internal/InternalPasswordService.hpp b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp similarity index 95% rename from src/libs/auth/impl/internal/InternalPasswordService.hpp rename to src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp index 6c241f31..42b830f1 100644 --- a/src/libs/auth/impl/internal/InternalPasswordService.hpp +++ b/src/libs/lmscore/impl/auth/internal/InternalPasswordService.hpp @@ -23,8 +23,8 @@ #include #include "database/User.hpp" -#include "PasswordServiceBase.hpp" -#include "LoginThrottler.hpp" +#include "auth/PasswordServiceBase.hpp" +#include "auth/LoginThrottler.hpp" namespace Auth { diff --git a/src/libs/auth/impl/pam/PAMPasswordService.cpp b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp similarity index 99% rename from src/libs/auth/impl/pam/PAMPasswordService.cpp rename to src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp index c5682f42..708ce457 100644 --- a/src/libs/auth/impl/pam/PAMPasswordService.cpp +++ b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.cpp @@ -26,7 +26,7 @@ #include #include -#include "auth/Types.hpp" +#include "lmscore/auth/Types.hpp" #include "database/Session.hpp" #include "utils/Logger.hpp" diff --git a/src/libs/auth/impl/pam/PAMPasswordService.hpp b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.hpp similarity index 95% rename from src/libs/auth/impl/pam/PAMPasswordService.hpp rename to src/libs/lmscore/impl/auth/pam/PAMPasswordService.hpp index 2de5bc82..9c88c955 100644 --- a/src/libs/auth/impl/pam/PAMPasswordService.hpp +++ b/src/libs/lmscore/impl/auth/pam/PAMPasswordService.hpp @@ -19,9 +19,7 @@ #pragma once -#include - -#include "PasswordServiceBase.hpp" +#include "auth/PasswordServiceBase.hpp" namespace Auth { diff --git a/src/libs/lmscore/impl/CoverService.cpp b/src/libs/lmscore/impl/cover/CoverService.cpp similarity index 100% rename from src/libs/lmscore/impl/CoverService.cpp rename to src/libs/lmscore/impl/cover/CoverService.cpp diff --git a/src/libs/lmscore/impl/CoverService.hpp b/src/libs/lmscore/impl/cover/CoverService.hpp similarity index 98% rename from src/libs/lmscore/impl/CoverService.hpp rename to src/libs/lmscore/impl/cover/CoverService.hpp index a740673e..f1a845ac 100644 --- a/src/libs/lmscore/impl/CoverService.hpp +++ b/src/libs/lmscore/impl/cover/CoverService.hpp @@ -29,7 +29,7 @@ #include #include -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "image/IEncodedImage.hpp" #include "database/Types.hpp" diff --git a/src/libs/auth/include/auth/IAuthTokenService.hpp b/src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp similarity index 100% rename from src/libs/auth/include/auth/IAuthTokenService.hpp rename to src/libs/lmscore/include/lmscore/auth/IAuthTokenService.hpp diff --git a/src/libs/auth/include/auth/IEnvService.hpp b/src/libs/lmscore/include/lmscore/auth/IEnvService.hpp similarity index 100% rename from src/libs/auth/include/auth/IEnvService.hpp rename to src/libs/lmscore/include/lmscore/auth/IEnvService.hpp diff --git a/src/libs/auth/include/auth/IPasswordService.hpp b/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp similarity index 98% rename from src/libs/auth/include/auth/IPasswordService.hpp rename to src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp index f197ae16..86edc868 100644 --- a/src/libs/auth/include/auth/IPasswordService.hpp +++ b/src/libs/lmscore/include/lmscore/auth/IPasswordService.hpp @@ -21,11 +21,11 @@ #include +#include #include #include -#include -#include "auth/Types.hpp" +#include "lmscore/auth/Types.hpp" #include "database/Types.hpp" namespace Database diff --git a/src/libs/auth/include/auth/Types.hpp b/src/libs/lmscore/include/lmscore/auth/Types.hpp similarity index 100% rename from src/libs/auth/include/auth/Types.hpp rename to src/libs/lmscore/include/lmscore/auth/Types.hpp diff --git a/src/libs/lmscore/include/lmscore/services/ICoverService.hpp b/src/libs/lmscore/include/lmscore/cover/ICoverService.hpp similarity index 100% rename from src/libs/lmscore/include/lmscore/services/ICoverService.hpp rename to src/libs/lmscore/include/lmscore/cover/ICoverService.hpp diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index 888eadf6..866cccf9 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -26,9 +26,9 @@ #include -#include "auth/IPasswordService.hpp" -#include "auth/IEnvService.hpp" -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/auth/IPasswordService.hpp" +#include "lmscore/auth/IEnvService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Db.hpp" diff --git a/src/lms/main.cpp b/src/lms/main.cpp index 2d6230cf..7ae3a787 100644 --- a/src/lms/main.cpp +++ b/src/lms/main.cpp @@ -25,10 +25,10 @@ #include #include -#include "auth/IAuthTokenService.hpp" -#include "auth/IPasswordService.hpp" -#include "auth/IEnvService.hpp" -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/auth/IAuthTokenService.hpp" +#include "lmscore/auth/IPasswordService.hpp" +#include "lmscore/auth/IEnvService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "database/Db.hpp" #include "database/Session.hpp" #include "scanner/IScanner.hpp" diff --git a/src/lms/ui/Auth.cpp b/src/lms/ui/Auth.cpp index 29414b43..6f406cac 100644 --- a/src/lms/ui/Auth.cpp +++ b/src/lms/ui/Auth.cpp @@ -28,8 +28,8 @@ #include #include -#include "auth/IAuthTokenService.hpp" -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IAuthTokenService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "database/Session.hpp" #include "database/User.hpp" #include "utils/Logger.hpp" diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 8eb688e2..c68012fc 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -28,9 +28,9 @@ #include #include -#include "auth/IEnvService.hpp" -#include "auth/IPasswordService.hpp" -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/auth/IEnvService.hpp" +#include "lmscore/auth/IPasswordService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "database/Artist.hpp" #include "database/Cluster.hpp" #include "database/Db.hpp" diff --git a/src/lms/ui/SettingsView.cpp b/src/lms/ui/SettingsView.cpp index 66105842..d2cb3a95 100644 --- a/src/lms/ui/SettingsView.cpp +++ b/src/lms/ui/SettingsView.cpp @@ -34,7 +34,7 @@ #include "common/UUIDValidator.hpp" #include "common/ValueStringModel.hpp" -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "database/Session.hpp" #include "utils/IConfig.hpp" #include "utils/Logger.hpp" diff --git a/src/lms/ui/admin/InitWizardView.cpp b/src/lms/ui/admin/InitWizardView.cpp index b37645b3..3ca4d184 100644 --- a/src/lms/ui/admin/InitWizardView.cpp +++ b/src/lms/ui/admin/InitWizardView.cpp @@ -24,7 +24,7 @@ #include #include -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "database/Session.hpp" #include "database/User.hpp" #include "utils/Exception.hpp" diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp index 16374d80..b0f99755 100644 --- a/src/lms/ui/admin/UserView.cpp +++ b/src/lms/ui/admin/UserView.cpp @@ -27,7 +27,7 @@ #include -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "database/User.hpp" #include "database/Session.hpp" #include "utils/IConfig.hpp" diff --git a/src/lms/ui/admin/UsersView.cpp b/src/lms/ui/admin/UsersView.cpp index 50bc58e7..8f26e470 100644 --- a/src/lms/ui/admin/UsersView.cpp +++ b/src/lms/ui/admin/UsersView.cpp @@ -23,7 +23,7 @@ #include #include -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "database/User.hpp" #include "database/Session.hpp" #include "utils/Logger.hpp" diff --git a/src/lms/ui/common/PasswordValidator.cpp b/src/lms/ui/common/PasswordValidator.cpp index 2df00c3f..3a559c71 100644 --- a/src/lms/ui/common/PasswordValidator.cpp +++ b/src/lms/ui/common/PasswordValidator.cpp @@ -21,7 +21,7 @@ #include -#include "auth/IPasswordService.hpp" +#include "lmscore/auth/IPasswordService.hpp" #include "utils/Service.hpp" #include "LmsApplication.hpp" diff --git a/src/lms/ui/common/PasswordValidator.hpp b/src/lms/ui/common/PasswordValidator.hpp index d504dbc1..a3efe8e6 100644 --- a/src/lms/ui/common/PasswordValidator.hpp +++ b/src/lms/ui/common/PasswordValidator.hpp @@ -23,7 +23,7 @@ #include #include "database/Types.hpp" -#include "auth/Types.hpp" +#include "lmscore/auth/Types.hpp" namespace UserInterface { diff --git a/src/lms/ui/resource/CoverResource.cpp b/src/lms/ui/resource/CoverResource.cpp index c13c5996..44d1189d 100644 --- a/src/lms/ui/resource/CoverResource.cpp +++ b/src/lms/ui/resource/CoverResource.cpp @@ -22,7 +22,7 @@ #include #include -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "database/Track.hpp" #include "utils/Exception.hpp" #include "utils/Logger.hpp" diff --git a/src/tools/cover/LmsCover.cpp b/src/tools/cover/LmsCover.cpp index d2a5e784..8202497c 100644 --- a/src/tools/cover/LmsCover.cpp +++ b/src/tools/cover/LmsCover.cpp @@ -24,7 +24,7 @@ #include -#include "lmscore/services/ICoverService.hpp" +#include "lmscore/cover/ICoverService.hpp" #include "database/Db.hpp" #include "database/Release.hpp" #include "database/Session.hpp"