From 65211ac6b3a90cd31c02935900b30caaf4e55508 Mon Sep 17 00:00:00 2001
From: Alexander Vorobyev <voral.adm@gmail.com>
Date: Tue, 15 Aug 2017 11:29:43 +0300
Subject: [PATCH] Fix issue "#55:Failed to load resource" of main project

---
 brick/account.cc | 26 ++++++++++++++++++++++++++
 brick/account.h  |  5 +++++
 2 files changed, 31 insertions(+)

diff --git a/brick/account.cc b/brick/account.cc
index 96ec908..3683edb 100644
--- a/brick/account.cc
+++ b/brick/account.cc
@@ -124,6 +124,7 @@ Account::SetPassword(std::string password) {
 
 void
 Account::SetDomain(std::string domain) {
+  Account::trim(domain);
   domain_ = domain;
   label_ = GenLabel();
   base_url_ = GenBaseUrl();
@@ -140,6 +141,29 @@ Account::SetUseAppPassword(bool use) {
   use_app_password_ = use;
 }
 
+bool
+Account::needTrim(int ch) {
+   return !std::isspace(ch) && !std::ispunct(ch);
+}
+
+void
+Account::lTrim(std::string &s) {
+   s.erase(s.begin(), std::find_if(s.begin(), s.end(), Account::needTrim));
+}
+
+// trim from end (in place)
+void
+Account::rTrim(std::string &s) {
+     s.erase(std::find_if(s.rbegin(), s.rend(),Account::needTrim).base(), s.end());
+}
+
+// trim from both ends (in place)
+void
+Account::trim(std::string &s) {
+    Account::lTrim(s);
+    Account::rTrim(s);
+}
+
 void
 Account::Set(
     bool secure,
@@ -149,6 +173,7 @@ Account::Set(
     bool use_app_password) {
 
   secure_ = secure;
+  Account::trim(domain);
   domain_ = domain;
   login_ = login;
   password_ = password;
@@ -163,6 +188,7 @@ Account::GenBaseUrl() {
   return (GetOrigin() + kDefaultAppUrl);
 }
 
+
 void
 Account::Auth(bool renew_password, const AuthCallback& callback, const std::string& otp) {
   CEF_REQUIRE_UI_THREAD();
diff --git a/brick/account.h b/brick/account.h
index 37b0c54..9fbf256 100644
--- a/brick/account.h
+++ b/brick/account.h
@@ -60,6 +60,11 @@ class Account : public CefBase {
   void SetUseAppPassword(bool use);
   void SetId(int id);
 
+  static void trim(std::string &s);
+  static void rTrim(std::string &s);
+  static void lTrim(std::string &s);
+  static bool needTrim(int ch);
+
   std::string GenLabel();
   std::string GenBaseUrl();