Commit 0388a1c9 authored by treib's avatar treib Committed by Commit bot

PermissionRequestCreatorApiary: fix response parsing

Also, replace the deprecated CHROME namespace with PERMISSION_CHROME_URL
(see https://cs.corp.google.com/#piper///depot/google3/google/kidsmanagement/v1/permissions_common.proto&l=30 )

BUG=

Review URL: https://codereview.chromium.org/640223002

Cr-Commit-Position: refs/heads/master@{#299898}
parent 3a2cf7d1
...@@ -29,10 +29,12 @@ ...@@ -29,10 +29,12 @@
using net::URLFetcher; using net::URLFetcher;
const int kNumRetries = 1; const int kNumRetries = 1;
const char kIdKey[] = "id"; const char kNamespace[] = "PERMISSION_CHROME_URL";
const char kNamespace[] = "CHROME";
const char kState[] = "PENDING"; const char kState[] = "PENDING";
const char kPermissionRequestKey[] = "permissionRequest";
const char kIdKey[] = "id";
static const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s"; static const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s";
struct PermissionRequestCreatorApiary::Request { struct PermissionRequestCreatorApiary::Request {
...@@ -212,8 +214,13 @@ void PermissionRequestCreatorApiary::OnURLFetchComplete( ...@@ -212,8 +214,13 @@ void PermissionRequestCreatorApiary::OnURLFetchComplete(
DispatchNetworkError(it, net::ERR_INVALID_RESPONSE); DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
return; return;
} }
base::DictionaryValue* permission_dict = NULL;
if (!dict->GetDictionary(kPermissionRequestKey, &permission_dict)) {
DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
return;
}
std::string id; std::string id;
if (!dict->GetString(kIdKey, &id)) { if (!permission_dict->GetString(kIdKey, &id)) {
DispatchNetworkError(it, net::ERR_INVALID_RESPONSE); DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
return; return;
} }
......
...@@ -22,7 +22,9 @@ const char kPermissionRequestApiUrl[] = "https://myapis.com/permissions"; ...@@ -22,7 +22,9 @@ const char kPermissionRequestApiUrl[] = "https://myapis.com/permissions";
std::string BuildResponse() { std::string BuildResponse() {
base::DictionaryValue dict; base::DictionaryValue dict;
dict.SetStringWithoutPathExpansion("id", "requestid"); base::DictionaryValue* permission_dict = new base::DictionaryValue;
permission_dict->SetStringWithoutPathExpansion("id", "requestid");
dict.SetWithoutPathExpansion("permissionRequest", permission_dict);
std::string result; std::string result;
base::JSONWriter::Write(&dict, &result); base::JSONWriter::Write(&dict, &result);
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment