Skip to content
New issue

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

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

Already on GitHub? # to your account

[Slim] Distinction between basicBasic and basicBearer authentication #3621

Merged
merged 2 commits into from
Aug 13, 2019
Merged

Conversation

chawax
Copy link
Contributor

@chawax chawax commented Aug 12, 2019

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

I changed the SlimRouter.mustache template to distinguish between basic and bearer authentications. Then I change the regex depending on that.

@wing328
Copy link
Member

wing328 commented Aug 12, 2019

@chawax thanks for the PR. I'd a quick look and the PR looks good to me

cc @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09), @ybelenko (2018/07), @renepardon (2018/12)

@wing328
Copy link
Member

wing328 commented Aug 12, 2019

Please run ./bin/php-slim-server-petstore.sh to update the Petstore samples.

@ybelenko
Copy link
Contributor

@chawax Thanks for the contributing! I'm working on new Slim4 generator which is based on current Slim3. I'll transfer this changes into new generator too.

@chawax
Copy link
Contributor Author

chawax commented Aug 12, 2019

Please run ./bin/php-slim-server-petstore.sh to update the Petstore samples.

Mmh ... Do I have to install Maven to run this ? Is there another way to do this ? Don't want to "polluate" my Mac ...

@wing328
Copy link
Member

wing328 commented Aug 13, 2019

You can use maven wrapper, e.g. ./mvnw clean package

@chawax
Copy link
Contributor Author

chawax commented Aug 13, 2019

You can use maven wrapper, e.g. ./mvnw clean package

OK, thanks ! I just updated the samples.

Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

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

LGTM

@wing328 wing328 merged commit 99d85a3 into OpenAPITools:master Aug 13, 2019
@wing328
Copy link
Member

wing328 commented Aug 13, 2019

@chawax thanks for the PR, which has been merged into master.

For your upcoming PRs, I would recommend creating a separate branch for the change.

@ybelenko ybelenko mentioned this pull request Aug 16, 2019
4 tasks
@wing328
Copy link
Member

wing328 commented Aug 26, 2019

@chawax thanks for the PR, which has been included in the v4.1.1 release: https://twitter.com/oas_generator/status/1165944867391860737

# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants