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

Accept multiple headers through OnAuthHeaderRequestedListener #2080

Merged
merged 3 commits into from
Apr 8, 2020

Conversation

khaykov
Copy link
Member

@khaykov khaykov commented Mar 30, 2020

This PR changes OkHttpHeaderInterceptor to be more generic, and move the header setting logic to the client. It also adds the ability to utilize multiple headers passed from the client.

You can test it with Client side PR.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

khaykov added 2 commits April 3, 2020 13:44
…e into feature/accept-multiple-headers-for-request
…e into feature/accept-multiple-headers-for-request
Copy link
Contributor

@mchowning mchowning left a comment

Choose a reason for hiding this comment

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

Looks good! :shipit:

@khaykov
Copy link
Member Author

khaykov commented Apr 8, 2020

@mchowning Thank you for the review! Sorry, I'm not sure what is the process for merging PR's in this repo. Should I do it?

Also, how do we ensure the client-side changes will be included with the release? Should I target the client-side PR towards future GB release integration branch?

@mchowning
Copy link
Contributor

Sorry, I'm not sure what is the process for merging PR's in this repo. Should I do it?

In this repo, if there is no assignee anyone can merge. In practice though, the author of the PR almost always does the merge, which is why I didn't merge (to be completely honest, I didn't even think about it). I'll go ahead and merge this now though since there's no assignee. 😄

I'll leave the WPAndroid PR for you though since it needs be updated with the merged gutenberg-mobile hash (or if you'd like me to merge after you make that update, just ping me 🙂 ).

how do we ensure the client-side changes will be included with the release? Should I target the client-side PR towards future GB release integration branch?

Everything that is included in the develop branch in this repo (including the Gutenberg repo submodule ref) will be included in the release when we cut the release branch on the Monday of our release week (so next Monday). When we cut that release branch we also cut a "mobile-gutenberg" release branch from develop on WPAndroid and WPiOS. So as long as both the PRs are merged this week, you should be good for catching the next release.

@mchowning mchowning merged commit b693f14 into develop Apr 8, 2020
@mchowning mchowning deleted the feature/accept-multiple-headers-for-request branch April 8, 2020 17:36
pinarol added a commit that referenced this pull request Apr 16, 2020
* Add tests for Latest-Posts Bock

* Have the Automation tests Scroll the Block window to help locate Block buttons on Android

* Update gutenberg reference

* Update Gutenberg ref

* Update Gutenberg ref

* New template for release PRs

This PR will add a new template for release PRs to make it easier to check all the steps needed and to standardize the release PRs.

This template can then be used by using this link: `https://github.com/wordpress-mobile/gutenberg-mobile/pull/new?template=release_pull_request.md`

* Update template file.

