Update the auth check to use service.experimental.authorization.provider #67
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,10 @@ class ServiceContext { | |
|
|
||
| bool IsRulesCheckEnabled() const { | ||
| return RequireAuth() && service().apis_size() > 0 && | ||
| (!config_->GetFirebaseServer().empty() || | ||
|
Contributor
There was a problem hiding this comment. i actually agree with Wayne's comment. Both the service and server config are in config.cc. Moving this logic there makes sense. |
||
| (service().has_experimental() && | ||
| service().experimental().has_authorization() && | ||
|
Contributor
There was a problem hiding this comment. I think you should move this also to GetFirebaseServer. Also, the GetFirebaseServer method should be returning the service config's provide is the server config value is empty. That part is missing. Is this code tested?
Contributor
Author
There was a problem hiding this comment. It's a little strange. The code was updated before this comment, https://screenshot.googleplex.com/uSnOfw2BUfe, not sure why you still saw old version. |
||
| service().experimental().authorization().has_provider())); | ||
| } | ||
|
|
||
| auth::Certs &certs() { return certs_; } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Put this logic inside config::GetFirebaseServer() function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the intention is to separate the logic of server config and service config.
liminw@, what do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with Wayne that the logic should be in config::GetFirebaseServer(). This function should be a wrapper, and determine whether the server is set from server config or service config.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed offline with limin, the code is updated.