diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index 031f4fc87..4a2a22afc 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -343,10 +343,14 @@ message UserCreateAPIArgument{ int32 parent_group_id = 20; string name = 30; string password = 40; - // not applicable to version 1.0 LicenseEntitlements license_entitlements = 70; } +message UserPasswordAPIArgument{ + int32 user_id = 10; + string password = 20; +} + message UserAccountAssociationAPIArgument{ int32 user_id = 10; UserAccountPermissions complete_data = 20; @@ -372,13 +376,14 @@ service AdminService { // account rpc create_account (AccountCreateAPIArgument) returns (PersistRequestResult); rpc set_account_clip_limits(AccountSecurityClipLimitsAPIArgument) returns (PersistRequestResult); - rpc set_account_product_position_limits(AccountProductPositionLimitsAPIArgument) returns (bts.api.VoidMessage); - rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (bts.api.VoidMessage); + rpc set_account_product_position_limits(AccountProductPositionLimitsAPIArgument) returns (PersistRequestResult); + rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (PersistRequestResult); rpc set_account_margin_limits(AccountMarginLimitAPIArgument) returns (PersistRequestResult); rpc set_account_connections(AccountConnectionsAPIArgument) returns (PersistRequestResult); rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (PersistRequestResult); // users rpc create_user(UserCreateAPIArgument) returns (PersistRequestResult); + rpc change_user_password (UserPasswordAPIArgument) returns (PersistRequestResult); rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (PersistRequestResult); rpc set_user_exchange_routing_data(ExchangeUserDataAPIArgument) returns (PersistRequestResult); rpc set_user_md_entitlement_data(ExchangeUserMarketDataEntitlementDataAPIArgument) returns (PersistRequestResult); diff --git a/src/server/sparkd/user/AdminServiceServer.cpp b/src/server/sparkd/user/AdminServiceServer.cpp index 4ca3b1b4e..835fea8d4 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -18,10 +18,10 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) : bts::api::admin::AdminServiceBase (context), _table_name("users"), - _unique_key("0"), + _unique_key("1"), _default_group_name("DEFAULT"), _state(), - _store(new bts::persistence::SqliteStore("user_model")) + _store(new bts::persistence::SqliteStore("admin_data")) { LOG(Gen, Info, "AdminServiceServer created"); std::map> all_data = _store->retrieve_all(); @@ -42,10 +42,8 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) } if (!data_found) { - // first time - // TODO add default group bts::api::admin::BTSUserGroup default_group; - default_group.set_id(0); + default_group.set_id(1); default_group.set_name(_default_group_name); AdminServiceUtils::create_group(&_state, default_group); _update_and_publish(); @@ -85,20 +83,38 @@ void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecuri account->mutable_security_clip_limits()->CopyFrom(arg.complete_data()); else{ result.set_is_success(false); - result.set_error_text("User does not exist"); + result.set_error_text("Account does not exist"); } reply(result); } -void AdminServiceServer::set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& arg, + const api::Response& reply) { + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); + if (account != nullptr) + account->mutable_product_position_limits()->CopyFrom(arg.complete_data()); + else{ + result.set_is_success(false); + result.set_error_text("Account does not exist"); + } + reply(result); } -void AdminServiceServer::set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument&, - const api::Response<::bts::api::VoidMessage>&) +void AdminServiceServer::set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument& arg, + const api::Response& reply) { + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSAccount* account = AdminServiceUtils::find_account(_state, arg.account_id()); + if (account != nullptr) + account->mutable_security_position_limits()->CopyFrom(arg.complete_data()); + else{ + result.set_is_success(false); + result.set_error_text("Account does not exist"); + } + reply(result); } void AdminServiceServer::set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& arg, @@ -165,6 +181,19 @@ void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument& ne } reply(result); } + +void AdminServiceServer::change_user_password(const bts::api::admin::UserPasswordAPIArgument& arg, + const api::Response<::bts::api::admin::PersistRequestResult>& reply){ + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + bts::api::admin::BTSUser* user = AdminServiceUtils::find_user(_state, arg.user_id()); + if (user != nullptr) + user->set_password(arg.password()); + else{ + result.set_is_success(false); + result.set_error_text("Could not find user"); + } + reply(result); +} void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& arg, const api::Response<::bts::api::admin::PersistRequestResult>& reply) @@ -225,7 +254,7 @@ void AdminServiceServer::_update_and_publish() { LOG(Gen, Info, "Could not save user data"); _store->update(_table_name, _unique_key, ser_state); - // publish it + // TODO:publish it } else LOG(Gen, Error, "Could not save user data"); diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 8dc302fac..8a3ce8a8c 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -29,10 +29,10 @@ public: const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_account_product_position_limits(const api::admin::AccountProductPositionLimitsAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response& reply) override; void set_account_security_position_limits(const api::admin::AccountSecurityPositionLimitsAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response& reply) override; void set_account_margin_limits(const api::admin::AccountMarginLimitAPIArgument& request, const api::Response& reply) override; @@ -45,6 +45,9 @@ public: void create_user(const api::admin::UserCreateAPIArgument& request, const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; + + void change_user_password(const bts::api::admin::UserPasswordAPIArgument& request, + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& request, const api::Response<::bts::api::admin::PersistRequestResult>& reply) override;