- Remove unused model

- Remove unused filters
- Add deactivate method

Author: ParticleG

controllers/Admin.cc

@@ -14,7 +14,7 @@ using namespace techmino::types;
 
 Auth::Auth() : _playerManager(app().getPlugin<PlayerManager>()) {}
 
-void Auth::check(const HttpRequestPtr &req, function<void(const HttpResponsePtr &)> &&callback) {
+void Auth::check(const HttpRequestPtr& req, function<void(const HttpResponsePtr&)>&& callback) {
     ResponseJson response;
     handleExceptions([&]() {
         Json::Value data;
@@ -29,12 +29,24 @@ void Auth::check(const HttpRequestPtr &req, function<void(const HttpResponsePtr
     response.to(callback);
 }
 
-void Auth::oauth(const HttpRequestPtr &req, function<void(const drogon::HttpResponsePtr &)> &&callback, string &&token) {
+void Auth::deactivate(const HttpRequestPtr& req, std::function<void(const HttpResponsePtr&)>&& callback,
+                      std::string&& token) const {
+    ResponseJson response;
+    handleExceptions([&]() {
+        _playerManager->deactivate(
+            req->attributes()->get<RequestJson>("requestJson")["playerId"].asInt64(),
+            token
+        );
+    }, response);
+    response.to(callback);
+}
+
+void Auth::oauth(const HttpRequestPtr& req, function<void(const HttpResponsePtr&)>&& callback, string&& token) const {
     ResponseJson response;
     handleExceptions([&]() {
         response.setData(_playerManager->oauth(
-                req->attributes()->get<RequestJson>("requestJson")["playerId"].asInt64(),
-                token
+            req->attributes()->get<RequestJson>("requestJson")["playerId"].asInt64(),
+            token
         ));
     }, response);
     response.to(callback);

controllers/Admin.h

@@ -20,18 +20,25 @@ namespace techmino::api::v1 {
 
         METHOD_LIST_BEGIN
             METHOD_ADD(Auth::check, "/check", drogon::Get, "techmino::filters::CheckAccessToken");
+            METHOD_ADD(Auth::deactivate, "/deactivate/{1}", drogon::Post, "techmino::filters::AuthDeactivate");
             METHOD_ADD(Auth::oauth, "/oauth/{1}", drogon::Post, "techmino::filters::AuthOauth");
         METHOD_LIST_END
 
-        void check(const drogon::HttpRequestPtr &req, std::function<void(const drogon::HttpResponsePtr &)> &&callback);
+        void check(const drogon::HttpRequestPtr& req, std::function<void(const drogon::HttpResponsePtr&)>&& callback);
+
+        void deactivate(
+            const drogon::HttpRequestPtr& req,
+            std::function<void(const drogon::HttpResponsePtr&)>&& callback,
+            std::string&& token
+        ) const;
 
         void oauth(
-                const drogon::HttpRequestPtr &req,
-                std::function<void(const drogon::HttpResponsePtr &)> &&callback,
-                std::string &&token
-        );
+            const drogon::HttpRequestPtr& req,
+            std::function<void(const drogon::HttpResponsePtr&)>&& callback,
+            std::string&& token
+        ) const;
 
     private:
-        plugins::PlayerManager *_playerManager;
+        plugins::PlayerManager* _playerManager;
     };
-}
+}

controllers/Auth.cc

@@ -24,7 +24,6 @@ namespace techmino::api::v1 {
                     "",
                     drogon::Post,
                     "techmino::filters::CheckAccessToken",
-                    "techmino::filters::CheckPermission",
                     "techmino::filters::NoticeCreate"
             );
             METHOD_ADD(
@@ -38,15 +37,13 @@ namespace techmino::api::v1 {
                     "",
                     drogon::Put,
                     "techmino::filters::CheckAccessToken",
-                    "techmino::filters::CheckPermission",
                     "techmino::filters::NoticeUpdate"
             );
             METHOD_ADD(
                     Notice::deleteNotice,
                     "",
                     drogon::Delete,
                     "techmino::filters::CheckAccessToken",
-                    "techmino::filters::CheckPermission",
                     "techmino::filters::NoticeDelete"
             );
         METHOD_LIST_END

controllers/Auth.h

@@ -20,43 +20,9 @@
       "connectionFailed": "Connection failed"
     },
     // Filters
-    "AuthDeactivateEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
-    "AuthLoginEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
-    "AuthMigrateEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
-    "AuthResetEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
-    "AuthSeedEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
-    "AuthVerifyEmail": {
-      "invalidFormat": "Invalid json format",
-      "invalidArguments": "Invalid json types",
-      "internalError": "Internal error"
-    },
     "CheckAccessToken": {
       "invalidArguments": "Invalid arguments"
     },
-    "CheckPermission": {
-      "noPermission": "No permission",
-      "playerNotFound": "Player not found"
-    },
     "CheckRefreshToken": {
       "invalidArguments": "Invalid arguments"
     },

controllers/Notice.h

@@ -16,7 +16,7 @@ void AdminShutdownAfter::doFilter(
         FilterCallback &&failedCb,
         FilterChainCallback &&nextCb
 ) {
-    handleExceptions([&]() {
+    handleExceptions([&] {
         auto request = RequestJson(req);
         request.require("delay", JsonValue::Double);
         if (request["delay"].asDouble() < 0) {

docs/i18n.json

@@ -2,7 +2,7 @@
 // Created by particleg on 2021/9/27.
 //
 
-#include <filters/AuthSeedEmail.h>
+#include <filters/AuthDeactivate.h>
 #include <helpers/RequestJson.h>
 
 using namespace drogon;
@@ -11,14 +11,14 @@ using namespace techmino::filters;
 using namespace techmino::helpers;
 using namespace techmino::types;
 
-void AuthSeedEmail::doFilter(
+void AuthDeactivate::doFilter(
         const HttpRequestPtr &req,
         FilterCallback &&failedCb,
         FilterChainCallback &&nextCb
 ) {
     handleExceptions([&]() {
         auto request = RequestJson(req);
-        request.require("email", JsonValue::String);
+        request.require("playerId", JsonValue::Int64);
         req->attributes()->insert("requestJson", request);
         nextCb();
     }, failedCb);

filters/AdminShutdownAfter.cc

@@ -8,15 +8,15 @@
 #include <structures/ExceptionHandlers.h>
 
 /**
- * @brief This filter checks "Auth::deactivateEmail" request body.
- * @param code: String
+ * @brief This filter checks "Auth::oauth" request body.
+ * @param playerId: Int64
  * @return requestJson: in request attributes
  */
 
 namespace techmino::filters {
-    class AuthDeactivateEmail :
-            public drogon::HttpFilter<AuthDeactivateEmail>,
-            public structures::RequestJsonHandler<AuthDeactivateEmail> {
+    class AuthDeactivate :
+            public drogon::HttpFilter<AuthDeactivate>,
+            public structures::RequestJsonHandler<AuthDeactivate> {
     public:
         static constexpr char projectName[] = CMAKE_PROJECT_NAME;