diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index a57ac2547..23ab2c1ca 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -16,7 +16,7 @@ namespace Spark { public static ServiceContext context { get; } = new ServiceContext(); [Export] - public UserService user_service => context.locate(); + public AuthService user_service => context.locate(); [Export("settings")] public PersistenceService settings_service => context.locate("settings"); diff --git a/src/client/spark/core/Settings/UserPersistFactory.cs b/src/client/spark/core/Settings/UserPersistFactory.cs index 3c1b8db02..e6a211e95 100644 --- a/src/client/spark/core/Settings/UserPersistFactory.cs +++ b/src/client/spark/core/Settings/UserPersistFactory.cs @@ -22,12 +22,12 @@ namespace mbts.ui.settings readonly PersistenceService _persist; [ImportingConstructor] - public UISettingsFactory(UserService login, [Import("settings")] PersistenceService persist) { + public UISettingsFactory(AuthService login, [Import("settings")] PersistenceService persist) { _persist = persist; _users = get_users(login); } - async Task get_users(UserService login) { + async Task get_users(AuthService login) { var users = await login.get_users_async(null); if (users.success) return users.value.Users.ToArray(); else return new User[0]; diff --git a/src/client/spark/view/Shell/Login/LoginModel.cs b/src/client/spark/view/Shell/Login/LoginModel.cs index 1845850f0..21c29733e 100644 --- a/src/client/spark/view/Shell/Login/LoginModel.cs +++ b/src/client/spark/view/Shell/Login/LoginModel.cs @@ -25,7 +25,7 @@ namespace mbts.ui.shell internal class LoginContainer { [ImportingConstructor] - public LoginContainer(UserService user, [Import("settings")] PersistenceService persist) { + public LoginContainer(AuthService user, [Import("settings")] PersistenceService persist) { var model = LoginModel.instance; model.provide_services(user, persist); // await_login pumps the dispatcher but doesn't allow control to return to MEF until the username and workspace are available @@ -70,7 +70,7 @@ namespace mbts.ui.shell private string _workspace; private PreloginWorkspaceEnumerator _enum_workspace; - UserService _logon; + AuthService _logon; DispatcherFrame _frame = new DispatcherFrame(); private LoginModel() { @@ -168,10 +168,10 @@ namespace mbts.ui.shell #region provide hub - public void provide_services(UserService u, PersistenceService p) { + public void provide_services(AuthService u, PersistenceService p) { _hub_src.TrySetResult((u,p)); } - private TaskCompletionSource<(UserService, PersistenceService)> _hub_src = new TaskCompletionSource<(UserService, PersistenceService)>(); + private TaskCompletionSource<(AuthService, PersistenceService)> _hub_src = new TaskCompletionSource<(AuthService, PersistenceService)>(); #endregion #region Dispose diff --git a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs index cddfa7c5e..d25162176 100644 --- a/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs +++ b/src/client/spark/view/Shell/Workspaces/SettingsManagerTool.cs @@ -11,7 +11,7 @@ namespace bts.settings { public class SettingsManagerTool { public static void run() { var sc = new ServiceContext(); - var users = sc.locate(); + var users = sc.locate(); var persist = sc.locate("settings"); var user_list = users.get_users(new GetUsersRequest()); var user_names = user_list.Users.Select(u => u.Login); diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 9fb48cccd..3226e6189 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -4,12 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Reflection; +using bts.api.user; -namespace bts.api.core -{ +namespace bts.api.core { public class ServiceContext : IDisposable { IntPtr _qbus; + public ServiceContext() { _qbus = ApiNativeMethods.api_create_quickbus(null, 0); } @@ -22,7 +23,6 @@ namespace bts.api.core Type[] arg_types = new[] { typeof(ClientChannel) }; ConstructorInfo ctor = typeof(T).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).First(ci => ci.GetParameters().SingleOrDefault()?.ParameterType == typeof(ClientChannel)); return (T)ctor.Invoke(new object[] { channel }); - //return (T)Activator.CreateInstance(typeof(T), channel); } internal ServerChannel publish(T service, string service_type, string qualifier) where T : IApiServer { @@ -31,6 +31,23 @@ namespace bts.api.core return ch; } + public AuthToken token { get; private set; } + + public async Task login(string username, string password) { + var auth_service = locate(); + var result = await auth_service.authenticate_login_async(new AuthenticateLoginRequest() { + Login = username, + Password = password + }); + if (result.success) { + token = result.value.Token; + // todo + // ApiNativeMethods.set_token(...) + return true; + } + return false; + } + #region IDisposable Support protected virtual void Dispose(bool disposing) { diff --git a/src/client/spark_api/md/Authenticator.cs b/src/client/spark_api/md/Authenticator.cs index 34aca3bfc..26798e94c 100644 --- a/src/client/spark_api/md/Authenticator.cs +++ b/src/client/spark_api/md/Authenticator.cs @@ -7,7 +7,7 @@ namespace bts.api { public class Authenticator { - readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); + readonly static Lazy _auth = new Lazy(() => Locator.locate(), true); user.AuthToken _token = null; public Authenticator() { } diff --git a/src/client/spark_excel/extensions/OrderService_Excel.cs b/src/client/spark_excel/extensions/OrderService_Excel.cs index e081916aa..853d3227d 100644 --- a/src/client/spark_excel/extensions/OrderService_Excel.cs +++ b/src/client/spark_excel/extensions/OrderService_Excel.cs @@ -17,7 +17,7 @@ namespace bts.api.orderman { public partial class OrderService_Excel { - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); [ExcelFunction(Category = "BTS", Description = "Get All Accessible Accounts")] diff --git a/src/client/spark_sdk/samples/OrderSample.cs b/src/client/spark_sdk/samples/OrderSample.cs index 251b9a192..186041c1a 100644 --- a/src/client/spark_sdk/samples/OrderSample.cs +++ b/src/client/spark_sdk/samples/OrderSample.cs @@ -27,7 +27,7 @@ namespace bts.sdk } readonly static Lazy _orders = new Lazy(() => Locator.locate(), true); - readonly static Lazy _users = new Lazy(() => Locator.locate(), true); + readonly static Lazy _users = new Lazy(() => Locator.locate(), true); readonly static Lazy _admin = new Lazy(() => Locator.locate(), true); void print_update(T update) diff --git a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs index dfad6cc5d..3e9ff00c5 100644 --- a/src/client/sparkcmd/Cmd/ServiceTestCommand.cs +++ b/src/client/sparkcmd/Cmd/ServiceTestCommand.cs @@ -82,7 +82,7 @@ namespace bts { private static void user_test() { var ctx = new ServiceContext(); - var s = ctx.locate(); + var s = ctx.locate(); var r = new api.user.GetUsersRequest(); var resp = s.get_users(r); Console.WriteLine("{0}", resp); diff --git a/src/lib/CMakeDeps.cmake b/src/lib/CMakeDeps.cmake index 1552418c6..d022f9964 100644 --- a/src/lib/CMakeDeps.cmake +++ b/src/lib/CMakeDeps.cmake @@ -1 +1 @@ -set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/services/UserService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file +set(sources api/apicore.proto;api/apigateway.proto;api/apioptions.proto;api/core/ApiClientInterop.cpp;api/core/ApiServerInterop.cpp;api/public/ApiServer.cpp;api/public/ClientChannel.cpp;api/public/QuickbusClientChannel.cpp;api/public/ServerChannel.cpp;api/public/ServiceContext.cpp;api/service_helpers/AdminServiceUtils.cpp;api/services/AdminService.proto;api/services/ApiUnitTestService.proto;api/services/AuthService.proto;api/services/ErrorReportService.proto;api/services/HelloService.proto;api/services/MarketDataAuxiliaryService.proto;api/services/MarketDataRelay.proto;api/services/OrderService.proto;api/services/OutOfProcessURLListener.proto;api/services/PersistenceService.proto;api/services/PositionService.proto;api/services/ShellDiagnosticService.proto;api/services/ShellLatencyService.proto;api/services/SyntheticSecurityService.proto;api/test/ApiTests.cpp;api/test/HelloServiceServer.cpp;config/ConfigCheck.cpp;config/ConfigDownloader.cpp;config/ConfigErrorCollector.cpp;config/ConfigLog.cpp;config/ConfigPropertyEvaluator.cpp;config/ConfigValueQueue.cpp;config/ConfigurationException.cpp;config/ConfigurationState.cpp;config/PreprocessInputStream.cpp;config/config.cpp;config/defaults/Executor.conf;config/defaults/MarketData.conf;config/defaults/Ports.conf;config/defaults/Symbols.conf;config/defaults/cme_reference_data.conf;config/defaults/edge.conf;config/defaults/jetfix.conf;config/defaults/logging.conf;config/defaults/orderman_cfg.conf;config/defaults/orders_fills_cleanup.conf;config/defaults/spreader.conf;config/defaults/testkeys.conf;config/defaults/threads.conf;config/defaults/toggles.conf;config/extensions/extensions.proto;config/invalid/invalid.proto;config/protos/ExchangeSimCfg.proto;config/protos/MarketData.proto;config/protos/Ports.proto;config/protos/Symbols.proto;config/protos/UI.proto;config/protos/cme_reference_data.proto;config/protos/jetfix.proto;config/protos/logging.proto;config/protos/mercury_cfg.proto;config/protos/orderman_cfg.proto;config/protos/orders_fills_cleanup.proto;config/protos/quickbus_cfg.proto;config/protos/spreader.proto;config/protos/system.proto;config/protos/testkeys.proto;config/protos/threads.proto;config/protos/toggles.proto;config/tests/HTTPServer.cpp;config/tests/config_ref_tests.cpp;config/tests/config_tests.cpp;config/text_format/text_format.cpp;domain_model/Security.cpp;domain_model/Security.proto;domain_model/SecurityTests.cpp;domain_model/tests/domain_tests.cpp;expression/BooleanGrammar.cpp;expression/ExpressionEvaluator.cpp;expression/ParserExceptions.cpp;expression/Value.cpp;expression/tests/expression_parser_tests.cpp;logging/LoggerHub.cpp;logging/Sink.cpp;logging/logging.cpp;logging/tests/logging_tests.cpp;md/Diag/MDPeriodicDumper.cpp;md/Diag/ShmDumper.cpp;md/MDConsumer.cpp;md/MDConsumerHandle.cpp;md/MDConsumerInterop.cpp;md/MDProducer.cpp;md/MDProducerHandle.cpp;md/MDRecoverableConsumer.cpp;md/MemorySegmentUtils.cpp;md/PlatformLoader.cpp;md/PriceSize.cpp;md/SecurityDB.cpp;md/SecurityIDRecorder.cpp;md/SettlementRecorder.cpp;md/Shm/FixedSecurity.cpp;md/SyntheticSecurityService.cpp;md/cme/MDP3Utils.cpp;md/common.cpp;md/protos/co2.proto;md/relay/QueryServer.cpp;md/relay/RelayClient.cpp;md/relay/RelayRecorder.cpp;md/test/Co2ManagedTestHelper.cpp;md/test/Co2TestInstrument.cpp;md/test/md2_tests.cpp;md/test/synthetic_book_merge_tests.cpp;os/os.cpp;os/tests/os_tests.cpp;quickbus/core/LocalNode.cpp;quickbus/core/Quickbus.cpp;quickbus/core/SubscriptionID.cpp;quickbus/core/TableID.cpp;quickbus/message_model/Update.cpp;quickbus/message_model/merge_updates.cpp;quickbus/network/QBConnection.cpp;quickbus/network/QBConnectionManager.cpp;quickbus/network/endpoint_description.cpp;quickbus/network/quickbus_msgs.proto;quickbus/pubsub/TablePublisher.cpp;quickbus/pubsub/TableSubscriber.cpp;quickbus/pubsub/tests/qb_pubsub_tests.cpp;quickbus/routing/INode.cpp;quickbus/routing/NodeID.cpp;quickbus/routing/Router.cpp;quickbus/rpc/RPCClient.cpp;quickbus/rpc/RPCServer.cpp;quickbus/rpc/RPCSessionID.cpp;quickbus/rpc/rpc_utils.cpp;quickbus/rpc/tests/qb_rpc_tests.cpp;quickbus/tests/quickbus_tests.cpp;sparkproto/SparkProtos.proto;testing/catch_test_runner.cpp;utils/AuthToken.cpp;utils/Dispatcher.cpp;utils/GrowableSPSCQueue.cpp;utils/HTTPStream.cpp;utils/PBUtils.cpp;utils/Puid.cpp;utils/SecureLogon.cpp;utils/SharedMemory.cpp;utils/Sqlite_utils.cpp;utils/Uuid.cpp;utils/datetime.cpp;utils/download.cpp;utils/file_utils.cpp;utils/init_spark_lib.cpp;utils/is_unittest_environment.cpp;utils/stats.cpp;utils/thread_manager.cpp) \ No newline at end of file diff --git a/src/lib/api/services/UserService.proto b/src/lib/api/services/AuthService.proto similarity index 98% rename from src/lib/api/services/UserService.proto rename to src/lib/api/services/AuthService.proto index f6a59ecb4..2b5c38e36 100644 --- a/src/lib/api/services/UserService.proto +++ b/src/lib/api/services/AuthService.proto @@ -52,7 +52,7 @@ message AuthenticateLoginResponse { message AuthenticateTokenRequest {AuthToken token = 1;} message AuthenticateTokenResponse {bool is_valid = 1; string reason = 2; User user = 3;} -service UserService { +service AuthService { option (bts.api.service_description) = "Provides a management interface to the system user list"; rpc authenticate_login(AuthenticateLoginRequest) returns (AuthenticateLoginResponse) diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 5a10fa63c..671e604de 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -8,6 +8,7 @@ namespace api { namespace auth { #ifndef _WIN32 + user::AuthToken generate_token(const admin::BTSUser& user) { api::user::TokenPayload payload; payload.set_date(datetime::ll_now()); diff --git a/src/lib/utils/AuthToken.h b/src/lib/utils/AuthToken.h index fb4966120..fe0569073 100644 --- a/src/lib/utils/AuthToken.h +++ b/src/lib/utils/AuthToken.h @@ -1,5 +1,5 @@ #pragma once -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include diff --git a/src/server/sparkd/cmds/Run.cpp b/src/server/sparkd/cmds/Run.cpp index 516980043..b7fbb47eb 100644 --- a/src/server/sparkd/cmds/Run.cpp +++ b/src/server/sparkd/cmds/Run.cpp @@ -25,7 +25,7 @@ #include "server/sparkd/support/ShellLatencyServer.h" #include "server/sparkd/user/AdminServiceServer.h" #include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "lib/orderman/order_factory/DynamicOrderRegistry.h" #include "lib/plugin/SparkServices.h" #include "lib/plugin/plugin.h" @@ -54,7 +54,7 @@ int Run::execute(std::vector const &) { http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); persistence::PersistenceServiceServer settings_saver(sc, "settings"); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); md::run_market_datapublishers(); std::shared_ptr synthetic_service = std::make_shared(sc); diff --git a/src/server/sparkd/cmds/Web.cpp b/src/server/sparkd/cmds/Web.cpp index 09bda5c6e..aac651dc0 100644 --- a/src/server/sparkd/cmds/Web.cpp +++ b/src/server/sparkd/cmds/Web.cpp @@ -12,7 +12,7 @@ #include "lib/md/relay/QueryServer.h" #include "lib/md/SyntheticSecurityService.h" #include "server/sparkd/user/AdminServiceServer.h" -#include "server/sparkd/user/UserServiceServer.h" +#include "server/sparkd/user/AuthServiceServer.h" #include "server/sparkd/md/run_md.h" #include "lib/orderman/orderman_utils/PerfTraceLog.h" @@ -34,7 +34,7 @@ int Web::execute(const std::vector& args) { PerfTraceLog perf_log; http::SparkWebServer webserver(sc, stats, perf_log,ports.config_port()); - user::UserServiceServer login_server(sc); + user::AuthServiceServer login_server(sc); if (std::find(args.begin(), args.end(), "-md") != args.end()) { md::run_market_datapublishers(); } diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index ec889dc80..a08d0dc8c 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -3,7 +3,7 @@ #include "lib/logging/logging.h" #include "lib/api/public/ApiUtils.h" #include "lib/api/core/ApiClientInterop.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/bts_assert.h" #include @@ -19,7 +19,7 @@ namespace http { struct ApiGatewayImpl { std::mutex _m; const api::ServiceContext& _sc; - api::user::UserService _logon; + api::user::AuthService _logon; std::unordered_map _apiclient; std::vector _subscriptions; @@ -28,7 +28,7 @@ struct ApiGatewayImpl { ApiGatewayImpl(const api::ServiceContext& ctx) : _m(), _sc(ctx), - _logon(ctx.locate()), + _logon(ctx.locate()), _apiclient(), _subscriptions() { } diff --git a/src/server/sparkd/position/MarginServiceCore.cpp b/src/server/sparkd/position/MarginServiceCore.cpp index 9b4868f16..3bc45e612 100644 --- a/src/server/sparkd/position/MarginServiceCore.cpp +++ b/src/server/sparkd/position/MarginServiceCore.cpp @@ -6,7 +6,7 @@ #include "IMarginObserver.h" #include "lib/config/config.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/utils/bts_assert.h" #include "lib/utils/Uuid.h" #include "lib/utils/bts_chrono.h" diff --git a/src/server/sparkd/position/tests/PositionTests.cpp b/src/server/sparkd/position/tests/PositionTests.cpp index b24dbe509..62c93aec6 100644 --- a/src/server/sparkd/position/tests/PositionTests.cpp +++ b/src/server/sparkd/position/tests/PositionTests.cpp @@ -7,11 +7,10 @@ #include "../IMarginObserver.h" #include "lib/orderman/orderman_utils/orderman_common.h" -#include "server/sparkd/user/UserServiceServer.h" #include "lib/config/config.h" #include "lib/api/public/ServiceContext.h" -#include "lib/api/services/UserService.client.pb.h" +#include "lib/api/services/AuthService.client.pb.h" #include "lib/domain_model/Security.pb.h" #include "lib/utils/helper_macros.h" diff --git a/src/server/sparkd/user/UserServiceServer.cpp b/src/server/sparkd/user/AuthServiceServer.cpp similarity index 86% rename from src/server/sparkd/user/UserServiceServer.cpp rename to src/server/sparkd/user/AuthServiceServer.cpp index e1ffb1857..a481852c3 100644 --- a/src/server/sparkd/user/UserServiceServer.cpp +++ b/src/server/sparkd/user/AuthServiceServer.cpp @@ -1,8 +1,8 @@ -#include "UserServiceServer.h" +#include "AuthServiceServer.h" #include "lib/persistence/SqliteStore.h" #include "lib/logging/logging.h" -#include "lib/api/services/UserService.pb.h" +#include "lib/api/services/AuthService.pb.h" #include "lib/api/services/AdminService.client.pb.h" #include "lib/utils/PBUtils.h" #include "lib/utils/AuthToken.h" @@ -19,7 +19,7 @@ namespace user { const api::VoidMessage vod; -struct UserServiceServer::PImpl +struct AuthServiceServer::PImpl { api::admin::AdminService admin; @@ -27,13 +27,13 @@ struct UserServiceServer::PImpl admin(context.locate()) { } }; -UserServiceServer::UserServiceServer (bts::api::ServiceContext& context) : UserServiceBase(context), me (new PImpl(context)) { +AuthServiceServer::AuthServiceServer (bts::api::ServiceContext& context) : AuthServiceBase(context), me (new PImpl(context)) { LOG(User,Warn,"Starting user service"); } -UserServiceServer::~UserServiceServer () {} +AuthServiceServer::~AuthServiceServer () {} -void UserServiceServer::get_users(const api::user::GetUsersRequest& , +void AuthServiceServer::get_users(const api::user::GetUsersRequest& , const std::function& respond) { me->admin.get_admin_data(vod, [respond](const api::Result& admin_data) { @@ -54,7 +54,7 @@ void UserServiceServer::get_users(const api::user::GetUsersRequest& , }); } -void UserServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, +void AuthServiceServer::authenticate_login(const api::user::AuthenticateLoginRequest& req, const std::function& respond) { me->admin.get_admin_data(vod, [=](const api::Result& admin_data) { diff --git a/src/server/sparkd/user/UserServiceServer.h b/src/server/sparkd/user/AuthServiceServer.h similarity index 70% rename from src/server/sparkd/user/UserServiceServer.h rename to src/server/sparkd/user/AuthServiceServer.h index 431f6bf27..91df48a8e 100644 --- a/src/server/sparkd/user/UserServiceServer.h +++ b/src/server/sparkd/user/AuthServiceServer.h @@ -1,7 +1,7 @@ #pragma once #include -#include "lib/api/services/UserService.server.pb.h" +#include "lib/api/services/AuthService.server.pb.h" #include "lib/api/services/AdminService.pb.h" #include "lib/utils/bts_no_copy.h" @@ -9,12 +9,12 @@ namespace bts { namespace user { -class UserServiceServer : public api::user::UserServiceBase +class AuthServiceServer : public api::user::AuthServiceBase { public: - BTS_NO_COPY(UserServiceServer); - UserServiceServer (bts::api::ServiceContext& context); - ~UserServiceServer(); + BTS_NO_COPY(AuthServiceServer); + AuthServiceServer (bts::api::ServiceContext& context); + ~AuthServiceServer(); void get_users(const api::user::GetUsersRequest& , const std::function& ) override; void authenticate_login(const api::user::AuthenticateLoginRequest& ,