Fix clould auth (vesoft-inc#941)

Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>
yixinglu · Jun 10, 2022 · 63322aa · 63322aa
1 parent 771a861
commit 63322aa
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/graph/service/GraphService.cpp b/src/graph/service/GraphService.cpp
@@ -283,7 +283,12 @@ Status GraphService::auth(const std::string& username,
     // There is no way to identify which one is in the graph layer，
     // let's check the native user's password first, then cloud user.
     auto pwdAuth = std::make_unique<PasswordAuthenticator>(metaClient);
-    return pwdAuth->auth(username, proxygen::md5Encode(folly::StringPiece(password)));
+    auto pwdAuthRes = pwdAuth->auth(username, proxygen::md5Encode(folly::StringPiece(password)));
+    if (pwdAuthRes.ok()) {
+      return Status::OK();
+    }
+
+    // Password auth failed, try cloud token
     auto cloudAuth = std::make_unique<CloudAuthenticator>(metaClient);
     return cloudAuth->auth(username, password);
   } else if (FLAGS_auth_type == "ldap") {