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

contrib/endpoints/src/api_manager/config.cc

@@ -514,11 +514,20 @@ 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().has_firebase_server()) {
+    // 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().has_provider()) {
+    // 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

contrib/endpoints/src/api_manager/context/service_context.h

@@ -67,10 +67,7 @@ class ServiceContext {
 
   bool IsRulesCheckEnabled() const {
     return RequireAuth() && service().apis_size() > 0 &&
-        (!config_->GetFirebaseServer().empty() ||
-            (service().has_experimental() &&
-                service().experimental().has_authorization() &&
-                service().experimental().authorization().has_provider()));
+           !config_->GetFirebaseServer().empty();
   }
 
   auth::Certs &certs() { return certs_; }