Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: chrome/browser/local_discovery/privetv3_session.cc

Issue 878463002: Fixed Privet v3 auth header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patches
Patch Set: Mon 01/26/2015 12:51:10.46 Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/local_discovery/privetv3_session.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/local_discovery/privetv3_session.cc
diff --git a/chrome/browser/local_discovery/privetv3_session.cc b/chrome/browser/local_discovery/privetv3_session.cc
index 14d28f1f550ca1a7eb97f14d41e1e9c46ef2614d..bd5f4ca678b97c43dd9d128de3c5543ec2125f98 100644
--- a/chrome/browser/local_discovery/privetv3_session.cc
+++ b/chrome/browser/local_discovery/privetv3_session.cc
@@ -7,6 +7,7 @@
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
+#include "chrome/browser/local_discovery/privet_constants.h"
#include "chrome/browser/local_discovery/privet_http.h"
#include "chrome/browser/local_discovery/privet_url_fetcher.h"
#include "chrome/common/cloud_print/cloud_print_constants.h"
@@ -20,6 +21,8 @@ const char kUrlPlaceHolder[] = "http://host/";
const char kStubPrivetCode[] = "1234";
+const char kPrivetV3AuthAnonymous[] = "Privet anonymous";
+
GURL CreatePrivetURL(const std::string& path) {
GURL url(kUrlPlaceHolder);
GURL::Replacements replacements;
@@ -32,10 +35,12 @@ GURL CreatePrivetURL(const std::string& path) {
class PrivetV3Session::FetcherDelegate : public PrivetURLFetcher::Delegate {
public:
FetcherDelegate(const base::WeakPtr<PrivetV3Session>& session,
+ const std::string& auth_token,
const PrivetV3Session::MessageCallback& callback);
~FetcherDelegate() override;
// PrivetURLFetcher::Delegate methods.
+ std::string GetAuthToken() override;
void OnNeedPrivetToken(
PrivetURLFetcher* fetcher,
const PrivetURLFetcher::TokenCallback& callback) override;
@@ -51,22 +56,29 @@ class PrivetV3Session::FetcherDelegate : public PrivetURLFetcher::Delegate {
scoped_ptr<PrivetURLFetcher> url_fetcher_;
base::WeakPtr<PrivetV3Session> session_;
+ std::string auth_token_;
MessageCallback callback_;
};
PrivetV3Session::FetcherDelegate::FetcherDelegate(
const base::WeakPtr<PrivetV3Session>& session,
+ const std::string& auth_token,
const PrivetV3Session::MessageCallback& callback)
- : session_(session), callback_(callback) {
+ : session_(session), auth_token_(auth_token), callback_(callback) {
}
PrivetV3Session::FetcherDelegate::~FetcherDelegate() {
}
+std::string PrivetV3Session::FetcherDelegate::GetAuthToken() {
+ return auth_token_;
+}
+
void PrivetV3Session::FetcherDelegate::OnNeedPrivetToken(
PrivetURLFetcher* fetcher,
const PrivetURLFetcher::TokenCallback& callback) {
NOTREACHED();
+ OnError(fetcher, PrivetURLFetcher::URL_FETCH_ERROR);
}
void PrivetV3Session::FetcherDelegate::OnError(
@@ -103,6 +115,8 @@ PrivetV3Session::~PrivetV3Session() {
}
void PrivetV3Session::Init(const InitCallback& callback) {
+ privet_auth_token_ = kPrivetV3AuthAnonymous;
+
// TODO: call /info.
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
@@ -140,8 +154,8 @@ void PrivetV3Session::SendMessage(const std::string& api,
if (!code_confirmed_)
return callback.Run(Result::STATUS_SESSIONERROR, base::DictionaryValue());
- FetcherDelegate* fetcher_delegate(
- new FetcherDelegate(weak_ptr_factory_.GetWeakPtr(), callback));
+ FetcherDelegate* fetcher_delegate(new FetcherDelegate(
+ weak_ptr_factory_.GetWeakPtr(), privet_auth_token_, callback));
fetchers_.push_back(fetcher_delegate);
scoped_ptr<PrivetURLFetcher> url_fetcher(client_->CreateURLFetcher(
« no previous file with comments | « chrome/browser/local_discovery/privetv3_session.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698