Skip to content

Fail request if api_key is not valid. #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chowchow316 merged 5 commits into from
Feb 22, 2017
Merged

Fail request if api_key is not valid. #116

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f145d71
Fail request if api_key is not valid.
chowchow316 Feb 22, 2017
49492a1
Format code.
chowchow316 Feb 22, 2017
46ab1a6
Update comments.
chowchow316 Feb 22, 2017
fe1c48e
Address comment.
chowchow316 Feb 22, 2017
6b6541a
Merge branch 'master' into wrong-api-key
chowchow316 Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions contrib/endpoints/src/api_manager/service_control/aggregated.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ Status Aggregated::Init() {
options.periodic_timer = [this](int interval_ms,
std::function<void()> callback)
-> std::unique_ptr<::google::service_control_client::PeriodicTimer> {
return std::unique_ptr<::google::service_control_client::PeriodicTimer>(
new ApiManagerPeriodicTimer(env_->StartPeriodicTimer(
std::chrono::milliseconds(interval_ms), callback)));
};
return std::unique_ptr<::google::service_control_client::PeriodicTimer>(
new ApiManagerPeriodicTimer(env_->StartPeriodicTimer(
std::chrono::milliseconds(interval_ms), callback)));
};
client_ = ::google::service_control_client::CreateServiceControlClient(
service_->name(), service_->id(), options);
return Status::OK;
Expand Down Expand Up @@ -289,7 +289,10 @@ void Aggregated::Check(
*response, service_control_proto_.service_name(), &response_info);
// If allow_unregistered_calls is true, it is always OK to proceed.
if (allow_unregistered_calls) {
on_done(Status::OK, response_info);
if (response_info.is_api_key_valid &&
Copy link
Copy Markdown
Contributor

@qiwzhang qiwzhang Feb 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please combine two "if" into one

response_info.service_is_activated) {
on_done(Status::OK, response_info);
}
} else {
on_done(status, response_info);
}
Expand Down