Update the auth check to use service.experimental.authorization.provider

contrib/endpoints/repositories.bzl

@@ -254,6 +254,8 @@ cc_proto_library(
         "google/api/control.proto",
         "google/api/documentation.proto",
         "google/api/endpoint.proto",
+        "google/api/experimental/authorization_config.proto",
+        "google/api/experimental/experimental.proto",
         "google/api/http.proto",
         "google/api/label.proto",
         "google/api/log.proto",
@@ -293,7 +295,7 @@ cc_proto_library(
 
     native.new_git_repository(
         name = "googleapis_git",
-        commit = "db1d4547dc56a798915e0eb2c795585385922165",
+        commit = "412867fb105722fb9d2cd9af90af1f8f120de238",
         remote = "https://github.com/googleapis/googleapis.git",
         build_file_content = BUILD,
     )

contrib/endpoints/src/api_manager/config.cc

@@ -514,11 +514,21 @@ void Config::SetJwksUri(const string &issuer, const string &jwks_uri,
 }
 
 std::string Config::GetFirebaseServer() {
-  if (server_config_ == nullptr) {
-    return "";
+  if (server_config_ != nullptr &&
+      server_config_->has_api_check_security_rules_config() &&
+      !server_config_->api_check_security_rules_config().firebase_server().empty()) {
+    // It is the testing environment, use server config.
+    return server_config_->api_check_security_rules_config().firebase_server();
   }
 
-  return server_config_->api_check_security_rules_config().firebase_server();
+  if (service_.has_experimental() &&
+      service_.experimental().has_authorization() &&
+      !service_.experimental().authorization().provider().empty()) {
+    // In real environment, server_config_ should be null. And we rely on the
+    // field in service.
+    return service_.experimental().authorization().provider();
+  }
+  return "";
 }
 
 }  // namespace api_manager

contrib/endpoints/src/api_manager/config.h

@@ -64,9 +64,7 @@ class Config {
   // TODO: Remove in favor of service().
   const std::string &service_name() const { return service_.name(); }
 
-  bool HasAuth() const { return service_.has_experimental() &&
-      service_.experimental().has_authorization() &&
-      service_.experimental().authorization().has_provider(); }
+  bool HasAuth() const { return service_.has_authentication(); }
 
   // Returns true if the caller should try openId discovery to fetch jwksUri.
   // url is set to the openId discovery link in this case. Returns false