Merge pull request #100 from Andreev-Sergey/FixPassEncoding

Fix Auth v3 when password contains Cyrillic characters
diadoc · Dec 24, 2019 · c50c5ce · c50c5ce
2 parents b0769a1 + f5f5ef0
commit c50c5ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/DiadocApi.cpp b/src/DiadocApi.cpp
@@ -439,8 +439,10 @@ void DiadocApi::Authenticate(const std::wstring& login, const std::wstring& pass
 	wss << L"/V3/Authenticate?type=password" << std::flush;
 	Diadoc::Api::Proto::LoginPassword loginPassword;
 
-	loginPassword.set_login(std::string(login.begin(), login.end()));
-	loginPassword.set_password(std::string(password.begin(), password.end()));
+	static std::wstring_convert<std::codecvt_utf8<wchar_t>> utf8conv;
+
+	loginPassword.set_login(utf8conv.to_bytes(login));
+	loginPassword.set_password(utf8conv.to_bytes(password));
 
 	auto response = PerformHttpRequestString(wss.str(), ToProtoBytes(loginPassword), POST);
 	token_ = StringHelper::Utf8ToUtf16(response);

diff --git a/src/stdafx.h b/src/stdafx.h
@@ -21,4 +21,6 @@
 
 #include <tchar.h>
 #include <strsafe.h>
+#include <locale>
+#include <codecvt>
 #include "trace.h"