1,Improve customer friendliness; 2, fixed typo error (#1980)

vesoft-inc · Mar 26, 2020 · f940ddb · f940ddb
1 parent f114b21
commit f940ddb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/common/base/Status.cpp b/src/common/base/Status.cpp
@@ -36,6 +36,9 @@ std::string Status::toString() const {
         case kPermissionError:
             str = "PermissionError: ";
             break;
+        case kSpaceNotFound:
+            str = "Space not found";
+            break;
         default:
             snprintf(tmp, sizeof(tmp), "Unknown error(%hu): ", static_cast<uint16_t>(code()));
             str = tmp;

diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
@@ -43,7 +43,7 @@ enum ErrorCode {
 
     // Authentication Failure
     E_INVALID_PASSWORD          = -41,
-    E_INPROPER_ROLE             = -42,
+    E_IMPROPER_ROLE             = -42,
     E_INVALID_PARTITION_NUM     = -43,
     E_INVALID_REPLICA_FACTOR    = -44,
     E_INVALID_CHARSET           = -45,

diff --git a/src/meta/client/MetaClient.cpp b/src/meta/client/MetaClient.cpp
@@ -559,6 +559,10 @@ Status MetaClient::handleResponse(const RESP& resp) {
             return Status::Error("No valid collate");
         case cpp2::ErrorCode::E_CHARSET_COLLATE_NOT_MATCH:
             return Status::Error("Charset and collate not match");
+        case cpp2::ErrorCode::E_INVALID_PASSWORD:
+            return Status::Error("Invalid password");
+        case cpp2::ErrorCode::E_IMPROPER_ROLE:
+            return Status::Error("Improper role");
         default:
             return Status::Error("Unknown code %d", static_cast<int32_t>(resp.get_code()));
     }

diff --git a/src/meta/processors/usersMan/AuthenticationProcessor.cpp b/src/meta/processors/usersMan/AuthenticationProcessor.cpp
@@ -136,7 +136,7 @@ void RevokeProcessor::process(const cpp2::RevokeRoleReq& req) {
     auto val = result.value();
     const auto role = *reinterpret_cast<const nebula::cpp2::RoleType *>(val.c_str());
     if (role != roleItem.get_role_type()) {
-        handleErrorCode(cpp2::ErrorCode::E_INPROPER_ROLE);
+        handleErrorCode(cpp2::ErrorCode::E_IMPROPER_ROLE);
         onFinished();
         return;
     }

diff --git a/src/meta/test/AuthProcessorTest.cpp b/src/meta/test/AuthProcessorTest.cpp
@@ -385,7 +385,7 @@ TEST(AuthProcessorTest, GrantRevokeTest) {
         auto f = processor->getFuture();
         processor->process(req);
         auto resp = std::move(f).get();
-        ASSERT_EQ(cpp2::ErrorCode::E_INPROPER_ROLE, resp.get_code());
+        ASSERT_EQ(cpp2::ErrorCode::E_IMPROPER_ROLE, resp.get_code());
     }
     // actual role is GUEST, but revoke unknown, expect error.
     {
@@ -398,7 +398,7 @@ TEST(AuthProcessorTest, GrantRevokeTest) {
         auto f = processor->getFuture();
         processor->process(req);
         auto resp = std::move(f).get();
-        ASSERT_EQ(cpp2::ErrorCode::E_INPROPER_ROLE, resp.get_code());
+        ASSERT_EQ(cpp2::ErrorCode::E_IMPROPER_ROLE, resp.get_code());
     }
     // revoke
     {