Revert "Migrated auth service"

This reverts commit 0f5c487084.

src/libs/CMakeLists.txt

@@ -1,4 +1,5 @@
 
+add_subdirectory(auth)
 add_subdirectory(av)
 add_subdirectory(database)
 add_subdirectory(image)

src/libs/auth/CMakeLists.txt

@@ -0,0 +1,40 @@
+
+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)
+

src/libs/auth/impl/AuthTokenService.cpp

@@ -23,7 +23,7 @@
 #include <Wt/Auth/PasswordStrengthValidator.h>
 #include <Wt/WRandom.h>
 
-#include "lmscore/auth/Types.hpp"
+#include "auth/Types.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "utils/Exception.hpp"

src/libs/auth/impl/AuthTokenService.hpp

@@ -21,7 +21,7 @@
 
 #include <shared_mutex>
 
-#include "lmscore/auth/IAuthTokenService.hpp"
+#include "auth/IAuthTokenService.hpp"
 #include "AuthServiceBase.hpp"
 #include "LoginThrottler.hpp"
 

src/libs/auth/impl/EnvService.cpp

@@ -17,8 +17,9 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "lmscore/auth/IEnvService.hpp"
-#include "lmscore/auth/Types.hpp"
+#include "auth/IEnvService.hpp"
+
+#include "auth/Types.hpp"
 #include "http-headers/HttpHeadersEnvService.hpp"
 
 namespace Auth

src/libs/auth/impl/PasswordServiceBase.cpp

@@ -27,7 +27,7 @@
 #include "pam/PAMPasswordService.hpp"
 #endif // LMS_SUPPORT_PAM
 
-#include "lmscore/auth/Types.hpp"
+#include "auth/Types.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "utils/Exception.hpp"

src/libs/auth/impl/PasswordServiceBase.hpp

@@ -21,8 +21,8 @@
 
 #include <shared_mutex>
 
-#include "lmscore/auth/IPasswordService.hpp"
-#include "auth/AuthServiceBase.hpp"
+#include "auth/IPasswordService.hpp"
+#include "AuthServiceBase.hpp"
 #include "LoginThrottler.hpp"
 
 namespace Database

