Start replacing notifiers with subscriptions.

[stg.git] / projects / stargazer / plugins / authorization / ao / ao.cpp

diff --git a/projects/stargazer/plugins/authorization/ao/ao.cpp b/projects/stargazer/plugins/authorization/ao/ao.cpp
index 7b6f129d40c7e672a202ab7317a6b33044e796a6..d0be8dd58bc98992003662d93ec7f4da59455ee6 100644 (file)
--- a/projects/stargazer/plugins/authorization/ao/ao.cpp
+++ b/projects/stargazer/plugins/authorization/ao/ao.cpp
@@ -48,8 +48,6 @@ return "Always Online authorizator v.1.0";
 AUTH_AO::AUTH_AO()
     : users(NULL),
       isRunning(false),
 AUTH_AO::AUTH_AO()
     : users(NULL),
       isRunning(false),

-      onAddUserNotifier(*this),
-      onDelUserNotifier(*this),

       logger(STG::PluginLogger::get("auth_ao"))
 {
 }
       logger(STG::PluginLogger::get("auth_ao"))
 {
 }


@@ -59,8 +57,8 @@ int AUTH_AO::Start()
 printfd(__FILE__, "AUTH_AO::Start()\n");
 GetUsers();
 
 printfd(__FILE__, "AUTH_AO::Start()\n");
 GetUsers();
 

-users->AddNotifierUserAdd(&onAddUserNotifier);
-users->AddNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn = users->onUserAdd([this](auto user){ AddUser(user); });
+m_onDelUserConn = users->onUserDel([this](auto user){ DelUser(user); });

 
 std::for_each(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); });
 
 
 std::for_each(userList.begin(), userList.end(), [this](auto user){ UpdateUserAuthorization(user); });
 


@@ -75,8 +73,8 @@ printfd(__FILE__, "AUTH_AO::Stop()\n");
 if (!isRunning)
     return 0;
 
 if (!isRunning)
     return 0;
 

-users->DelNotifierUserAdd(&onAddUserNotifier);
-users->DelNotifierUserDel(&onDelUserNotifier);
+m_onAddUserConn.disconnect();
+m_onDelUserConn.disconnect();

 
 auto it = userList.begin();
 while (it != userList.end())
 
 auto it = userList.begin();
 while (it != userList.end())


@@ -211,17 +209,15 @@ return -1;
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>

-void CHG_BEFORE_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
+void CHG_BEFORE_NOTIFIER<varParamType>::notify(const varParamType &, const varParamType &)

 {
 {

-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::Unauthorize, user);

 if (user->IsAuthorizedBy(&auth))
     auth.users->Unauthorize(user->GetLogin(), &auth);
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>
 if (user->IsAuthorizedBy(&auth))
     auth.users->Unauthorize(user->GetLogin(), &auth);
 }
 //-----------------------------------------------------------------------------
 template <typename varParamType>

-void CHG_AFTER_NOTIFIER<varParamType>::Notify(const varParamType &, const varParamType &)
+void CHG_AFTER_NOTIFIER<varParamType>::notify(const varParamType &, const varParamType &)

 {
 {

-//EVENT_LOOP_SINGLETON::GetInstance().Enqueue(auth, &AUTH_AO::UpdateUserAuthorization, user);

 auth.UpdateUserAuthorization(user);
 }
 //-----------------------------------------------------------------------------
 auth.UpdateUserAuthorization(user);
 }
 //-----------------------------------------------------------------------------