* Fix: remove extra padding for post title and first `Paragraph` block (#2095)

* Fix: remove extra padding for post title and first `Paragraph` block

* Update Gutenberg ref

* Add a new androidReplacements function to comply with Android Typography lint rules

* Make sure the file gutenberg.pot exists before generating android and ios strings.

* Update Gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg reference

* Gutenberg update

* Update Gutenberg ref

* Update Gutenberg ref

* Update Gutenberg ref

* Update Gutenberg ref

* Fix: prevent ripple effect on slider cell in BottomSheet and disable it completely on iOS (#2023)

* prevent ripple effect on slider cell in BottomSheet and disable it completely on iOS

* Update Gutenberg ref

* Update Gutenberg ref

* Accept multiple headers through OnAuthHeaderRequestedListener (#2080)

* Blog layout template (#2114)

* Update Gutenberg ref

* Update Gutenberg ref

* Update gutenberg reference

* Fix failing UI tests

Try scrolling in the Inserter for all platforms

* Disable the failing test on iOS

Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Pinar Olguc <[email protected]>

* Update gutenberg reference

* Feat: Column block (#1661)

* update ref to master (Columns Block)

* Update gutenberg reference

* Fix Latests Posts Tests by expanding the scroll to button functionality

* Fix lint issue

* Fix typography breakage in master

To a version where the typography panel is not added to block settings.

* Update GB reference.

* Correct slider step value (#2119)

* Update ref: Correct slider step accordingly to the platform

* Update gb ref

Co-authored-by: Pinar Olguc <[email protected]>

* v1.26.0

* Add some missing release notes

* Update Podfile.lock

* Update gb ref

* Update bundles

Co-authored-by: Chip Snyder <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Gerardo Pacheco <[email protected]>
Co-authored-by: Sérgio Estêvão <[email protected]>
Co-authored-by: jbinda <[email protected]>
Co-authored-by: Chip <[email protected]>
Co-authored-by: Maxime Biais <[email protected]>
Co-authored-by: Tugdual de Kerviler <[email protected]>
Co-authored-by: Klymentiy Haykov <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Luke Walczak <[email protected]>
pinarol added a commit that referenced this pull request Apr 16, 2020
* Release v1.26.0 (#2153)

* Add tests for Latest-Posts Bock

* Have the Automation tests Scroll the Block window to help locate Block buttons on Android

* Update gutenberg reference

* Update Gutenberg ref

* Update Gutenberg ref

* New template for release PRs

This PR will add a new template for release PRs to make it easier to check all the steps needed and to standardize the release PRs.

This template can then be used by using this link: `https://github.com/wordpress-mobile/gutenberg-mobile/pull/new?template=release_pull_request.md`

* Update template file.

* Fix: remove extra padding for post title and first `Paragraph` block (#2095)

* Fix: remove extra padding for post title and first `Paragraph` block

* Update Gutenberg ref

* Add a new androidReplacements function to comply with Android Typography lint rules

* Make sure the file gutenberg.pot exists before generating android and ios strings.

* Update Gutenberg ref

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg reference

* Gutenberg update

* Update Gutenberg ref

* Update Gutenberg ref

* Update Gutenberg ref

* Update Gutenberg ref

* Fix: prevent ripple effect on slider cell in BottomSheet and disable it completely on iOS (#2023)

* prevent ripple effect on slider cell in BottomSheet and disable it completely on iOS

* Update Gutenberg ref

* Update Gutenberg ref

* Accept multiple headers through OnAuthHeaderRequestedListener (#2080)

* Blog layout template (#2114)

* Update Gutenberg ref

* Update Gutenberg ref

* Update gutenberg reference

* Fix failing UI tests

Try scrolling in the Inserter for all platforms

* Disable the failing test on iOS

Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Pinar Olguc <[email protected]>

* Update gutenberg reference

* Feat: Column block (#1661)

* update ref to master (Columns Block)

* Update gutenberg reference

* Fix Latests Posts Tests by expanding the scroll to button functionality

* Fix lint issue

* Fix typography breakage in master

To a version where the typography panel is not added to block settings.

* Update GB reference.

* Correct slider step value (#2119)

* Update ref: Correct slider step accordingly to the platform

* Update gb ref

Co-authored-by: Pinar Olguc <[email protected]>

* v1.26.0

* Add some missing release notes

* Update Podfile.lock

* Update gb ref

* Update bundles

Co-authored-by: Chip Snyder <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Gerardo Pacheco <[email protected]>
Co-authored-by: Sérgio Estêvão <[email protected]>
Co-authored-by: jbinda <[email protected]>
Co-authored-by: Chip <[email protected]>
Co-authored-by: Maxime Biais <[email protected]>
Co-authored-by: Tugdual de Kerviler <[email protected]>
Co-authored-by: Klymentiy Haykov <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Luke Walczak <[email protected]>

* Update gb ref

Co-authored-by: Chip Snyder <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Gerardo Pacheco <[email protected]>
Co-authored-by: Sérgio Estêvão <[email protected]>
Co-authored-by: jbinda <[email protected]>
Co-authored-by: Chip <[email protected]>
Co-authored-by: Maxime Biais <[email protected]>
Co-authored-by: Tugdual de Kerviler <[email protected]>
Co-authored-by: Klymentiy Haykov <[email protected]>
Co-authored-by: Matthew Kevins <[email protected]>
Co-authored-by: Luke Walczak <[email protected]>
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.

2 participants