diff --git a/src/lib/api/services/AdminService.proto b/src/lib/api/services/AdminService.proto index e64c4aa05..e3e10e336 100644 --- a/src/lib/api/services/AdminService.proto +++ b/src/lib/api/services/AdminService.proto @@ -348,6 +348,7 @@ message UserCreateAPIArgument{ int32 parent_group_id = 20; string name = 30; string password = 40; + // not applicable to version 1.0 LicenseEntitlements license_entitlements = 70; } @@ -374,7 +375,7 @@ message PersistRequestResult{ service AdminService { option (bts.api.service_description) = "Provides a management interface to the user model"; // account - rpc create_account (AccountCreateAPIArgument) returns (bts.api.VoidMessage); + rpc create_account (AccountCreateAPIArgument) returns (PersistRequestResult); rpc set_account_clip_limits(AccountSecurityClipLimitsAPIArgument) returns (bts.api.VoidMessage); rpc set_account_product_position_limits(AccountProductPositionLimitsAPIArgument) returns (bts.api.VoidMessage); rpc set_account_security_position_limits(AccountSecurityPositionLimitsAPIArgument) returns (bts.api.VoidMessage); @@ -382,7 +383,7 @@ service AdminService { rpc set_account_connections(AccountConnectionsAPIArgument) returns (bts.api.VoidMessage); rpc set_account_exchange_data(AccountExchangeDataAPIArgument) returns (PersistRequestResult); // users - rpc create_user(UserCreateAPIArgument) returns (bts.api.VoidMessage); + rpc create_user(UserCreateAPIArgument) returns (PersistRequestResult); rpc set_user_account_association(UserAccountAssociationAPIArgument) returns (bts.api.VoidMessage); 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 132098b35..3003f1938 100644 --- a/src/server/sparkd/user/AdminServiceServer.cpp +++ b/src/server/sparkd/user/AdminServiceServer.cpp @@ -55,11 +55,13 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context) AdminServiceServer::~AdminServiceServer() {} void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgument& acct_create_arg, - const api::Response<::bts::api::VoidMessage>&) + const api::Response<::bts::api::admin::PersistRequestResult>& reply) { + bts::api::admin::PersistRequestResult result; result.set_is_success(true); if (AdminServiceUtils::find_account(_state, acct_create_arg.account_name())==nullptr){ bts::api::admin::BTSAccount* new_account = _state.add_accounts(); - new_account->set_id(AdminServiceUtils::find_curr_acct_id(_state)+1); + int new_account_id = AdminServiceUtils::find_curr_acct_id(_state)+1; + new_account->set_id(new_account_id); if(acct_create_arg.has_parent_account_id()) new_account->mutable_parent_account_id()->set_id(acct_create_arg.parent_account_id().id()); new_account->set_name(acct_create_arg.account_name()); @@ -67,6 +69,11 @@ void AdminServiceServer::create_account(const api::admin::AccountCreateAPIArgume new_account->set_is_active(false); _update_and_publish(); } + else{ + result.set_is_success(false); + result.set_error_text("Account with this name already exists"); + } + reply(result); } void AdminServiceServer::set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& acct_clips_arg, @@ -121,14 +128,25 @@ void AdminServiceServer::set_account_exchange_data(const api::admin::AccountExch } void AdminServiceServer::create_user(const api::admin::UserCreateAPIArgument& new_user, - const api::Response<::bts::api::VoidMessage>&) + const api::Response<::bts::api::admin::PersistRequestResult>& reply) { - bts::api::admin::BTSUser* new_user_ptr = _state.add_users(); - // test for name - new_user_ptr->set_name(new_user.name()); - new_user_ptr->set_password (new_user.password()); - new_user_ptr->mutable_license_entitlements()->CopyFrom(new_user.license_entitlements()); - _update_and_publish(); + bts::api::admin::PersistRequestResult result; result.set_is_success(true); + if (AdminServiceUtils::find_user (_state, new_user.name())){ + bts::api::admin::BTSUser* new_user_ptr = _state.add_users(); + int new_id = AdminServiceUtils::find_curr_user_id(_state) + 1; + new_user_ptr->set_id(new_id); + new_user_ptr->set_parent_group_id(new_user.parent_group_id()); + new_user_ptr->set_name(new_user.name()); + new_user_ptr->set_password (new_user.password()); + new_user_ptr->set_is_active(false); + new_user_ptr->mutable_license_entitlements()->CopyFrom(new_user.license_entitlements()); + _update_and_publish(); + } + else{ + result.set_is_success(false); + result.set_error_text("User by this name already exists"); + } + reply(result); } void AdminServiceServer::set_user_account_association(const api::admin::UserAccountAssociationAPIArgument&, diff --git a/src/server/sparkd/user/AdminServiceServer.h b/src/server/sparkd/user/AdminServiceServer.h index 32b773e9a..2c0ea2438 100644 --- a/src/server/sparkd/user/AdminServiceServer.h +++ b/src/server/sparkd/user/AdminServiceServer.h @@ -23,7 +23,7 @@ public: ~AdminServiceServer(); void create_account(const api::admin::AccountCreateAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_account_clip_limits(const api::admin::AccountSecurityClipLimitsAPIArgument& request, const api::Response<::bts::api::VoidMessage>& reply) override; @@ -44,7 +44,7 @@ public: const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void create_user(const api::admin::UserCreateAPIArgument& request, - const api::Response<::bts::api::VoidMessage>& reply) override; + const api::Response<::bts::api::admin::PersistRequestResult>& reply) override; void set_user_account_association(const api::admin::UserAccountAssociationAPIArgument& request, const api::Response<::bts::api::VoidMessage>& reply) override;