src/libs/auth/impl/http-headers/HttpHeadersEnvService.hpp

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "lmscore/auth/IEnvService.hpp"
-#include "auth/AuthServiceBase.hpp"
+#include "auth/IEnvService.hpp"
+#include "AuthServiceBase.hpp"
 
 namespace Auth
 {

src/libs/auth/impl/internal/InternalPasswordService.cpp

@@ -20,8 +20,8 @@
 #include "InternalPasswordService.hpp"
 #include <Wt/WRandom.h>
 
-#include "lmscore/auth/IAuthTokenService.hpp"
-#include "lmscore/auth/Types.hpp"
+#include "auth/IAuthTokenService.hpp"
+#include "auth/Types.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "utils/Exception.hpp"

src/libs/auth/impl/internal/InternalPasswordService.hpp

@@ -23,8 +23,8 @@
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
 #include "database/User.hpp"
-#include "auth/PasswordServiceBase.hpp"
-#include "auth/LoginThrottler.hpp"
+#include "PasswordServiceBase.hpp"
+#include "LoginThrottler.hpp"
 
 namespace Auth
 {

src/libs/auth/impl/pam/PAMPasswordService.cpp

@@ -26,7 +26,7 @@
 #include <cstring>
 #include <security/pam_appl.h>
 
-#include "lmscore/auth/Types.hpp"
+#include "auth/Types.hpp"
 #include "database/Session.hpp"
 #include "utils/Logger.hpp"
 

src/libs/auth/impl/pam/PAMPasswordService.hpp

@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include "auth/PasswordServiceBase.hpp"
+#include <shared_mutex>
+
+#include "PasswordServiceBase.hpp"
 
 namespace Auth
 {

src/libs/auth/include/auth/IPasswordService.hpp

@@ -21,11 +21,11 @@
 
 #include <string_view>
 
-#include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/ptr.h>
 
-#include "lmscore/auth/Types.hpp"
+#include <boost/asio/ip/address.hpp>
+#include "auth/Types.hpp"
 #include "database/Types.hpp"
 
 namespace Database

src/libs/lmscore/CMakeLists.txt

@@ -1,13 +1,6 @@
 
 add_library(lmscore SHARED
-	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
+	impl/CoverService.cpp
 	)
 
 target_include_directories(lmscore INTERFACE
@@ -21,6 +14,7 @@ target_include_directories(lmscore PRIVATE
 
 target_link_libraries(lmscore PRIVATE
 	lmsav
+	lmsimage
 	)
 
 target_link_libraries(lmscore PUBLIC
@@ -28,16 +22,7 @@ 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)
 

src/libs/lmscore/impl/CoverService.hpp

@@ -29,7 +29,7 @@
 #include <variant>
 #include <vector>
 
-#include "lmscore/cover/ICoverService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
 #include "database/Types.hpp"
 

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -26,9 +26,9 @@
 
 #include <Wt/WLocalDateTime.h>
 
-#include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/auth/IEnvService.hpp"
-#include "lmscore/cover/ICoverService.hpp"
+#include "auth/IPasswordService.hpp"
+#include "auth/IEnvService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"

src/lms/main.cpp

@@ -25,10 +25,10 @@
 #include <Wt/WServer.h>
 #include <Wt/WApplication.h>
 
-#include "lmscore/auth/IAuthTokenService.hpp"
-#include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/auth/IEnvService.hpp"
-#include "lmscore/cover/ICoverService.hpp"
+#include "auth/IAuthTokenService.hpp"
+#include "auth/IPasswordService.hpp"
+#include "auth/IEnvService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "database/Db.hpp"
 #include "database/Session.hpp"
 #include "scanner/IScanner.hpp"

src/lms/ui/Auth.cpp

@@ -28,8 +28,8 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WRandom.h>
 
-#include "lmscore/auth/IAuthTokenService.hpp"
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IAuthTokenService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "utils/Logger.hpp"

src/lms/ui/LmsApplication.cpp

@@ -28,9 +28,9 @@
 #include <Wt/WStackedWidget.h>
 #include <Wt/WText.h>
 
-#include "lmscore/auth/IEnvService.hpp"
-#include "lmscore/auth/IPasswordService.hpp"
-#include "lmscore/cover/ICoverService.hpp"
+#include "auth/IEnvService.hpp"
+#include "auth/IPasswordService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"

src/lms/ui/SettingsView.cpp

@@ -34,7 +34,7 @@
 #include "common/UUIDValidator.hpp"
 #include "common/ValueStringModel.hpp"
 
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"

src/lms/ui/admin/InitWizardView.cpp

@@ -24,7 +24,7 @@
 #include <Wt/WLineEdit.h>
 #include <Wt/WPushButton.h>
 
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
 #include "utils/Exception.hpp"

src/lms/ui/admin/UserView.cpp

@@ -27,7 +27,7 @@
 
 #include <Wt/WFormModel.h>
 
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "database/User.hpp"
 #include "database/Session.hpp"
 #include "utils/IConfig.hpp"

src/lms/ui/admin/UsersView.cpp

@@ -23,7 +23,7 @@
 #include <Wt/WMessageBox.h>
 #include <Wt/WTemplate.h>
 
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "database/User.hpp"
 #include "database/Session.hpp"
 #include "utils/Logger.hpp"

src/lms/ui/common/PasswordValidator.cpp

@@ -21,7 +21,7 @@
 
 #include <Wt/WEnvironment.h>
 
-#include "lmscore/auth/IPasswordService.hpp"
+#include "auth/IPasswordService.hpp"
 #include "utils/Service.hpp"
 #include "LmsApplication.hpp"
 

src/lms/ui/common/PasswordValidator.hpp

@@ -23,7 +23,7 @@
 #include <Wt/WValidator.h>
 
 #include "database/Types.hpp"
-#include "lmscore/auth/Types.hpp"
+#include "auth/Types.hpp"
 
 namespace UserInterface
 {

src/lms/ui/resource/CoverResource.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WApplication.h>
 #include <Wt/Http/Response.h>
 
-#include "lmscore/cover/ICoverService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "database/Track.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"

src/tools/cover/LmsCover.cpp

@@ -24,7 +24,7 @@
 
 #include <boost/program_options.hpp>
 
-#include "lmscore/cover/ICoverService.hpp"
+#include "lmscore/services/ICoverService.hpp"
 #include "database/Db.hpp"
 #include "database/Release.hpp"
 #include "database/Session.hpp"