Update AdminServiceServer to use AuthenticatedAdminServiceBase

This commit is contained in:
Eric Harding committed 2018-12-07 15:33:28 -05:00
1 parent c4393637e7
commit 1b2aeee069
7 files changed
+57 -36

No files matched your search

@@ -26,7 +26,7 @@ namespace bts.api.orderman
try
{
List<string> accts = new List<string>();
var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest { Token = login_token });
var admin = await _admin.Value.get_filtered_admin_data_async(new FilteredAdminDataRequest());
if (admin.success)
{
foreach (var acc in admin.value.Accounts)
+1 -3
View File
@@ -459,9 +459,7 @@ message AdminServiceCreateAccountResult {
uint32 new_id = 30;
}
message FilteredAdminDataRequest {
string token = 1;
}
message FilteredAdminDataRequest { }
service AdminService {
option (bts.api.service_description) = "Provides a management interface to the user model";
+17 -7
View File
@@ -21,7 +21,7 @@ namespace admin{
AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context)
:
bts::api::admin::AdminServiceBase (context),
bts::api::admin::AuthenticatedAdminServiceBase (context),
_db_name("admin"),
_table_name("admin_data"),
_unique_key("0"),
@@ -73,6 +73,7 @@ AdminServiceServer::AdminServiceServer(bts::api::ServiceContext& context)
}
AdminServiceServer::~AdminServiceServer() {}
void AdminServiceServer::create_account(
const api::AuthToken&,
const AccountCreateAPIArgument& request,
const api::Response<AdminServiceCreateAccountResult>& reply){
bts::api::admin::AdminServiceCreateAccountResult result;
@@ -102,6 +103,7 @@ void AdminServiceServer::create_account(
reply(result);
}
void AdminServiceServer::update_account(
const api::AuthToken&,
const AccountUpdateAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply){
bts::api::admin::AdminServiceOperationResult result;
@@ -110,6 +112,7 @@ void AdminServiceServer::update_account(
reply(result);
}
void AdminServiceServer::create_user(
const api::AuthToken&,
const UserCreateAPIArgument& request,
const api::Response<AdminServiceCreateEntityResult>& reply){
AdminServiceCreateEntityResult result;
@@ -127,6 +130,7 @@ void AdminServiceServer::create_user(
reply(result);
}
void AdminServiceServer::update_user(
const api::AuthToken&,
const UserUpdateAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply){
AdminServiceOperationResult result;
@@ -134,17 +138,19 @@ void AdminServiceServer::update_user(
_update_and_publish(false);
reply(result);
}
void AdminServiceServer::get_admin_data(const bts::api::VoidMessage&,
const api::Response<AdminData>& reply){
void AdminServiceServer::get_admin_data(
const api::AuthToken&,
const bts::api::VoidMessage&,
const api::Response<AdminData>& reply){
reply(_state);
}
void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& req,
const api::Response<AdminData>& reply)
void AdminServiceServer::get_filtered_admin_data(
const api::AuthToken& token,
const bts::api::admin::FilteredAdminDataRequest&,
const api::Response<AdminData>& reply)
{
bts::api::user::TokenPayload toke;
api::AuthToken token;
token.set_token(req.token());
if(bts::api::auth::decode_token(token, &toke))
{
if(toke.wheel())
@@ -215,6 +221,7 @@ void AdminServiceServer::get_filtered_admin_data(const bts::api::admin::Filtered
void AdminServiceServer::delete_user(
const api::AuthToken&,
const IDAPIArgument& id,
const api::Response<AdminServiceOperationResult>& reply){
AdminServiceOperationResult result; result.set_is_success(true);
@@ -223,6 +230,7 @@ void AdminServiceServer::delete_user(
reply(result);
}
void AdminServiceServer::delete_account(
const api::AuthToken&,
const IDAPIArgument& id,
const api::Response<AdminServiceOperationResult>& reply){
AdminServiceOperationResult result; result.set_is_success(true);
@@ -252,6 +260,7 @@ void AdminServiceServer::_update_and_publish(bool is_insert){
}
void AdminServiceServer::get_order_summary(
const api::AuthToken&,
const bts::api::VoidMessage&,
const api::Response<OrdersSummary>& reply){
std::map<std::string,std::map<std::string,OrdersSummaryUnit>> agg;
@@ -273,6 +282,7 @@ void AdminServiceServer::get_order_summary(
reply(rv);
}
void AdminServiceServer::cancel_orders(
const api::AuthToken&,
const OrderCancelRequest& req,
const api::Response<bts::api::VoidMessage>&){
vector<string> accts, users;
+29 -16
View File
@@ -15,7 +15,7 @@ using namespace bts::api::orderman;
using namespace bts::api::admin;
using namespace std;
class AdminServiceServer : public api::admin::AdminServiceBase
class AdminServiceServer : public api::admin::AuthenticatedAdminServiceBase
{
private:
const std::string _db_name;
@@ -34,41 +34,54 @@ public:
~AdminServiceServer();
void create_account(
const AccountCreateAPIArgument& request,
const api::Response<AdminServiceCreateAccountResult>& reply) override;
const api::AuthToken&,
const AccountCreateAPIArgument& request,
const api::Response<AdminServiceCreateAccountResult>& reply) override;
void update_account(
const AccountUpdateAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply) override;
const api::AuthToken&,
const AccountUpdateAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply) override;
void create_user(
const UserCreateAPIArgument& request,
const api::Response<AdminServiceCreateEntityResult>& reply) override;
const api::AuthToken&,
const UserCreateAPIArgument& request,
const api::Response<AdminServiceCreateEntityResult>& reply) override;
void update_user(
const api::AuthToken&,
const UserUpdateAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply) override;
void get_admin_data(const bts::api::VoidMessage& request,
const api::Response<AdminData>& reply) override;
void get_admin_data(
const api::AuthToken&,
const bts::api::VoidMessage& request,
const api::Response<AdminData>& reply) override;
void get_filtered_admin_data(const bts::api::admin::FilteredAdminDataRequest& request,
const api::Response<AdminData>& reply) override;
void get_filtered_admin_data(
const api::AuthToken&,
const bts::api::admin::FilteredAdminDataRequest& request,
const api::Response<AdminData>& reply) override;
void delete_user(
const api::AuthToken&,
const IDAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply) override;
void delete_account(
const api::AuthToken&,
const IDAPIArgument& request,
const api::Response<AdminServiceOperationResult>& reply) override;
void get_order_summary(const bts::api::VoidMessage& request,
const api::Response<OrdersSummary>& reply) override;
void get_order_summary(
const api::AuthToken&,
const bts::api::VoidMessage& request,
const api::Response<OrdersSummary>& reply) override;
void cancel_orders(
const OrderCancelRequest& request,
const api::Response<bts::api::VoidMessage>& reply) override;
const api::AuthToken&,
const OrderCancelRequest& request,
const api::Response<bts::api::VoidMessage>& reply) override;
private:
// this is mainly does 2 things :
+2 -2
View File
@@ -7,9 +7,9 @@ open bts.api.orderman
let superuser = "bts"
let getAdminData (admin:IAdminService) (token) (fsuc) (ffail) =
let getAdminData (admin:IAdminService) (fsuc) (ffail) =
Cmd.ofPromise
admin.get_filtered_admin_data { token = token }
admin.get_filtered_admin_data ()
fsuc
(fun e -> ffail e.Message)
+4 -4
View File
@@ -37,7 +37,7 @@ let init (context:ServiceContext.ServiceContext) =
can_create = context.can_create
this_username = context.username
ShowLoading = false
}, Access.getAdminData admin context.token UpdateAdminData NoAdminData
}, Access.getAdminData admin UpdateAdminData NoAdminData
let existingSelection (scratch:BTSAccount) (previousScratch:BTSAccount) (data:AdminData) =
List.choose id [
@@ -76,7 +76,7 @@ let applySIMUpdate (data:SIMAccountData) = function
let saveAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise {
let! result = admin.update_account { completeData = account }
if result.isSuccess then
let! data = admin.get_filtered_admin_data {token = model.token}
let! data = admin.get_filtered_admin_data ()
return UpdateAdminData data
else
return ErrorOccured (sprintf "Error saving account: %s" result.errorText)
@@ -94,7 +94,7 @@ let createAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = pro
let deleteAccount (admin:IAdminService) (account:BTSAccount) (model:Model) = promise {
let! result = admin.delete_account { id = account.id }
if result.isSuccess then
let! data = admin.get_filtered_admin_data {token = model.token}
let! data = admin.get_filtered_admin_data ()
return UpdateAdminData data
else
return ErrorOccured (sprintf "Error deleting account: %s" result.errorText)
@@ -105,7 +105,7 @@ let cancelOrders (admin:IAdminService) (accountName:string) (orders:OrdersSummar
let accounts = [| accountName |]
let! result = admin.cancel_orders {accounts = accounts; users = users }
let! data = admin.get_filtered_admin_data {token = model.token}
let! data = admin.get_filtered_admin_data ()
return UpdateAdminData data
}
+3 -3
View File
@@ -28,7 +28,7 @@ let isNewUser (user:BTSUser) =
let getAdminData (admin:IAdminService) (token:string) =
Cmd.ofPromise
admin.get_filtered_admin_data { token = token }
admin.get_filtered_admin_data ()
UpdateAdminData
(fun _ -> RpcResponse "Error getting admin data")
@@ -156,7 +156,7 @@ let userIsSelected (initialState:BTSUser) (scratch:BTSUser) = scratch <> initial
let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
let! result = admin.update_user { completeData = user }
if (result.isSuccess) then
let! data = admin.get_filtered_admin_data {token = model.token}
let! data = admin.get_filtered_admin_data ()
return UpdateAdminData data
else
return ErrorOccured (sprintf "Error saving user: %s" result.errorText)
@@ -165,7 +165,7 @@ let saveUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
let deleteUser (admin:IAdminService) (user:BTSUser) (model:Model) = promise {
let! result = admin.delete_user { id = user.id }
if (result.isSuccess) then
let! data = admin.get_filtered_admin_data {token = model.token}
let! data = admin.get_filtered_admin_data ()
return UpdateAdminData data
else
return ErrorOccured (sprintf "Error deleting user: %s" result.errorText)