Skip to content
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.

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

[PHP] Fix checking value of Configuration::getAccessToken() #11486

Merged
merged 2 commits into from
Feb 10, 2022

Conversation

jtreminio
Copy link
Contributor

@jtreminio jtreminio commented Feb 1, 2022

Configuration::getAccessToken() returns an empty string, but API classes currently do a null check:

if ($this->config->getAccessToken() !== null)

This will always be true whenever an endpoint allows access token auth.

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master (5.3.0), 6.0.x
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@jtreminio jtreminio changed the title Basicauth oauth [PHP] Fix checking value of Configuration::getAccessToken() Feb 1, 2022
@jtreminio
Copy link
Contributor Author

@wing328
Copy link
Member

wing328 commented Feb 9, 2022

LGTM too. @ybelenko any concern merging this PR?

Copy link
Contributor

@ybelenko ybelenko left a comment

Choose a reason for hiding this comment

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

I would move logic from API controllers to Configuration class, to make possible cover it with tests. But we're far away from that point. This changes looks OK as temp fix. It wasn't broken, empty access token gives no access anyway.

We can merge this PR.

@ybelenko ybelenko merged commit 15501f1 into OpenAPITools:master Feb 10, 2022
@jtreminio
Copy link
Contributor Author

@ybelenko Thank you for merging. Just a quick update - this actually fixes a bug, where if an endpoint allows both Basic Auth and Bearer Token, but the user is only using Basic Auth, the previous code would override to use an empty Bearer Token.

@wing328 wing328 added this to the 6.0.0 milestone Feb 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants